Commit graph

853 commits

Author SHA1 Message Date
Ævar Arnfjörð Bjarmason
19c5f8aeaa M-x untabify the OpenID branch 2010-04-20 23:47:23 +00:00
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
Tom Hughes
ae4ece2450 Don't send "408 Request timeout" responses from the data browser as it
seems to make some browsers automatically retry.
2010-04-19 14:28:02 +01:00
Tom Hughes
7f1691e878 Update the inbox link in the greeting bar when messages are marked
as read or unread.
2010-03-14 16:02:30 +00:00
Tom Hughes
a7d304d20f Require the session ID to log somebody out - if it isn't given we just
show a confirmation page. Closes #2792.
2010-03-14 15:29:53 +00:00
Tom Hughes
74852271c9 Fix the selection of the message to be deleted. 2010-03-06 00:26:32 +00:00
Tom Hughes
b90567e197 Tidy up error handling in the message controller, and make it redirect to
the login page if you are logged in as the wrong user. Closes #1569.
2010-02-28 15:13:06 +00:00
Tom Hughes
938cbcd862 Allow a logged in user to relogin as a different user just by visiting
the login page.
2010-02-28 14:36:07 +00:00
Tom Hughes
acd72861ed Rework the user details screen to be less crap... Highlights include:
- Map is smaller and placed to the side with lists of friends
    and nearby users (now excluding friends) beside it.

  - Map includes friends as well as nearby users.

  - Friend and nearby user lists include photos and links to
    friend/unfriend as appropriate.

  - OAuth settings link moved up with all the other links in the
    main navigation bar.

The addition of friends to the map also carries through to the user
settings page.
2010-02-27 18:11:04 +00:00
Tom Hughes
e076d824bf Make sure we report "no results" when Nominatim's reverse geocoder fails
to find any results.
2010-02-27 12:52:30 +00:00
Kai Krueger
bbf30e76e4 merge 19889:20181 of rails_port into the openID branch
merge conflicts with the remember_me functionality
2010-02-27 11:21:15 +00:00
Tom Hughes
fbe529d87e Remove unused set_home method from user controller. 2010-02-27 00:02:22 +00:00
Tom Hughes
c55490d24e Move support for adding and deleting user images to the user settings
page and reposition the user image ont he user page in the top right
corner of the page.
2010-02-26 23:44:43 +00:00
Tom Hughes
3851a672e2 Ajaxify the mark read/unread function for messages so it doesn't
reload the whole page each time.
2010-02-26 16:35:36 +00:00
Tom Hughes
30c47f4ac4 Redirect back to the login page after a successful request to
send a lost password mail. Closes #1699.
2010-02-26 15:50:40 +00:00
Tom Hughes
2df3a8d2e2 Rethrow ActionController::UnknownAction exceptions encountered by
the API so that rails handles them in the normal way and shows
the 404 page to the user. Closes #1989.
2010-02-26 15:27:52 +00:00
Tom Hughes
ba1ecf61f3 Put the correct icon URLs in the RSS feed for traces. 2010-02-26 15:11:40 +00:00
Tom Hughes
b547145865 Ignore exceptions when sending email to confirm changes of email
address. Closes #2744.
2010-02-25 19:09:28 +00:00
Tom Hughes
c879f87a45 Add a "remember me" box to the login screen that causes you to stay
logged in across browser restarts - you will only be logged out if you
don't visit for a month. Closes #1030.
2010-02-25 16:50:56 +00:00
Tom Hughes
d702a29810 Send queries which look like US or Canadian postcodes to Nominatim as
well as the specialised postcode search engines.
2010-02-21 17:56:04 +00:00
Richard Fairhurst
4de68be303 join/unjoin fixes, plus better amf_controller error handling for deleted items 2010-02-11 00:48:15 +00:00
Tom Hughes
846699104d Display the current email address and any pending new email address
separately on the user settings page.
2010-02-09 11:54:40 +00:00
Tom Hughes
d907b40eab Improve page title for diary entries. Closes #2702. 2010-02-08 18:15:51 +00:00
Tom Hughes
d24312fa8c Handle duplicate address errors properly when confirming a change of
email address.
2010-02-08 18:04:04 +00:00
Kai Krueger
17a7c69e8d merge 19601:19888 of rails_port into the openID branch 2010-02-06 13:13:52 +00:00
Richard Fairhurst
ce85092f57 force changeset id to be an int so we don't have a table scan 2010-02-03 16:50:39 +00:00
Tom Hughes
1e6bcb6c2d Made the trackpoints call return a more sensible filename. 2010-01-27 13:51:15 +00:00
Tom Hughes
8e9a542482 Use the right variable this time... 2010-01-27 09:07:25 +00:00
Tom Hughes
2330a1a378 Specify the user when redirecting back to a diary entry after
hiding a comment.
2010-01-27 09:02:27 +00:00
Kai Krueger
84db1d66b7 merge 19364:19600 of rails_port into the openID branch
renamed migration 049_add_open_id_authentication_tables.rb to
050_add_open_id_authentication_tables.rb
2010-01-23 15:31:01 +00:00
Kai Krueger
45f12aa99e Fixed some failing tests caused by the openID changes 2010-01-23 14:23:35 +00:00
Kai Krueger
f0cac0fcc3 Allow to not specify a password when signing up with openID
If the password field has a length of 0 and we have a valid
openID, then disable password login by generating a random
unknown password.

