git.openstreetmap.org Git - rails.git/history - app/controllers/user

]> git.openstreetmap.org Git - rails.git/history - app/controllers/user_controller.rb

[rails.git] / app / controllers / user_controller.rb

2010-05-09	Tom Hughes	Rework the signup page	blob \| commitdiff \| raw
2010-05-09	Tom Hughes	Merge branch 'master' into openid	blob \| commitdiff \| raw \| diff to current
2010-05-09	Tom Hughes	Only set pending users to active on a password reset	blob \| commitdiff \| raw \| diff to current
2010-05-07	Tom Hughes	Merge branch 'master' into openid	blob \| commitdiff \| raw \| diff to current
2010-05-07	Tom Hughes	Redirect after processing user changes	blob \| commitdiff \| raw \| diff to current
2010-05-07	Tom Hughes	Redirect back to settings after updating user settings	blob \| commitdiff \| raw \| diff to current
2010-05-06	Tom Hughes	Add a user list view for administrators	blob \| commitdiff \| raw \| diff to current
2010-05-06	Tom Hughes	Tell users their account has been suspended when they...	blob \| commitdiff \| raw \| diff to current
2010-05-06	Tom Hughes	Merge all the user status changing methods into one	blob \| commitdiff \| raw \| diff to current
2010-05-06	Tom Hughes	Add support for suspended and confirmed users	blob \| commitdiff \| raw \| diff to current
2010-05-02	Ævar Arnfjörð Bjar...	M-x untabify Kai Krueger's ebcc988376b0dad8a0969803d52b...	blob \| commitdiff \| raw \| diff to current
2010-05-02	Ævar Arnfjörð Bjar...	Merge remote branch 'apmon/openID' into openID	blob \| commitdiff \| raw \| diff to current
2010-05-02	Kai Krueger	Merge branch 'master' of git://git.openstreetmap.org...	blob \| commitdiff \| raw \| diff to current
2010-05-02	Kai Krueger	Add an extra null pointer check that can trigger in...	blob \| commitdiff \| raw \| diff to current
2010-05-02	Ævar Arnfjörð Bjar...	Merge branch 'master' into openID	blob \| commitdiff \| raw \| diff to current
2010-05-01	Kai Krueger	Make it a bit clear when you try and login with openID...	blob \| commitdiff \| raw \| diff to current
2010-04-27	Ævar Arnfjörð Bjar...	Merge remote branch 'remotes/apmon/openID' into openID	blob \| commitdiff \| raw \| diff to current
2010-04-27	Kai Krueger	Merge branch 'openID' of git://github.com/avar/osm...	blob \| commitdiff \| raw \| diff to current
2010-04-27	Kai Krueger	It was not possible to remove an OpenID from your user...	blob \| commitdiff \| raw \| diff to current
2010-04-27	Ævar Arnfjörð Bjar...	Merge branch 'master' into openID	blob \| commitdiff \| raw \| diff to current
2010-04-24	Ævar Arnfjörð Bjar...	Correctly indent this if/else clause	blob \| commitdiff \| raw \| diff to current
2010-04-24	Ævar Arnfjörð Bjar...	Merge branch 'master' into openID	blob \| commitdiff \| raw \| diff to current
2010-04-24	Kai Krueger	Correct merge issues in the last merge from master	blob \| commitdiff \| raw \| diff to current
2010-04-20	Ævar Arnfjörð Bjar...	M-x untabify the OpenID branch	blob \| commitdiff \| raw \| diff to current
2010-04-20	Ævar Arnfjörð Bjar...	Merge branch 'master' into openID	blob \| commitdiff \| raw \| diff to current
2010-04-19	Tom Hughes	Merge branch 'master' into openid	blob \| commitdiff \| raw \| diff to current
2010-03-14	Tom Hughes	Require the session ID to log somebody out - if it...	blob \| commitdiff \| raw \| diff to current
2010-02-28	Tom Hughes	Allow a logged in user to relogin as a different user...	blob \| commitdiff \| raw \| diff to current
2010-02-27	Tom Hughes	Rework the user details screen to be less crap... Highl...	blob \| commitdiff \| raw \| diff to current
2010-02-27	Kai Krueger	merge 19889:20181 of rails_port into the openID branch	blob \| commitdiff \| raw \| diff to current
2010-02-27	Tom Hughes	Remove unused set_home method from user controller.	blob \| commitdiff \| raw \| diff to current
2010-02-26	Tom Hughes	Move support for adding and deleting user images to...	blob \| commitdiff \| raw \| diff to current
2010-02-26	Tom Hughes	Redirect back to the login page after a successful...	blob \| commitdiff \| raw \| diff to current
2010-02-25	Tom Hughes	Ignore exceptions when sending email to confirm changes...	blob \| commitdiff \| raw \| diff to current
2010-02-25	Tom Hughes	Add a "remember me" box to the login screen that causes...	blob \| commitdiff \| raw \| diff to current
2010-02-09	Tom Hughes	Display the current email address and any pending new...	blob \| commitdiff \| raw \| diff to current
2010-02-08	Tom Hughes	Handle duplicate address errors properly when confirmin...	blob \| commitdiff \| raw \| diff to current
2010-02-06	Kai Krueger	merge 19601:19888 of rails_port into the openID branch	blob \| commitdiff \| raw \| diff to current
2010-01-23	Kai Krueger	merge 19364:19600 of rails_port into the openID branch	blob \| commitdiff \| raw \| diff to current
2010-01-23	Kai Krueger	Fixed some failing tests caused by the openID changes	blob \| commitdiff \| raw \| diff to current
2010-01-23	Kai Krueger	Allow to not specify a password when signing up with...	blob \| commitdiff \| raw \| diff to current
2010-01-22	Kai Krueger	Rearranged some code in the OpenID signup page to make...	blob \| commitdiff \| raw \| diff to current
2010-01-21	Tom Hughes	Add a sweeper to clean up cache entries when a user...	blob \| commitdiff \| raw \| diff to current
2010-01-15	Kai Krueger	Make it possible to associate an openID during account...	blob \| commitdiff \| raw \| diff to current
2010-01-10	Kai Krueger	This is the initial implementation of login via OpenID	blob \| commitdiff \| raw \| diff to current
2009-11-01	Tom Hughes	Add :warning and :error flash messages which can be...	blob \| commitdiff \| raw \| diff to current
2009-11-01	Tom Hughes	We don't need the @notice hack - we can use flash.now...	blob \| commitdiff \| raw \| diff to current
2009-10-13	Tom Hughes	Merge 17130 from trunk.	blob \| commitdiff \| raw \| diff to current
2009-10-13	Tom Hughes	Merged 17073:17076 from trunk.	blob \| commitdiff \| raw \| diff to current
2009-10-13	Tom Hughes	Merged 17047 from trunk.	blob \| commitdiff \| raw \| diff to current
2009-10-13	Tom Hughes	Merge 17067 from trunk.	blob \| commitdiff \| raw \| diff to current
2009-10-13	Tom Hughes	Merged 17256:18123 from trunk.	blob \| commitdiff \| raw \| diff to current
2009-10-12	Tom Hughes	Add some administrator only actions to the user page.	blob \| commitdiff \| raw \| diff to current
2009-10-09	Tom Hughes	Test that the user has cookies enabled at critical...	blob \| commitdiff \| raw \| diff to current
2009-10-06	Tom Hughes	Merge blocking branch to head.	blob \| commitdiff \| raw \| diff to current
2009-10-05	Tom Hughes	Merge 17944:17988 from trunk.	blob \| commitdiff \| raw \| diff to current
2009-10-02	Matt Amos	Merging 17905:17944 from trunk.	blob \| commitdiff \| raw \| diff to current
2009-10-01	Matt Amos	Merging 17846:17904 from trunk.	blob \| commitdiff \| raw \| diff to current
2009-09-29	Andy Allan	Merge r17285 from the oauth branch - allow flash access...	blob \| commitdiff \| raw \| diff to current
2009-09-29	Matt Amos	Merging 17824:17845 from trunk to blocking branch.	blob \| commitdiff \| raw \| diff to current
2009-09-28	Matt Amos	First version of blocking feature. Allows both time...	blob \| commitdiff \| raw \| diff to current
2009-08-31	Tom Hughes	Tidy up.	blob \| commitdiff \| raw \| diff to current
2009-08-31	Matt Amos	Added user ID, description, languages and image link...	blob \| commitdiff \| raw \| diff to current
2009-08-25	Matt Amos	merge r17141:17256 from trunk	blob \| commitdiff \| raw \| diff to current
2009-08-25	Matt Amos	Added referer URL in user_token so that redirections...	blob \| commitdiff \| raw \| diff to current
2009-08-18	Tom Hughes	Merge oauth branch at r17138 to trunk.	blob \| commitdiff \| raw \| diff to current
2009-08-13	Tom Hughes	Merge 16891:17044 from trunk.	blob \| commitdiff \| raw \| diff to current
2009-08-06	Matt Amos	Merging 16820:16891 from trunk.	blob \| commitdiff \| raw \| diff to current
2009-08-04	Tom Hughes	Tweak the password reset pages a bit.	blob \| commitdiff \| raw \| diff to current
2009-08-03	Tom Hughes	Merge 16817:16819 from trunk.	blob \| commitdiff \| raw \| diff to current
2009-08-03	Tom Hughes	Merge 16743:16811 from trunk.	blob \| commitdiff \| raw \| diff to current
2009-08-03	Tom Hughes	Rework password reset system to do away with the second...	blob \| commitdiff \| raw \| diff to current
2009-07-31	Matt Amos	Merged 16488:16743 from trunk.	blob \| commitdiff \| raw \| diff to current
2009-07-14	Tom Hughes	Merge 16110:16487 from trunk.	blob \| commitdiff \| raw \| diff to current
2009-06-25	Tom Hughes	Merge 16070:16110 from trunk.	blob \| commitdiff \| raw \| diff to current
2009-06-23	Tom Hughes	Revert r16046.	blob \| commitdiff \| raw \| diff to current
2009-06-22	Matt Amos	Adding initial version of the OAuth token authenticatio...	blob \| commitdiff \| raw \| diff to current
2009-06-06	Ævar Arnfjörð Bjar...	Added & cleaned up messages relating to a given user...	blob \| commitdiff \| raw \| diff to current
2009-06-03	Tom Hughes	Make a few more things translatable.	blob \| commitdiff \| raw \| diff to current
2009-06-03	Tom Hughes	Use "confirm_email" instead "confirm email" in resource...	blob \| commitdiff \| raw \| diff to current
2009-06-03	Ævar Arnfjörð Bjar...	* Made "Account not active" and "Couldn't log in with...	blob \| commitdiff \| raw \| diff to current
2009-06-03	Ævar Arnfjörð Bjar...	* Made the "Confirmed your account/email" messages...	blob \| commitdiff \| raw \| diff to current
2009-06-01	Tom Hughes	Fix misspelt resource name.	blob \| commitdiff \| raw \| diff to current
2009-05-31	Tom Hughes	Merged I18N branch to head.	blob \| commitdiff \| raw \| diff to current
2009-05-31	Tom Hughes	Add a simple edit control for the user's preferred...	blob \| commitdiff \| raw \| diff to current
2009-05-31	Tom Hughes	Sort out storage and use of user preferred languages.	blob \| commitdiff \| raw \| diff to current
2009-05-30	Shaun McDonald	Fix a few typos	blob \| commitdiff \| raw \| diff to current
2009-05-30	Shaun McDonald	Some more of the user account translations. Custom...	blob \| commitdiff \| raw \| diff to current
2009-05-29	Shaun McDonald	Might be useful to set the locale everywhere we need...	blob \| commitdiff \| raw \| diff to current
2009-05-09	Tom Hughes	Add a warning about whitelisting webmaster@openstreetma...	blob \| commitdiff \| raw \| diff to current
2009-04-20	Tom Hughes	Merge api06 branch to trunk.	blob \| commitdiff \| raw \| diff to current
2009-04-16	Tom Hughes	Merge 14394:14533 from trunk.	blob \| commitdiff \| raw \| diff to current
2009-04-14	Tom Hughes	Add a "database readonly" state that allows all writes...	blob \| commitdiff \| raw \| diff to current
2009-04-12	Shaun McDonald	More tests, found a bug in the data browser, no fix...	blob \| commitdiff \| raw \| diff to current
2009-04-08	Tom Hughes	Merge 14059:14394 from trunk.	blob \| commitdiff \| raw \| diff to current
2009-03-12	Tom Hughes	Merged 14009:14059 from trunk.	blob \| commitdiff \| raw \| diff to current
2009-03-08	Tom Hughes	Merge 12304:14009 from trunk.	blob \| commitdiff \| raw \| diff to current
2009-02-19	Tom Hughes	Add an ACL system to allow key/value pairs to be attach...	blob \| commitdiff \| raw \| diff to current
2008-12-14	Shaun McDonald	Return, rather than allow a second render to happen...	blob \| commitdiff \| raw \| diff to current
2008-12-12	Shaun McDonald	resync from rails_port 11795:12304	blob \| commitdiff \| raw \| diff to current
next

The OpenStreetMap web site

RSS Atom