Commit graph

3236 commits

Author SHA1 Message Date
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
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
6155eabbf8 swf update with Surrey imagery support 2010-05-02 14:32:54 +01:00
Grant Slater
4d1fa7adfb Add tag for Surrey Air Survey 2010-05-01 16:01:45 +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
Siebrand Mazeland
4ef2cb9a71 Localisation updates from translatewiki.net (2010-04-30)
Signed-off-by: Siebrand Mazeland <s.mazeland@xs4all.nl>
2010-04-30 13:57:31 +02:00
Tom Hughes
b2c3c8e710 Updated rails translations from http://github.com/svenfuchs/rails-i18n 2010-04-30 09:18:35 +01:00
Siebrand Mazeland
2b46a0b0e4 Fix YAML syntax error introduced in d67b9d7302. Thanks to avar for helping out. 2010-04-29 23:25:51 +02:00
Siebrand Mazeland
d67b9d7302 * updates in newline usage on the license_page messages
* remove trailing whitespace
2010-04-29 23:12:24 +02:00
Siebrand Mazeland
1ae014afa1 Merge branch 'master' of git://git.openstreetmap.org/rails 2010-04-29 22:58:18 +02:00
Ævar Arnfjörð Bjarmason
f8119bf169 Update config/wiki_pages.yml with script/misc/update-wiki-pages
16 new values. Mainly French and Russian.
2010-04-29 13:21:40 +00: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
Ævar Arnfjörð Bjarmason
5f1fc761fb Fix link broken in feb9582 due to routes.rb changes 2010-04-27 15:18:24 +00:00
Tom Hughes
feb9582b07 Tweak the copyright page translation 2010-04-27 16:00:10 +01:00
Siebrand Mazeland
5dcd2ad70c Localisation updates from translatewiki.net (2010-04-26)
Signed-off-by: Siebrand Mazeland <s.mazeland@xs4all.nl>
2010-04-26 22:04:27 +02:00
Ævar Arnfjörð Bjarmason
59bf6e0a04 Change misleading wording on copyright page
Previously it said that you may distribute derived works "under the
same or similar license", now it just says "under the same".

The former form is derived from the cc-by-sa summary:

    http://creativecommons.org/licenses/by-sa/2.0/

But the legal code itself says:

    You may distribute, publicly display, publicly perform, or publicly
    digitally perform a Derivative Work only under the terms of this
    License, a later version of this License with the same License
    Elements as this License, or a Creative Commons iCommons license that
    contains the same License Elements as this
    License (e.g. Attribution-ShareAlike 2.0 Japan)

The intent is obviously to refer to other creative commons
licenses. This makes sense in the context of the creative commons
website. but on our site the reader could infer that he's able to
distribute the map data under similar licenses, such as the GPL, GFDL,
Apache 2 and others.
2010-04-26 18:05:51 +00:00
Ævar Arnfjörð Bjarmason
ca1283d031 Translate "Copyright & license" into Icelandic 2010-04-26 18:01:27 +00: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
a97ae09d2a Add some extra translations from OpenLayers 2.9 2010-04-23 16:13:39 +01: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
4ef8776490 Update to OpenLayers 2.9 2010-04-22 18:58:51 +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
Tom Hughes
3008963a4b Case #2908: Escape user name in user not found error 2010-04-22 00:43:31 +01:00
Ævar Arnfjörð Bjarmason
9bfa6059be Link to wikipedia articles on wikipedia=* tags
The semantics are as documented on
http://wiki.openstreetmap.org/wiki/Key:wikipedia, i.e.:

    # English Wikipedia article Foobar
    wikipedia=Foobar
    # German Wikipedia article Foobar
    wikipedia:de=Foobar
    wikipedia=de:Foobar

If someone gives a http:// link we just pass it through.
2010-04-21 01:46:50 +00:00
Ævar Arnfjörð Bjarmason
0191549033 This script requires perl 5.10 2010-04-21 00:17:05 +00:00
Ævar Arnfjörð Bjarmason
0193b18edb Mention how to run this script with prove(1) 2010-04-21 00:16:09 +00:00
Ævar Arnfjörð Bjarmason
c377932312 Don't re-declare lexical variable 2010-04-21 00:07:54 +00:00
Ævar Arnfjörð Bjarmason
0f9c9190ee This script no longer screen-scrapes and supports >500 key/values 2010-04-21 00:04:24 +00:00
Tom Hughes
7a8fe086cd Don't allow robots to fetch user edit lists 2010-04-20 22:40:32 +01:00
Tom Hughes
9816c7dd0a Merge branch 'wikilinks' 2010-04-20 21:47:57 +01:00
Tom Hughes
e3fc033c1e Ignore some more generated files 2010-04-20 21:41:57 +01:00