Tom Hughes d36fab2913 Merge branch 'master' into openid ... Conflicts: app/controllers/user_controller.rb app/views/user/login.html.erb config/locales/en.yml		2010-04-20 00:41:03 +01:00
..
_contact.html.erb	Don't try and show distances to friends if the user has no	2010-03-02 16:42:45 +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
account.html.erb	Merge branch 'master' into openid	2010-04-20 00:41:03 +01:00
api_details.builder	Fix file_column plugin to generate absolute URLs without falling over	2009-08-31 23:43:15 +00:00
confirm.html.erb	Rename views to rails 2 style names.	2009-06-09 20:50:14 +00:00
confirm_email.html.erb	Removed bogus space from translation token. Closes #2389.	2009-10-26 08:43:28 +00:00
index.html.erb	Rename views to rails 2 style names.	2009-06-09 20:50:14 +00:00
login.html.erb	Merge branch 'master' into openid	2010-04-20 00:41:03 +01: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	Merge branch 'master' into openid	2010-04-20 00:41:03 +01:00
no_such_user.html.erb	Rename views to rails 2 style names.	2009-06-09 20:50:14 +00: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
view.html.erb	Use the small PanZoom control on the user map instead of the	2010-03-11 18:29:35 +00:00