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

125 commits

Author SHA1 Message Date
Tom Hughes
a99b516962 Allow existing users to voluntarily sign up for the contributor terms 
Based on a patch from Frederik Ramm this change allows users to make a
voluntary decision to sign up for the new contributor terms.
 2010-08-10 18:08:11 +01:00
Tom Hughes
f07819d81a Rework application configuration 
Use a preinitializer to load the settings from application.yml so
that they are available as early as possible. All settings can also
be overridden using environment variables.

The ad-hoc settins in environment.rb are then moved to this new
system so we have one consistent location for settings.
 2010-08-04 22:06:05 +01:00
Tom Hughes
f973bee52b Make database offline work in production 2010-06-15 10:40:47 +01:00
Ævar Arnfjörð Bjarmason
fe8a330fd6 user.login.account suspended so translators don't have to type out anchors 2010-05-17 00:10:41 +01:00
Tom Hughes
07f0dddc63 Add parentheses to avoid warning 2010-05-11 19:13:38 +01:00
Tom Hughes
61e51f88cc Merge branch 'master' into terms 2010-05-09 17:16:43 +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
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
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
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
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
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
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
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
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
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
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
d24312fa8c Handle duplicate address errors properly when confirming a change of 
email address.
 2010-02-08 18:04:04 +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
Tom Hughes
e23744bd8d Add :warning and :error flash messages which can be styled separately to 
the existing :notice messages.

Also reviewd all existing flash messages and changed them to be errors or
warnings when appropriate and checked that those which are not followed by
a redirect are done as flash.now[] instead of flash[].
 2009-11-01 13:07:46 +00:00
Tom Hughes
2541ad0f09 We don't need the @notice hack - we can use flash.now to achieve the same thing. 2009-11-01 12:32:31 +00:00
Tom Hughes
a8cc053bcc Add some administrator only actions to the user page. 2009-10-12 08:00:59 +00:00
Tom Hughes
0189bce496 Test that the user has cookies enabled at critical points where we 
are about to require them and warn the user if they are not enabled.
 2009-10-09 08:47:47 +00:00
Matt Amos
daa2496024 First version of blocking feature. Allows both time-based (for map protection) and notice-based (for education) blocks on users. Also introduces user roles and a simple UI for displaying and administering these. 2009-09-28 16:01:00 +00:00
Tom Hughes
783748b1e5 Tidy up. 2009-08-31 23:32:03 +00:00
Matt Amos
ade96da19f Added user ID, description, languages and image link to the user details API call. 2009-08-31 23:11:15 +00:00
Matt Amos
b34b898451 Added referer URL in user_token so that redirections (e.g: from oauth token requests) are followed after the user has confirmed the sign-up. Added test for the same. 2009-08-25 15:00:32 +00:00
Matt Amos
0d5be22cb5 Merging 16820:16891 from trunk. 2009-08-06 16:24:39 +00:00
Tom Hughes
39cbc9d653 Tweak the password reset pages a bit. 2009-08-04 00:14:03 +00:00
Tom Hughes
cbbfdf3948 Merge 16743:16811 from trunk. 2009-08-03 23:50:47 +00:00
Tom Hughes
e890528aac Rework password reset system to do away with the second email and instead 
just allow the user (providing they possess a valid token from the first
email) to enter a new password on the site.
 2009-08-03 23:42:29 +00:00
Tom Hughes
f4571eeb7c Revert r16046. 
DO NOT COMMIT MAJOR ENHANCEMENTS TO TRUNK WITHOUT TALKING TO ME FIRST.
 2009-06-23 02:48:38 +00:00
Matt Amos
b8f6dbd403 Adding initial version of the OAuth token authentication method. This adds basic OAuth support for registering apps, getting and revoking keys, etc... The tokens come with 6 separate permissions bits; read/write user preferences, write diaries, write API and read/write GPS traces. Needs more tests. 2009-06-22 16:54:37 +00:00
Ævar Arnfjörð Bjarmason
db51d7f3dd Added & cleaned up messages relating to a given user not existing 
The following pages now have a <title> that can be set in localizations:

 * /user/USER_DOES_NOT_EXIST
 * /user/USER_DOES_NOT_EXIST/diary
 * /user/USER_DOES_NOT_EXIST/traces
 * /message/*/ID_DOES_NOT_EXIST

In addition I've cleaned up the i18n message keys of all the
''no_such_user.rhtml'' pages involved. They now all use
title/heading/body for the <title>, <h2> and <p> respectively. And the
message key {{user}} instead of {{name}}.
 2009-06-06 13:15:53 +00:00
Tom Hughes
f0f111aced Make a few more things translatable. 2009-06-03 08:06:03 +00:00
Tom Hughes
11f457e842 Use "confirm_email" instead "confirm email" in resource names so it 
matches the method name.
 2009-06-03 07:42:40 +00:00
Ævar Arnfjörð Bjarmason
9a051df2d2 * Made "Account not active" and "Couldn't log in with those details" translatable 2009-06-03 01:42:55 +00:00
Ævar Arnfjörð Bjarmason
6bcc50e274 * Made the "Confirmed your account/email" messages translatable 
* Changed "Something went wrong" error to "you've already used that token". From reading the code that's the only time it's displayed
 2009-06-03 01:31:35 +00:00