Commit Graph

18 Commits

Author SHA1 Message Date
Michael Snoyman
699d76d13a Merge branch 'beta'
Conflicts:
	yesod-core/yesod-core.cabal
	yesod-json/yesod-json.cabal
	yesod-test/Yesod/Test.hs
	yesod-test/test/main.hs
	yesod-test/yesod-test.cabal
2012-07-11 08:48:09 +03:00
Michael Snoyman
a5b4dd5d29 atom:author (#351) 2012-07-02 09:46:35 +03:00
Michael Snoyman
3ecbf43f5d $newline 2012-07-01 20:59:37 +03:00
Michael Snoyman
ebc737a5cb conduit 0.5 2012-06-22 15:28:14 +03:00
Michael Snoyman
e99a852cfb Fix a typo 2012-06-05 06:14:45 +03:00
Michael Snoyman
49ebe878f0 yesod-newsfeed: blaze-html 0.5 2012-04-23 14:18:41 +03:00
Michael Snoyman
6461edf00b Feeds use xml-conduit (#301) 2012-04-03 09:51:04 +03:00
Michael Snoyman
67ae9c739b Merge commit 'e4e2dd75cc86909d66062a7655b8cbc3a959932d'
Conflicts:
	yesod-auth/Yesod/Auth.hs
	yesod-auth/Yesod/Auth/BrowserId.hs
	yesod-auth/Yesod/Auth/Dummy.hs
	yesod-auth/Yesod/Auth/Email.hs
	yesod-auth/Yesod/Auth/HashDB.hs
	yesod-auth/Yesod/Auth/OpenId.hs
	yesod-auth/Yesod/Auth/Rpxnow.hs
	yesod-form/Yesod/Form/Fields.hs
	yesod-form/Yesod/Form/Functions.hs
	yesod-form/Yesod/Form/Jquery.hs
	yesod-form/Yesod/Form/Nic.hs
	yesod-form/Yesod/Helpers/Crud.hs
	yesod-newsfeed/Yesod/AtomFeed.hs
	yesod-newsfeed/Yesod/RssFeed.hs
2012-03-25 11:07:12 +02:00
Michael Snoyman
1f1c6ca9d4 Fixes 2012-03-23 16:02:50 +02:00
Pascal Wittmann
6155e135b0 removed QQ hacks from yesod-newsfeed 2012-03-15 22:13:02 +01:00
Michael Snoyman
e62e4b8721 Finished deprecating old Widget functions 2012-03-13 13:11:05 +02:00
Michael Snoyman
b5f2e4863d Remove some QQ hacks #288 2012-03-12 08:50:15 +02:00
Michael Snoyman
320b71d3ac yesod-newsfeed: replace String with Text 2012-03-12 08:50:15 +02:00
Luite Stegeman
9905011721 Workaround for GHC warnings (#252) 2012-02-03 14:04:03 +01:00
Michael Snoyman
69a5d0e0ed Whole repo builds with new yesod-routes 2012-01-05 15:27:16 +02:00
Michael Snoyman
50ce1da37e Everything builds 2011-12-28 10:03:14 +02:00
Michael Snoyman
a4bfb2a0ca Mirror naming changes in shakespeare 2011-08-18 17:59:25 +03:00
Michael Snoyman
894336a482 Add 'yesod-newsfeed/' from commit 'e68851b9db97519e0cade5dc10bb964c270b4a9a'
git-subtree-dir: yesod-newsfeed
git-subtree-mainline: 83813b1df4
git-subtree-split: e68851b9db
2011-07-22 08:59:57 +03:00