Commit Graph

19 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
e62e4b8721 Finished deprecating old Widget functions 2012-03-13 13:11:05 +02:00
Michael Snoyman
cbd0719f37 conduit 0.3 2012-03-12 13:40:04 +02:00
Michael Snoyman
26fe38a9f4 maybeAuth/requireAuth use Entity 2012-01-31 13:02:18 +02:00
Michael Snoyman
2f38ddaff3 Temporarily remove sessionIpAddress (#243) 2012-01-31 06:53:47 +02:00
Michael Snoyman
30d8697d54 sqlMkSettings -> sqlSettings 2012-01-13 06:11:31 +02:00
Michael Snoyman
352f577de6 Fix some warnings 2012-01-12 07:56:19 +02:00
Michael Snoyman
ca9bb6e449 More pair -> Entity changes 2012-01-10 11:20:17 +02:00
Michael Snoyman
f57efbe1b0 Expose Unique (#209) 2012-01-10 11:19:30 +02:00
Michael Snoyman
69f2f7b3e7 Updated yesod-auth for redirect changes 2012-01-07 22:08:29 +02:00
Michael Snoyman
50ce1da37e Everything builds 2011-12-28 10:03:14 +02:00
Greg Weber
13eb7c8230 setSaltAndUserHash -> setSaltAndPasswordHash 2011-10-24 07:09:21 -07:00
Greg Weber
c1c0a9b226 setSaltAndUserHash -> setUserHashAndSalt 2011-10-22 22:07:53 -07:00
Michael Snoyman
a4bfb2a0ca Mirror naming changes in shakespeare 2011-08-18 17:59:25 +03:00
Michael Snoyman
bc5079383d Fix for Persistent G -> Generic 2011-08-18 16:30:45 +03:00
Michael Snoyman
f6ab5c05dc Everything building with Hamlet 0.10, scaffolding not fixed yet 2011-08-09 16:48:24 +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