Michael Snoyman
30352f56ec
Some fixes for persistent2
2014-08-27 10:53:17 +03:00
Michael Snoyman
6eb1447dd9
Add missing LANGUAGE pragma
2014-08-27 08:15:47 +03:00
Michael Snoyman
a6d545fe32
Merge branch 'master' into yesod-1.4
2014-08-27 07:51:39 +03:00
Michael Snoyman
1539753562
Relax conduit upper bound
2014-08-27 07:44:26 +03:00
Michael Snoyman
a13ebd3fa8
Some merge resolution
2014-08-25 21:20:27 +03:00
Michael Snoyman
c66ef04f17
Merge branch 'master' into yesod-1.4
...
Conflicts:
yesod-form/Yesod/Form/Functions.hs
2014-08-25 20:20:16 +03:00
Michael Snoyman
b2c16c9d4c
Scaffolding update: turn on -N
2014-08-25 18:07:58 +03:00
Michael Snoyman
641135f011
Version bump
2014-08-25 10:38:43 +03:00
Michael Snoyman
7146b62086
Merge pull request #812 from cosmo0920/bump-up-lowerbound-aeson
...
yesod-auth: bump up lower bound for aeson
2014-08-24 14:09:53 +03:00
cosmo0920
1f20cc0004
yesod-auth: bump up lower bound for aeson
...
Because `Data.Aeson.Encode.encodeToTextBuilder` is added since
aeson-0.7.0.0.
2014-08-24 19:55:19 +09:00
Michael Snoyman
a3ec07c359
Disable broken test
2014-08-23 21:50:38 +03:00
Michael Snoyman
1c775e37c0
Version bump
2014-08-21 07:19:49 +03:00
Michael Snoyman
fd9518d747
Merge pull request #810 from yesodweb/bump-persistent
...
bump persistent versions
2014-08-21 07:18:59 +03:00
Greg Weber
7fa8f8a3dd
bump persistent versions
...
this allows the latest version of persistent-mongoDB to be installed
2014-08-20 12:05:30 -07:00
Michael Snoyman
e091096388
Version bump
2014-08-20 18:46:01 +03:00
Michael Snoyman
2ad3227776
Version bumps
2014-08-20 17:54:46 +03:00
Michael Snoyman
9c3cf3e4c5
Scaffolding updates
2014-08-20 17:53:06 +03:00
Michael Snoyman
17016f8427
Merge branch 'master' of github.com:yesodweb/yesod
2014-08-20 16:46:21 +03:00
Michael Snoyman
40547b2b71
Merge pull request #809 from dunric/master
...
`required' attribute for nicHtmlField (textarea tag)
2014-08-20 16:04:32 +03:00
Dunric
d4175f11cc
`required' attribute for nicHtmlField (textfield tag)
2014-08-20 01:53:59 +02:00
Michael Snoyman
827ddf8be5
Merge pull request #808 from dunric/master
...
Add some minimal interaction to add-handler command
2014-08-18 09:16:46 +03:00
Dunric
9831220c47
add-handler interactive
2014-08-17 20:15:50 +02:00
Michael Snoyman
587080dbff
Merge pull request #797 from wuzzeb/master
...
Include google person information in the credsExtra field for GoogleEmail2 auth
2014-08-17 11:20:29 +03:00
Michael Snoyman
a70de71d8e
Merge branch 'master' of github.com:yesodweb/yesod
2014-08-16 23:06:29 +03:00
Michael Snoyman
404e1b2f9c
Platform update
2014-08-16 23:05:58 +03:00
Michael Snoyman
63e7cd8e2f
network/network-uri split (again)
2014-08-16 23:05:10 +03:00
Michael Snoyman
a2d118e236
network/network-uri split
2014-08-16 23:02:32 +03:00
John Lenz
2a6956a85c
Small fixes to adding person info to creds extra for google auth
2014-08-15 21:17:52 -05:00
Michael Snoyman
0a5fafa223
Merge pull request #807 from arowM/naturalJapanese
...
Fixed Japanese message
2014-08-15 09:54:42 +03:00
Kadzuya OKAMOTO
1fe72e8351
fixed Japanese message
2014-08-15 12:57:39 +09:00
Michael Snoyman
4adf6d89ba
Merge pull request #804 from erikd/master
...
yesod-bin/Devel.hs : Relax requirements on location of Application.hs.
2014-08-14 13:36:13 +03:00
Erik de Castro Lopo
c20cb20438
yesod-bin/Devel.hs : Relax requirements on location of Application.hs.
...
I often move Application.hs to MyApp/Application.hs (and change the
module name as needed) which would result in yesod-bin printing a
warning about a missing Application.hs.
The code should now accept any file named Application.hs (either in
the top level source directory or somewhere in the tree.
2014-08-14 18:16:01 +10:00
Michael Snoyman
989343210a
Merge pull request #803 from creichert/master
...
Load keter config file with yml or yaml extension.
2014-08-14 08:11:57 +03:00
Christopher Reichert
c1f08eeb9f
Load keter config file with yml or yaml extension.
...
Complimentary fix for snoyberg/keter#41
2014-08-13 21:19:14 -05:00
Greg Weber
e74709433b
add yesodSpecApp
2014-08-11 16:23:41 -07:00
Greg Weber
00f8bcf59b
expose YesodExampleData
2014-08-11 15:58:47 -07:00
Michael Snoyman
fdb6ff9f5d
Merge pull request #802 from paul-rouse/master
...
Revise previous fix (#799 ) to yesod devel timeout
2014-08-08 14:29:14 +03:00
Paul Rouse
20dfec4d88
Revise previous fix ( #799 ) to yesod devel timeout
2014-08-08 11:10:07 +01:00
Michael Snoyman
a9f526bb39
Scaffolding changes for Ctrl-C
2014-08-08 11:28:33 +03:00
Michael Snoyman
c1ba0dc2fa
Version bump
2014-08-07 08:23:46 +03:00
Greg Weber
7d138fbf48
Merge pull request #799 from paul-rouse/master
...
Mitigate yesod devel load (#767 ) by increasing a timeout
2014-08-06 12:34:16 -07:00
Paul Rouse
1d3b60abef
Mitigate yesod devel load ( #767 ) by increasing a timeout
2014-08-06 20:27:24 +01:00
Michael Snoyman
9726f9c59f
Version bump
2014-08-06 14:03:53 +03:00
Michael Snoyman
cfb96fd316
add-handler: check if file exists #798
2014-08-06 13:47:34 +03:00
John Lenz
8cc1accc11
Include google person information in the credsExtra field for GoogleEmail2 auth
2014-08-05 22:46:55 -05:00
Michael Snoyman
6088f9049c
platform update
2014-08-05 22:56:54 +03:00
Michael Snoyman
68b4f455da
Don't include transformers-compat
2014-08-05 22:56:38 +03:00
Michael Snoyman
1959ec7aae
jqueryAutocmpleteField' #793
2014-08-04 12:29:35 +03:00
Michael Snoyman
9dba11c83c
Relax unix-compat
2014-08-03 19:43:40 +03:00
Michael Snoyman
0a619bf29a
Version bump
2014-08-03 16:23:16 +03:00
