Merge branch 'master' into openid
[rails.git] / app / controllers / user_controller.rb
2010-05-09 Tom HughesMerge branch 'master' into openid
2010-05-09 Tom HughesOnly set pending users to active on a password reset
2010-05-07 Tom HughesMerge branch 'master' into openid
2010-05-07 Tom HughesRedirect after processing user changes
2010-05-07 Tom HughesRedirect back to settings after updating user settings
2010-05-06 Tom HughesAdd a user list view for administrators
2010-05-06 Tom HughesTell users their account has been suspended when they...
2010-05-06 Tom HughesMerge all the user status changing methods into one
2010-05-06 Tom HughesAdd support for suspended and confirmed users
2010-05-02 Ævar Arnfjörð Bjar... M-x untabify Kai Krueger's ebcc988376b0dad8a0969803d52b...
2010-05-02 Ævar Arnfjörð Bjar... Merge remote branch 'apmon/openID' into openID
2010-05-02 Kai KruegerMerge branch 'master' of git://git.openstreetmap.org...
2010-05-02 Kai KruegerAdd an extra null pointer check that can trigger in...
2010-05-02 Ævar Arnfjörð Bjar... Merge branch 'master' into openID
2010-05-01 Kai KruegerMake it a bit clear when you try and login with openID...
2010-04-27 Ævar Arnfjörð Bjar... Merge remote branch 'remotes/apmon/openID' into openID
2010-04-27 Kai KruegerMerge branch 'openID' of git://github.com/avar/osm...
2010-04-27 Kai KruegerIt was not possible to remove an OpenID from your user...
2010-04-27 Ævar Arnfjörð Bjar... Merge branch 'master' into openID
2010-04-24 Ævar Arnfjörð Bjar... Correctly indent this if/else clause
2010-04-24 Ævar Arnfjörð Bjar... Merge branch 'master' into openID
2010-04-24 Kai KruegerCorrect merge issues in the last merge from master
2010-04-20 Ævar Arnfjörð Bjar... M-x untabify the OpenID branch
2010-04-20 Ævar Arnfjörð Bjar... Merge branch 'master' into openID
2010-04-19 Tom HughesMerge branch 'master' into openid
2010-03-14 Tom HughesRequire the session ID to log somebody out - if it...
2010-02-28 Tom HughesAllow a logged in user to relogin as a different user...
2010-02-27 Tom HughesRework the user details screen to be less crap... Highl...
2010-02-27 Kai Kruegermerge 19889:20181 of rails_port into the openID branch
2010-02-27 Tom HughesRemove unused set_home method from user controller.
2010-02-26 Tom HughesMove support for adding and deleting user images to...
2010-02-26 Tom HughesRedirect back to the login page after a successful...
2010-02-25 Tom HughesIgnore exceptions when sending email to confirm changes...
2010-02-25 Tom HughesAdd a "remember me" box to the login screen that causes...
2010-02-09 Tom HughesDisplay the current email address and any pending new...
2010-02-08 Tom HughesHandle duplicate address errors properly when confirmin...
2010-02-06 Kai Kruegermerge 19601:19888 of rails_port into the openID branch
2010-01-23 Kai Kruegermerge 19364:19600 of rails_port into the openID branch
2010-01-23 Kai KruegerFixed some failing tests caused by the openID changes
2010-01-23 Kai KruegerAllow to not specify a password when signing up with...
2010-01-22 Kai KruegerRearranged some code in the OpenID signup page to make...
2010-01-21 Tom HughesAdd a sweeper to clean up cache entries when a user...
2010-01-15 Kai KruegerMake it possible to associate an openID during account...
2010-01-10 Kai KruegerThis is the initial implementation of login via OpenID
2009-11-01 Tom HughesAdd :warning and :error flash messages which can be...
2009-11-01 Tom HughesWe don't need the @notice hack - we can use flash.now...
2009-10-13 Tom HughesMerge 17130 from trunk.
2009-10-13 Tom HughesMerged 17073:17076 from trunk.
2009-10-13 Tom HughesMerged 17047 from trunk.
2009-10-13 Tom HughesMerge 17067 from trunk.
2009-10-13 Tom HughesMerged 17256:18123 from trunk.
2009-10-12 Tom HughesAdd some administrator only actions to the user page.
2009-10-09 Tom HughesTest that the user has cookies enabled at critical...
2009-10-06 Tom HughesMerge blocking branch to head.
2009-10-05 Tom HughesMerge 17944:17988 from trunk.
2009-10-02 Matt AmosMerging 17905:17944 from trunk.
2009-10-01 Matt AmosMerging 17846:17904 from trunk.
2009-09-29 Andy AllanMerge r17285 from the oauth branch - allow flash access...
2009-09-29 Matt AmosMerging 17824:17845 from trunk to blocking branch.
2009-09-28 Matt AmosFirst version of blocking feature. Allows both time...
2009-08-31 Tom HughesTidy up.
2009-08-31 Matt AmosAdded user ID, description, languages and image link...
2009-08-25 Matt Amosmerge r17141:17256 from trunk
2009-08-25 Matt AmosAdded referer URL in user_token so that redirections...
2009-08-18 Tom HughesMerge oauth branch at r17138 to trunk.
2009-08-13 Tom HughesMerge 16891:17044 from trunk.
2009-08-06 Matt AmosMerging 16820:16891 from trunk.
2009-08-04 Tom HughesTweak the password reset pages a bit.
2009-08-03 Tom HughesMerge 16817:16819 from trunk.
2009-08-03 Tom HughesMerge 16743:16811 from trunk.
2009-08-03 Tom HughesRework password reset system to do away with the second...
2009-07-31 Matt AmosMerged 16488:16743 from trunk.
2009-07-14 Tom HughesMerge 16110:16487 from trunk.
2009-06-25 Tom HughesMerge 16070:16110 from trunk.
2009-06-23 Tom HughesRevert r16046.
2009-06-22 Matt AmosAdding initial version of the OAuth token authenticatio...
2009-06-06 Ævar Arnfjörð Bjar... Added & cleaned up messages relating to a given user...
2009-06-03 Tom HughesMake a few more things translatable.
2009-06-03 Tom HughesUse "confirm_email" instead "confirm email" in resource...
2009-06-03 Ævar Arnfjörð Bjar... * Made "Account not active" and "Couldn't log in with...
2009-06-03 Ævar Arnfjörð Bjar... * Made the "Confirmed your account/email" messages...
2009-06-01 Tom HughesFix misspelt resource name.
2009-05-31 Tom HughesMerged I18N branch to head.
2009-05-31 Tom HughesAdd a simple edit control for the user's preferred...
2009-05-31 Tom HughesSort out storage and use of user preferred languages.
2009-05-30 Shaun McDonaldFix a few typos
2009-05-30 Shaun McDonaldSome more of the user account translations. Custom...
2009-05-29 Shaun McDonaldMight be useful to set the locale everywhere we need...
2009-05-09 Tom HughesAdd a warning about whitelisting webmaster@openstreetma...
2009-04-20 Tom HughesMerge api06 branch to trunk.
2009-04-16 Tom HughesMerge 14394:14533 from trunk.
2009-04-14 Tom HughesAdd a "database readonly" state that allows all writes...
2009-04-12 Shaun McDonaldMore tests, found a bug in the data browser, no fix...
2009-04-08 Tom HughesMerge 14059:14394 from trunk.
2009-03-12 Tom HughesMerged 14009:14059 from trunk.
2009-03-08 Tom HughesMerge 12304:14009 from trunk.
2009-02-19 Tom HughesAdd an ACL system to allow key/value pairs to be attach...
2008-12-14 Shaun McDonaldReturn, rather than allow a second render to happen...
2008-12-12 Shaun McDonaldresync from rails_port 11795:12304
2008-12-11 Shaun McDonaldDon't give an error when you access the login page...
next