This still needs some warnings to indicate that not all services
such as trac, the forum or some editors are supported with
openid only via oauth.
2010-01-23 01:38:18 +00:00
Kai Krueger
d9ed74265f Rearranged some code in the OpenID signup page to make it cleaner 2010-01-22 23:31:35 +00:00
Tom Hughes
86cbb404e9 Add a sweeper to clean up cache entries when a user's visibility or
display name changes.
2010-01-21 11:39:28 +00:00
Kai Krueger
92951c6c00 Make it possible to associate an openID during account creation 2010-01-15 19:48:13 +00:00
Tom Hughes
62e7006a21 Rework the pagination of the trace list to avoid having to count
the total number of matching records/pages.
2010-01-14 00:35:09 +00:00
Tom Hughes
fa554045e5 Make cache distinguish pages views by admins or moderators from those
viewed by normal users.
2010-01-13 21:30:09 +00:00
Tom Hughes
8865543903 I really wish rails would stop trying to hide exceptions from me... 2010-01-13 13:34:59 +00:00
Tom Hughes
7381dad23b Generate cache paths in the same way as the normal expire_action routine
so that the escaping matches correctly.
2010-01-11 18:24:55 +00:00
Tom Hughes
841ebe80d7 Use system_timer for timeouts to make them more reliable. 2010-01-11 09:28:31 +00:00
Tom Hughes
f5777a881f Don't cache the trace list for logged in users. 2010-01-11 00:16:21 +00:00
Tom Hughes
e29e49dc7c Add some caching for trace views. 2010-01-10 17:44:57 +00:00
Kai Krueger
ca558c692e This is the initial implementation of login via OpenID
This is the patch presented in trac ticket #2500

With this commit, it is possible to assosciate an openID
to an existing OSM account. Once associated, it is possible
to either login via OpenID, or as always via username and password.

Other aspects, such as account creation and the need for a valid email
are unchanged.
2010-01-10 17:41:32 +00:00
Tom Hughes
e53b34b80a Make traces/mine redirect to the user's traces page instead of rendering
it itself. Also make sure the traces page for a user includes the upload
form if the requestor is logged in as that user.
2010-01-10 09:16:18 +00:00
Tom Hughes
314b734aa5 Introduce some caching for diary views. 2010-01-09 16:43:38 +00:00
Tom Hughes
e0e849c91c Add a 30 second timeout to all data browser requests to avoid attempts
to browse very large and/or complicated objects blocking other requests.
2010-01-07 16:09:44 +00:00
Tom Hughes
fcebfd1fe7 Drop Namefinder from search results. 2010-01-06 00:31:03 +00:00
Tom Hughes
4f23e718b4 Add a "More results" link to Nominatim search results. 2010-01-06 00:30:29 +00:00
Shaun McDonald
1df4ad819c Rather than just say public or private for each GPS trace in the list, instead state the new permission levels. Green colour means that it will be shown in the trace list to other users. Red means that other users won't see the trace in the list. Have added two new translations for the other trace permissions. 2009-12-31 00:10:10 +00:00
Matt Amos
b3f4637a42 Fixed copy-n-paste bug in querying for closed changesets and added a test for it. 2009-12-26 21:29:43 +00:00