Commit Graph

12 Commits

Author SHA1 Message Date
Michael Snoyman
3ecbf43f5d $newline 2012-07-01 20:59:37 +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
Pascal Wittmann
f4e743e50d removed QQ hacks from yesod-auth 2012-03-15 22:08:19 +01:00
Michael Snoyman
4cc468ca3b Beginning of old widget function deprecation, not complete 2012-03-13 06:36:27 +02:00
Michael Snoyman
cbd0719f37 conduit 0.3 2012-03-12 13:40:04 +02:00
Michael Snoyman
0ca5e4878e Avoid use of error (#220) 2012-01-17 09:06:06 +02:00
Michael Snoyman
d478065ffc BrowserID cleanup 2012-01-17 09:06:06 +02:00
Michael Snoyman
1b3eb2b282 yesod-auth on authenticate 1.0.0 2012-01-10 11:38:59 +02:00
Michael Snoyman
69a5d0e0ed Whole repo builds with new yesod-routes 2012-01-05 15:27:16 +02:00
Michael Snoyman
6936331a37 Fix authBrowserId 2012-01-01 17:16:33 +02:00
Michael Snoyman
b00fd948bd authBrowserId' 2011-09-11 08:53:41 +03:00
Michael Snoyman
cd5ee0fb12 Add 'yesod-auth/' from commit 'fe498e3dac01bfc999cad33b90a2b1b397785178'
git-subtree-dir: yesod-auth
git-subtree-mainline: a7df7531dc
git-subtree-split: fe498e3dac
2011-07-22 08:59:54 +03:00