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

1967 commits

Author SHA1 Message Date
Æ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
Ævar Arnfjörð Bjarmason
2a2818d055 Change user.suspended.body so translators don't have to type out anchors 2010-05-17 00:10:27 +01:00
Tom Hughes
4b17b92da0 Merge branch 'master' into openstreetbugs 2010-05-16 14:50:06 +01:00
Tom Hughes
abb2bb74a7 Tidy up addition of icons to relation members 2010-05-16 13:07:25 +01:00
Tom Hughes
6e145a2f38 Rename css_class to link_class for consistency 2010-05-16 12:57:00 +01:00
Tom Hughes
6d3aa7386b Only include tags which affect the icon in the link title 2010-05-16 12:55:10 +01:00
Tom Hughes
7f1ce59f32 Rename browser-icons to browse everywhere and only load CSS when needed 2010-05-16 12:32:51 +01:00
Dan Karran
10dca1b6df Patch from bug #2787 to add icons to data browser pages 2010-05-16 12:12:59 +01:00
Tom Hughes
959442d087 Merge branch 'master' into openstreetbugs 2010-05-11 19:53:57 +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
0caaf54de5 Merge branch 'master' into openstreetbugs 2010-05-09 17:16:32 +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
160429e62d Merge branch 'master' into openstreetbugs 
Conflicts:
	lib/osm.rb
 2010-05-07 22:29:09 +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
d50cf2b102 Preserve parameters in pagination links 2010-05-07 14:08:07 +01:00
Tom Hughes
c86e52dee9 Preserve the page number when submitting the form 2010-05-07 14:07:39 +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
7211872790 Don't try and display IP address for users without one 2010-05-07 09:29:38 +01:00
Tom Hughes
b9deb68de1 Display total user count correctly in user list 2010-05-07 09:05:55 +01:00
Tom Hughes
fc7488f28a Link the username in the user list to their profile 2010-05-07 09:03:12 +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
200a1ab5c7 Show administrators the status and spam score for a user 2010-05-06 17:18:34 +01:00
Tom Hughes
980c2fa301 Suspend users if their spam score gets too high 
Use an observer to watch all diary and user updates and, if the user
is not confirmed, chek their spam score and suspend then if it has got
too high.
 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
8b781bb18b Include the user description in the spam score 2010-05-06 17:18:34 +01:00
Tom Hughes
937b576bf5 Add a spam_score method to the user model 2010-05-06 17:18:33 +01:00
Tom Hughes
ffd7b02b0c Merge branch 'master' into terms 2010-05-05 15:29:48 +01:00
Kai Krueger
5898b494df Merge branch 'master' of git://git.openstreetmap.org/rails into openstreetbugs 2010-05-02 11:42:58 +01:00
Andy Allan
cd89a3c662 Move email configuration out of the model and into the config file 2010-05-01 12:36:22 +01:00
Tom Hughes
90d2ed759f Fix mangling of wikipedia links 
Bail out straight away if the tag value is a URL rather than waiting
until we have parsed the key as we may change the value in the process
of parsing the key.
 2010-04-28 18:48:56 +01:00
Tom Hughes
feb9582b07 Tweak the copyright page translation 2010-04-27 16:00:10 +01:00
Tom Hughes
6729272444 Merge branch 'master' into terms 2010-04-27 11:22:25 +01:00
Tom Hughes
9241ecc8ee Improve layout of buttons on contributor terms page 2010-04-27 11:04: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
7561eacbf4 Enable localization of the copyright page 
The copyright page introduced in ecbd526 wasn't localize-able. Rectify
that with a page that:

   * Displays a header in non-English languages indicating that the
     version you're looking at isn't canonical.

   * Links back to the local version from the English one in a
     non-English locale.

Additionally I fixed a regression with the cc_button.png. It now has a
meaningful alt="" text again.
 2010-04-26 18:00:02 +00:00
Tom Hughes
4763272982 Fix data browser navigation tooltips 2010-04-22 23:38:07 +01:00
Tom Hughes
54bed8e9c0 Improve layout of data browser pages 
Use float to position the navigation controls and map on the right
rather than a table so that we get more consistent positioning and
avoid forcing the map of the right hand side of the viewport.
 2010-04-22 23:05:20 +01:00
Tom Hughes
8197ab3f82 Merge branch 'copyright' 2010-04-22 11:13:14 +01:00
Tom Hughes
886c859784 Link to API usage policy 2010-04-22 10:49:50 +01:00
Tom Hughes
d2585ea044 Tweak wikipedia links stuff 2010-04-22 10:41:53 +01:00
Tom Hughes
c9a3091ca8 Merge remote branch 'avar/avar/browse-pages-link-to-wikipedia' 2010-04-22 09:09:36 +01:00