openstreetmap-website/app/views/user
Tom Hughes 11aff90f63 Merge branch 'master' into openid
Conflicts:
	app/controllers/user_controller.rb
	app/views/user/login.html.erb
	public/stylesheets/common.css
2011-02-10 14:10:19 +00:00
..
_contact.html.erb Show the latest changeset for each of the contacts on the user page 2010-12-17 13:36:53 +00:00
_map.html.erb Fix warnings. 2010-03-11 18:52:35 +00:00
_popup.html.erb Improve user popups on friend/nearby mapper maps. 2010-03-11 18:23:22 +00:00
_terms.html.erb Don't refer to the decline button when there isn't one 2010-08-12 18:09:36 +01:00
_user.html.erb Don't try and display IP address for users without one 2010-05-07 09:29:38 +01:00
account.html.erb Merge branch 'master' into openid 2011-02-10 14:10:19 +00:00
api_details.builder Add new <contributor-terms> element to user details 2010-08-12 17:47:51 +01:00
confirm.html.erb Allow users to send themselves a new confirmation email 2010-10-04 21:52:58 +01:00
confirm_email.html.erb Use javascript to automatically submit confirmation forms 2010-10-04 19:11:01 +01:00
index.html.erb Rename views to rails 2 style names. 2009-06-09 20:50:14 +00:00
list.html.erb Preserve parameters in pagination links 2010-05-07 14:08:07 +01:00
login.html.erb Merge branch 'master' into openid 2011-02-10 14:10:19 +00:00
logout.html.erb Require the session ID to log somebody out - if it isn't given we just 2010-03-14 15:29:53 +00:00
lost_password.html.erb Improve the UI of the /user/forgot-password page 2009-10-14 19:49:20 +00:00
new.html.erb Report duplicate OpenID URLs cleanly 2010-05-11 22:08:52 +01:00
no_such_user.html.erb Case #2908: Escape user name in user not found error 2010-04-22 00:43:31 +01:00
reset_password.html.erb Tweak the password reset pages a bit. 2009-08-04 00:14:03 +00:00
save.html.erb Rename views to rails 2 style names. 2009-06-09 20:50:14 +00:00
suspended.html.erb Make the suspended user view work again 2010-07-20 08:55:08 +01:00
terms.html.erb Make terms page work during OpenID based signup 2010-10-01 21:07:34 +01:00
view.html.erb Merge all the user status changing methods into one 2010-05-06 17:18:34 +01:00