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

4167 commits

This branch
This branch
All branches
Author SHA1 Message Date
Tom Hughes
48d450060b Merge branch 'master' into openid 2010-05-09 12:26:40 +01:00
Tom Hughes
ebd109c946 Replace openID.js with funky rails generated javascript 2010-05-09 12:25:50 +01:00
Tom Hughes
75c7f46a00 Remove an unused resource and fix a few grammar issues 2010-05-09 11:40:08 +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
Ævar Arnfjörð Bjarmason
9ab2048f54 Rename open_id_authentication_tables migration to avoid clash 
If there's another migration on master before this gets merged this'll
probably have to be changed again.
 2010-05-08 18:56:42 +00:00
Ævar Arnfjörð Bjarmason
50bf6b49a6 Bump config/wiki_pages.yml with script/misc/update-wiki-pages 2010-05-08 18:10:25 +00:00
Ævar Arnfjörð Bjarmason
3a54a20af6 Implicitly update config/wiki_pages.yml if it exists, and chmod +x 
This makes:

    script/misc/update-wiki-pages

from the top-level just work.
 2010-05-08 18:09:49 +00:00
Tom Hughes
dd64ba2e7e Add script to update spam block ACLs 
Maintain a set of ACLs which block account creation for an IP address
which has had more than two users suspended or removed in the last 28 days.
 2010-05-08 17:49:27 +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
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
68bb9b3b81 Fix statistics script to reflect changes to user model 2010-05-07 11:09:54 +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
20cc601f85 Fix tests for changes to user model 2010-05-06 22:11:55 +01:00
Tom Hughes
3026da0cb0 Fix user visibility check 2010-05-06 22:11:38 +01:00
Tom Hughes
674123e055 Fix typo 2010-05-06 22:01:45 +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
752f737497 Add a user index to diary comments 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
d80f260b8b Implement OSM.spam_score to return a spam score for a piece of text 2010-05-06 17:18:33 +01:00
Tom Hughes
d75c99b62d Update to OpenLayers 2.9.1 2010-05-06 15:08:47 +01:00
Siebrand Mazeland
1853231f56 Localisation updates from translatewiki.net (2010-05-05) 2010-05-06 00:24:27 +02:00
Tom Hughes
ffd7b02b0c Merge branch 'master' into terms 2010-05-05 15:29:48 +01:00
Siebrand Mazeland
3190cd88de Localisation updates from translatewiki.net (2010-05-04) 
Signed-off-by: Siebrand Mazeland <s.mazeland@xs4all.nl>
 2010-05-04 00:37:48 +02:00
Grant Slater
684aad13df swf update with Surrey imagery support 2010-05-03 16:47:26 +01:00
Ævar Arnfjörð Bjarmason
c7876b4477 Runaway HTML in f28f28f24a made all the interface BOLD 2010-05-03 16:47:26 +01:00
Ævar Arnfjörð Bjarmason
109ef833be Translate the most common OpenID messages into Icelandic 2010-05-03 16:47:22 +01:00
Grant Slater
6155eabbf8 swf update with Surrey imagery support 2010-05-02 14:32:54 +01:00
Ævar Arnfjörð Bjarmason
ffd929800d Idiot proof message, say "using the form below" 2010-05-02 11:04:42 +00:00
Ævar Arnfjörð Bjarmason
7fe2f07e47 Make "Your OpenID is not associated with a OpenStreetMap account yet" message valid HTML 
It was introduced in ebcc988376 by Kai Krueger
 2010-05-02 11:02:25 +00:00
Ævar Arnfjörð Bjarmason
acf518e5c3 M-x untabify Kai Krueger's ebcc988376 2010-05-02 10:48:06 +00:00
Ævar Arnfjörð Bjarmason
6a6814e41d Only apply openid_url class to <input> boxes 
This was already implicitly the case since it was only used on
<input>. Just narrow down the CSS rule.
 2010-05-02 10:46:31 +00:00
Ævar Arnfjörð Bjarmason
e219011760 Merge remote branch 'apmon/openID' into openID 2010-05-02 10:24:06 +00:00
Kai Krueger
9fbd888e04 Merge branch 'master' of git://git.openstreetmap.org/rails into openID 2010-05-02 11:15:13 +01:00
Kai Krueger
92af0eccd5 Add test for OpenID login and signup 
The tests need the ROTS (Ruby OpenID Test Server) running.
ROTS can be found at http://github.com/roman/rots
If ROTS is not running, there will be 4 failed test cases, but otherwise
things should work
 2010-05-02 11:04:51 +01:00
Kai Krueger
9faf30fb45 Add an extra null pointer check that can trigger in tests 2010-05-02 11:03:45 +01:00
Ævar Arnfjörð Bjarmason
441b92c3c3 Merge branch 'master' into openID 2010-05-02 08:57:50 +00:00