Michael Snoyman
f779004d19
Merge yesod-routes into yesod-core entirely
2014-09-07 17:34:37 +03:00
Michael Snoyman
88b9217e25
Merge branch 'master' into yesod-1.4
2014-09-07 17:02:01 +03:00
Michael Snoyman
815901eeb4
Version bump
2014-09-07 16:58:00 +03:00
Michael Snoyman
be5ec95647
Clean up parsing module further
2014-09-07 16:55:37 +03:00
Michael Snoyman
bc00f3958f
Unified parsing and dispatching code (still ugly)
2014-09-07 16:55:37 +03:00
Michael Snoyman
a1ea34f196
Remove old dispatch method
2014-09-07 16:55:37 +03:00
Michael Snoyman
97af86e43a
Simplified done.cg #819
2014-09-03 17:56:20 +03:00
Michael Snoyman
8cbcc5fab3
Merge branch 'master' into yesod-1.4
2014-09-03 09:03:18 +03:00
Michael Snoyman
67438d191d
optparse-applicative 0.10
2014-09-03 08:20:10 +03:00
Greg Weber
ec91c8b59b
version bump
2014-09-01 20:19:25 -07:00
Greg Weber
867f0c02e0
Merge pull request #818 from HugoDaniel/patch-1
...
Fixes the "reader not in scope" error
2014-09-01 12:27:43 -05:00
Hugo Daniel
525a73a100
Update yesod-bin.cabal
...
This fixes the error:
[10 of 10] Compiling Main ( main.hs, dist/build/yesod/yesod-tmp/Main.o )
main.hs:192:35:
Not in scope: ‘reader’
Perhaps you meant one of these:
‘header’ (imported from Options.Applicative),
‘readIO’ (imported from Prelude), ‘readLn’ (imported from Prelude)
cabal: Error: some packages failed to install:
yesod-bin-1.2.12.5 failed during the building phase. The exception was:
ExitFailure 1
2014-09-01 18:12:20 +01:00
Michael Snoyman
2187c0cf8d
Add required to textareaField ( fixes #817 )
2014-09-01 07:19:15 +03:00
Michael Snoyman
3478841d15
Add required to textareaField ( fixes #817 )
2014-09-01 07:18:42 +03:00
Michael Snoyman
34980eff82
Merge pull request #816 from yesodweb/install-j
...
use -j for cabal install
2014-08-31 09:55:25 +03:00
Greg Weber
07c1baefc4
use -j for cabal install
2014-08-30 19:16:49 -07:00
Michael Snoyman
29d7e252f1
Merge branch 'master' into yesod-1.4
2014-08-31 05:04:27 +03:00
Michael Snoyman
1e76a28f6d
withUrlRenderer
2014-08-31 02:24:08 +03:00
Michael Snoyman
ebf3c8e4f2
Scaffolding update for #814
2014-08-31 00:22:34 +03:00
Michael Snoyman
9471399589
Merge branch 'master' into yesod-1.4
2014-08-28 05:19:21 +03:00
Michael Snoyman
d6b3d2a890
conduit 1.2 version bumps
2014-08-27 18:01:02 +03:00
Michael Snoyman
d3df218a96
conduit 1.2 patch
2014-08-27 17:34:35 +03:00
Michael Snoyman
fc66819535
Merge branch 'master' into yesod-1.4
...
Conflicts:
yesod-form/yesod-form.cabal
2014-08-27 11:18:21 +03:00
Michael Snoyman
8b2297adf4
Conditional support for persistent2 branch.
...
Pinging @gregwebs. I've backported the relevant tweaks on the yesod-1.4
branch, to allow master to compile against persistent2. Whenever you're
ready to release persistent2, we can:
1. Release persistent2.
2. Release new versions of yesod packages, which will work with
persistent 1.3 and 2.0.
3. Add an upper bound in Stackage to avoid using the new persistent
libraries until they're ready for primetime.
4. Release your blog post.
yesod-1.4 should then remove the CPP here and only work with
persistent2; the biggest "breaking change" in the 1.4 release will be
remove backwards compatibility hacks for persistent, conduit,
shakespeare, and wai.
2014-08-27 11:16:08 +03:00
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
