Commit graph

1204 commits

Author SHA1 Message Date
Ævar Arnfjörð Bjarmason
407ba399da Bump config/wiki_pages.yml with script/misc/update-wiki-pages 2010-05-14 14:22:14 +00:00
Siebrand Mazeland
83bed32d35 Localisation updates from translatewiki.net (2010-05-09)
Signed-off-by: Siebrand Mazeland <s.mazeland@xs4all.nl>
2010-05-13 23:14:42 +02:00
Tom Hughes
c81b5ab1ac Switch to date stamped migrations to make branching easier to handle 2010-05-13 18:16:00 +01:00
Tom Hughes
70a5a0d9c6 Ubuntu Hardy only has rubygems 1.3.1 and it seems to work 2010-05-13 12:58:22 +01:00
Tom Hughes
691f759da4 Update various files to match current rails versions 2010-05-13 10:54:16 +01:00
Tom Hughes
66221ba9b8 Fix site name 2010-05-11 19:44:47 +01:00
Tom Hughes
836e926e62 Merge branch 'master' into terms 2010-05-11 19:07:00 +01:00
Siebrand Mazeland
d1eb6d6041 Localisation updates from translatewiki.net (2010-05-09) 2010-05-09 19:06:31 +02:00
Tom Hughes
61e51f88cc Merge branch 'master' into terms 2010-05-09 17:16:43 +01: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
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
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
674123e055 Fix typo 2010-05-06 22:01:45 +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
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
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
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
Æ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
Tom Hughes
6729272444 Merge branch 'master' into terms 2010-04-27 11:22:25 +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
d033a0f35d Pressing agree creates the account now rather than activating it 2010-04-27 10:06: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
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
8197ab3f82 Merge branch 'copyright' 2010-04-22 11:13:14 +01:00
Tom Hughes
d2585ea044 Tweak wikipedia links stuff 2010-04-22 10:41:53 +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
Tom Hughes
546250f60b Load wiki link data at startup and shorten some file names 2010-04-20 21:05:22 +01:00
Tom Hughes
d6755356e0 Improve the browse helper code use to generate wiki links 2010-04-20 19:04:12 +01:00
Tom Hughes
da74fbb769 Fix wiki scraper to find tag pages as well as key pages 2010-04-20 18:48:59 +01:00
Ævar Arnfjörð Bjarmason
8eead8a870 Ticket #2245: Link from /browse/* pages to the wiki key/value pages 2010-04-20 12:55:14 +00:00