cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
4402 commits 4 branches 1 tag 499 MiB
Commit graph

1080 commits

Author SHA1 Message Date
Tom Hughes
a53c7bf623 Rework the signup page 2010-05-09 17:03:51 +01:00
Tom Hughes
48d450060b Merge branch 'master' into openid 2010-05-09 12:26:40 +01:00
Tom Hughes
7e5c998a87 Only set pending users to active on a password reset 
When resetting a password only activate pending users, otherwise a
confirmed user's account gets set back to active and may then get
suspended by the spam scorer.
 2010-05-09 08:44:17 +01:00
Tom Hughes
f85681c5ce Merge branch 'master' into openid 
Conflicts:
	app/controllers/user_controller.rb
 2010-05-07 22:28:07 +01:00
Tom Hughes
303e5d3eb9 Merge branch 'master' into terms 
Conflicts:
	config/application.yml
	lib/osm.rb
	public/stylesheets/common.css
 2010-05-07 22:23:20 +01:00
Tom Hughes
1eba060929 Redirect after processing user changes 
After we have processed the requested user changes, redirect back
to the list so that the resulting page is reloadable without getting
resubmission warnings from the browser.
 2010-05-07 14:27:52 +01:00
Tom Hughes
7774237a11 Redirect back to settings after updating user settings 
When we've saved a user's settings, redirect back to their settings
page instead of just rerendering so that a suspended user check will
be done.
 2010-05-07 10:01:24 +01:00
Tom Hughes
9230721a1f Redirect suspended users to an information page 
If the current session is for a logged in user and that user has
been suspended then log them out and redirect them to a page
explaining that their account has been suspended.
 2010-05-07 10:00:24 +01:00
Tom Hughes
3026da0cb0 Fix user visibility check 2010-05-06 22:11:38 +01:00
Tom Hughes
97c2406ae4 Fix user visibility check 2010-05-06 21:52:27 +01:00
Tom Hughes
ae8c0b3baf Add a user list view for administrators 2010-05-06 20:55:02 +01:00
Tom Hughes
5d3992daca Tell users their account has been suspended when they try and login 2010-05-06 17:18:34 +01:00
Tom Hughes
552a647810 Merge all the user status changing methods into one 2010-05-06 17:18:34 +01:00
Tom Hughes
5a54630b57 Add support for suspended and confirmed users 
Replace the existing "active" and "visible" with an enumerated status
that allows for extra cases. Currently we have "suspended" for users
who hve triggered the spam detector and "confirmed" for users that have
triggered the detector but have been confirmed as vald by an admin.
 2010-05-06 17:18:34 +01:00
Ævar Arnfjörð Bjarmason
acf518e5c3 M-x untabify Kai Krueger's ebcc988376 2010-05-02 10:48:06 +00:00
Kai Krueger
9faf30fb45 Add an extra null pointer check that can trigger in tests 2010-05-02 11:03:45 +01:00
Kai Krueger
ebcc988376 Make it a bit clear when you try and login with openID and your openID isn't associated with a OSM account yet 2010-05-01 13:49:51 +01:00
Kai Krueger
5027a70fec It was not possible to remove an OpenID from your user profile 2010-04-27 21:34:41 +01:00
Tom Hughes
276c29cb31 Make the decline button a real button 
Make the decline button on the terms page a real form submit button
and have the server redirect to the wiki as it's the only way to get
something that will actually look the same as a button on all the
different browsers.
 2010-04-27 10:45:49 +01:00
Tom Hughes
adb0883d17 Ajaxify the country selection on the terms page 2010-04-27 10:01:40 +01:00
Matt Amos
972278a223 Some styling changes. Changed drop-down into radio buttons. Tried, and failed, to get the 'decline' link to look like a button. 2010-04-27 00:36:44 +01:00
Ævar Arnfjörð Bjarmason
479b682d38 Correctly indent this if/else clause 
Some of the content of the else was at the same indent level as the
else itself.
 2010-04-24 12:37:51 +00:00
Kai Krueger
e4cb614e59 Correct merge issues in the last merge from master 2010-04-24 12:33:12 +00:00
Æ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
4b2ac2ea2b Merge branch 'master' into terms 2010-04-19 21:05:54 +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
Matt Amos
9a9e13af90 Bit more work on the contributor terms page - still very much a work-in-progress. 2010-04-12 23:55:05 +00:00
Tom Hughes
898c47e647 Present the contributor terms as part of the initial signup instead of 
during the account confirmation step.
 2010-03-26 18:55:17 +00:00
Matt Amos
b99e870291 Initial version of contributor terms changes. 2010-03-22 22:51:09 +00: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