rails.git
9 years agoImplicitly update config/wiki_pages.yml if it exists, and chmod +x
Ævar Arnfjörð Bjarmason [Sat, 8 May 2010 18:09:40 +0000 (18:09 +0000)]
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.

9 years agoAdd script to update spam block ACLs
Tom Hughes [Sat, 8 May 2010 16:49:27 +0000 (17:49 +0100)]
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.

9 years agoRedirect after processing user changes
Tom Hughes [Fri, 7 May 2010 13:08:25 +0000 (14:08 +0100)]
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.

9 years agoPreserve parameters in pagination links
Tom Hughes [Fri, 7 May 2010 13:08:07 +0000 (14:08 +0100)]
Preserve parameters in pagination links

9 years agoPreserve the page number when submitting the form
Tom Hughes [Fri, 7 May 2010 13:07:39 +0000 (14:07 +0100)]
Preserve the page number when submitting the form

9 years agoFix statistics script to reflect changes to user model
Tom Hughes [Fri, 7 May 2010 10:09:54 +0000 (11:09 +0100)]
Fix statistics script to reflect changes to user model

9 years agoRedirect back to settings after updating user settings
Tom Hughes [Fri, 7 May 2010 09:01:24 +0000 (10:01 +0100)]
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.

9 years agoRedirect suspended users to an information page
Tom Hughes [Fri, 7 May 2010 09:00:24 +0000 (10:00 +0100)]
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.

9 years agoDon't try and display IP address for users without one
Tom Hughes [Fri, 7 May 2010 08:29:38 +0000 (09:29 +0100)]
Don't try and display IP address for users without one

9 years agoDisplay total user count correctly in user list
Tom Hughes [Fri, 7 May 2010 08:05:55 +0000 (09:05 +0100)]
Display total user count correctly in user list

9 years agoLink the username in the user list to their profile
Tom Hughes [Fri, 7 May 2010 08:03:12 +0000 (09:03 +0100)]
Link the username in the user list to their profile

9 years agoFix tests for changes to user model
Tom Hughes [Thu, 6 May 2010 21:11:55 +0000 (22:11 +0100)]
Fix tests for changes to user model

9 years agoFix user visibility check
Tom Hughes [Thu, 6 May 2010 21:11:38 +0000 (22:11 +0100)]
Fix user visibility check

9 years agoFix typo
Tom Hughes [Thu, 6 May 2010 21:01:45 +0000 (22:01 +0100)]
Fix typo

9 years agoFix user visibility check
Tom Hughes [Thu, 6 May 2010 20:52:27 +0000 (21:52 +0100)]
Fix user visibility check

9 years agoAdd a user list view for administrators
Tom Hughes [Tue, 4 May 2010 13:44:28 +0000 (14:44 +0100)]
Add a user list view for administrators

9 years agoTell users their account has been suspended when they try and login
Tom Hughes [Mon, 3 May 2010 16:09:37 +0000 (17:09 +0100)]
Tell users their account has been suspended when they try and login

9 years agoMerge all the user status changing methods into one
Tom Hughes [Sat, 1 May 2010 17:28:41 +0000 (18:28 +0100)]
Merge all the user status changing methods into one

9 years agoShow administrators the status and spam score for a user
Tom Hughes [Sat, 1 May 2010 16:30:37 +0000 (17:30 +0100)]
Show administrators the status and spam score for a user

9 years agoSuspend users if their spam score gets too high
Tom Hughes [Sat, 1 May 2010 16:03:18 +0000 (17:03 +0100)]
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.

9 years agoAdd support for suspended and confirmed users
Tom Hughes [Sat, 1 May 2010 15:13:47 +0000 (16:13 +0100)]
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.

9 years agoInclude the user description in the spam score
Tom Hughes [Sat, 1 May 2010 10:22:37 +0000 (11:22 +0100)]
Include the user description in the spam score

9 years agoAdd a user index to diary comments
Tom Hughes [Thu, 29 Apr 2010 23:21:57 +0000 (00:21 +0100)]
Add a user index to diary comments

9 years agoAdd a spam_score method to the user model
Tom Hughes [Thu, 29 Apr 2010 23:18:53 +0000 (00:18 +0100)]
Add a spam_score method to the user model

9 years agoImplement OSM.spam_score to return a spam score for a piece of text
Tom Hughes [Wed, 28 Apr 2010 23:29:49 +0000 (00:29 +0100)]
Implement OSM.spam_score to return a spam score for a piece of text

9 years agoUpdate to OpenLayers 2.9.1
Tom Hughes [Thu, 6 May 2010 14:08:47 +0000 (15:08 +0100)]
Update to OpenLayers 2.9.1

9 years agoLocalisation updates from translatewiki.net (2010-05-05)
Siebrand Mazeland [Wed, 5 May 2010 22:24:27 +0000 (00:24 +0200)]
Localisation updates from translatewiki.net (2010-05-05)

9 years agoLocalisation updates from translatewiki.net (2010-05-04)
Siebrand Mazeland [Mon, 3 May 2010 22:37:48 +0000 (00:37 +0200)]
Localisation updates from translatewiki.net (2010-05-04)

Signed-off-by: Siebrand Mazeland <s.mazeland@xs4all.nl>
9 years agoswf update with Surrey imagery support
Grant Slater [Sun, 2 May 2010 13:32:54 +0000 (14:32 +0100)]
swf update with Surrey imagery support

9 years agoAdd tag for Surrey Air Survey
Grant Slater [Sat, 1 May 2010 15:01:45 +0000 (16:01 +0100)]
Add tag for Surrey Air Survey

9 years agoMove email configuration out of the model and into the config file
Andy Allan [Sat, 1 May 2010 11:36:22 +0000 (12:36 +0100)]
Move email configuration out of the model and into the config file

9 years agoLocalisation updates from translatewiki.net (2010-04-30)
Siebrand Mazeland [Fri, 30 Apr 2010 11:57:31 +0000 (13:57 +0200)]
Localisation updates from translatewiki.net (2010-04-30)

Signed-off-by: Siebrand Mazeland <s.mazeland@xs4all.nl>
9 years agoUpdated rails translations from http://github.com/svenfuchs/rails-i18n
Tom Hughes [Fri, 30 Apr 2010 08:18:35 +0000 (09:18 +0100)]
Updated rails translations from github.com/svenfuchs/rails-i18n

9 years agoFix YAML syntax error introduced in d67b9d73024558587828273dd8afa3da8d27889b. Thanks...
Siebrand Mazeland [Thu, 29 Apr 2010 21:25:51 +0000 (23:25 +0200)]
Fix YAML syntax error introduced in d67b9d73024558587828273dd8afa3da8d27889b. Thanks to avar for helping out.

9 years ago* updates in newline usage on the license_page messages
Siebrand Mazeland [Thu, 29 Apr 2010 21:12:24 +0000 (23:12 +0200)]
* updates in newline usage on the license_page messages
* remove trailing whitespace

9 years agoMerge branch 'master' of git://git.openstreetmap.org/rails
Siebrand Mazeland [Thu, 29 Apr 2010 20:58:18 +0000 (22:58 +0200)]
Merge branch 'master' of git://git.openstreetmap.org/rails

9 years agoUpdate config/wiki_pages.yml with script/misc/update-wiki-pages
Ævar Arnfjörð Bjarmason [Thu, 29 Apr 2010 13:21:40 +0000 (13:21 +0000)]
Update config/wiki_pages.yml with script/misc/update-wiki-pages

16 new values. Mainly French and Russian.

9 years agoFix mangling of wikipedia links
Tom Hughes [Wed, 28 Apr 2010 17:48:56 +0000 (18:48 +0100)]
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.

9 years agoFix link broken in feb9582 due to routes.rb changes
Ævar Arnfjörð Bjarmason [Tue, 27 Apr 2010 15:18:24 +0000 (15:18 +0000)]
Fix link broken in feb9582 due to routes.rb changes

9 years agoTweak the copyright page translation
Tom Hughes [Tue, 27 Apr 2010 15:00:10 +0000 (16:00 +0100)]
Tweak the copyright page translation

9 years agoLocalisation updates from translatewiki.net (2010-04-26)
Siebrand Mazeland [Mon, 26 Apr 2010 20:04:27 +0000 (22:04 +0200)]
Localisation updates from translatewiki.net (2010-04-26)

Signed-off-by: Siebrand Mazeland <s.mazeland@xs4all.nl>
9 years agoChange misleading wording on copyright page
Ævar Arnfjörð Bjarmason [Mon, 26 Apr 2010 18:05:51 +0000 (18:05 +0000)]
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.

9 years agoTranslate "Copyright & license" into Icelandic
Ævar Arnfjörð Bjarmason [Mon, 26 Apr 2010 18:01:27 +0000 (18:01 +0000)]
Translate "Copyright & license" into Icelandic

9 years agoEnable localization of the copyright page
Ævar Arnfjörð Bjarmason [Mon, 26 Apr 2010 18:00:02 +0000 (18:00 +0000)]
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.

9 years agoAdd some extra translations from OpenLayers 2.9
Tom Hughes [Fri, 23 Apr 2010 15:13:39 +0000 (16:13 +0100)]
Add some extra translations from OpenLayers 2.9

9 years agoFix data browser navigation tooltips
Tom Hughes [Thu, 22 Apr 2010 22:38:07 +0000 (23:38 +0100)]
Fix data browser navigation tooltips

9 years agoImprove layout of data browser pages
Tom Hughes [Thu, 22 Apr 2010 22:05:20 +0000 (23:05 +0100)]
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.

9 years agoUpdate to OpenLayers 2.9
Tom Hughes [Thu, 22 Apr 2010 17:51:46 +0000 (18:51 +0100)]
Update to OpenLayers 2.9

9 years agoMerge branch 'copyright'
Tom Hughes [Thu, 22 Apr 2010 10:13:14 +0000 (11:13 +0100)]
Merge branch 'copyright'

9 years agoLink to API usage policy
Tom Hughes [Thu, 22 Apr 2010 09:49:50 +0000 (10:49 +0100)]
Link to API usage policy

9 years agoTweak wikipedia links stuff
Tom Hughes [Thu, 22 Apr 2010 09:41:53 +0000 (10:41 +0100)]
Tweak wikipedia links stuff

9 years agoMerge remote branch 'avar/avar/browse-pages-link-to-wikipedia'
Tom Hughes [Thu, 22 Apr 2010 08:09:36 +0000 (09:09 +0100)]
Merge remote branch 'avar/avar/browse-pages-link-to-wikipedia'

9 years agoCase #2908: Escape user name in user not found error
Tom Hughes [Wed, 21 Apr 2010 23:43:31 +0000 (00:43 +0100)]
Case #2908: Escape user name in user not found error

9 years agoLink to wikipedia articles on wikipedia=* tags
Ævar Arnfjörð Bjarmason [Wed, 21 Apr 2010 01:46:50 +0000 (01:46 +0000)]
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.

9 years agoThis script requires perl 5.10
Ævar Arnfjörð Bjarmason [Wed, 21 Apr 2010 00:17:05 +0000 (00:17 +0000)]
This script requires perl 5.10

9 years agoMention how to run this script with prove(1)
Ævar Arnfjörð Bjarmason [Wed, 21 Apr 2010 00:16:09 +0000 (00:16 +0000)]
Mention how to run this script with prove(1)

9 years agoDon't re-declare lexical variable
Ævar Arnfjörð Bjarmason [Wed, 21 Apr 2010 00:07:54 +0000 (00:07 +0000)]
Don't re-declare lexical variable

9 years agoThis script no longer screen-scrapes and supports >500 key/values
Ævar Arnfjörð Bjarmason [Wed, 21 Apr 2010 00:04:24 +0000 (00:04 +0000)]
This script no longer screen-scrapes and supports >500 key/values

9 years agoDon't allow robots to fetch user edit lists
Tom Hughes [Tue, 20 Apr 2010 21:40:32 +0000 (22:40 +0100)]
Don't allow robots to fetch user edit lists

9 years agoMerge branch 'wikilinks'
Tom Hughes [Tue, 20 Apr 2010 20:47:57 +0000 (21:47 +0100)]
Merge branch 'wikilinks'

9 years agoIgnore some more generated files
Tom Hughes [Tue, 20 Apr 2010 20:41:57 +0000 (21:41 +0100)]
Ignore some more generated files

9 years agoLoad wiki link data at startup and shorten some file names
Tom Hughes [Tue, 20 Apr 2010 20:05:22 +0000 (21:05 +0100)]
Load wiki link data at startup and shorten some file names

9 years agoImprove the browse helper code use to generate wiki links
Tom Hughes [Tue, 20 Apr 2010 18:04:12 +0000 (19:04 +0100)]
Improve the browse helper code use to generate wiki links

9 years agoFix wiki scraper to find tag pages as well as key pages
Tom Hughes [Tue, 20 Apr 2010 17:48:59 +0000 (18:48 +0100)]
Fix wiki scraper to find tag pages as well as key pages

9 years agoUpdate wiki link style to use the current default format
Tom Hughes [Tue, 20 Apr 2010 13:19:05 +0000 (14:19 +0100)]
Update wiki link style to use the current default format

9 years agoTicket #2245: Link from /browse/* pages to the wiki key/value pages
Ævar Arnfjörð Bjarmason [Tue, 20 Apr 2010 12:55:14 +0000 (12:55 +0000)]
Ticket #2245: Link from /browse/* pages to the wiki key/value pages

9 years agoCheck that the token is valid before using it.
Tom Hughes [Tue, 20 Apr 2010 10:05:55 +0000 (11:05 +0100)]
Check that the token is valid before using it.

9 years agoMerge branch 'master' into copyright
Tom Hughes [Mon, 19 Apr 2010 20:57:13 +0000 (21:57 +0100)]
Merge branch 'master' into copyright

9 years agoIgnore yet more files.
Tom Hughes [Mon, 19 Apr 2010 19:06:50 +0000 (20:06 +0100)]
Ignore yet more files.

9 years agoIgnore some more files.
Tom Hughes [Mon, 19 Apr 2010 15:48:10 +0000 (16:48 +0100)]
Ignore some more files.

9 years agoIgnore some files which aren't committed.
Tom Hughes [Mon, 19 Apr 2010 14:20:13 +0000 (15:20 +0100)]
Ignore some files which aren't committed.

9 years agoNormalise line endings.
Tom Hughes [Mon, 19 Apr 2010 14:17:18 +0000 (15:17 +0100)]
Normalise line endings.

9 years agoRemoved old copy of OpenLayers that was hanging around.
Tom Hughes [Mon, 19 Apr 2010 14:14:47 +0000 (15:14 +0100)]
Removed old copy of OpenLayers that was hanging around.

9 years agoLocalisation updates from translatewiki.net (2010-04-18)
Translatewiki [Sun, 18 Apr 2010 21:39:43 +0000 (21:39 +0000)]
Localisation updates from translatewiki.net (2010-04-18)

9 years agoLocalisation updates from translatewiki.net (2010-04-18)
Translatewiki [Sun, 18 Apr 2010 21:39:30 +0000 (21:39 +0000)]
Localisation updates from translatewiki.net (2010-04-18)

9 years agoIgnore whitespace around the commas when splitting a user's list of
Tom Hughes [Sun, 18 Apr 2010 11:44:53 +0000 (11:44 +0000)]
Ignore whitespace around the commas when splitting a user's list of
preferred languages. Closes #2891.

9 years agoEscape geocoder errors. Closes #2892.
Tom Hughes [Sun, 18 Apr 2010 11:41:15 +0000 (11:41 +0000)]
Escape geocoder errors. Closes #2892.

9 years agoLocalisation updates from translatewiki.net (2010-04-14)
Translatewiki [Wed, 14 Apr 2010 08:33:42 +0000 (08:33 +0000)]
Localisation updates from translatewiki.net (2010-04-14)

9 years agoLocalisation updates from translatewiki.net (2010-04-14)
Translatewiki [Wed, 14 Apr 2010 08:33:10 +0000 (08:33 +0000)]
Localisation updates from translatewiki.net (2010-04-14)

9 years agoMerge duplicate "support" keys.
Tom Hughes [Tue, 13 Apr 2010 11:50:47 +0000 (11:50 +0000)]
Merge duplicate "support" keys.

9 years agoAdd Finnish translations for words_connector, two_words_connector and last_word_connector
Teemu Koskinen [Tue, 13 Apr 2010 11:36:03 +0000 (11:36 +0000)]
Add Finnish translations for words_connector, two_words_connector and last_word_connector

9 years agoDon't send "408 Request timeout" responses from the data browser as it
Tom Hughes [Mon, 12 Apr 2010 13:21:03 +0000 (13:21 +0000)]
Don't send "408 Request timeout" responses from the data browser as it
seems to make some browsers automatically retry.

9 years agoFix typo.
Tom Hughes [Sun, 11 Apr 2010 23:37:09 +0000 (23:37 +0000)]
Fix typo.

9 years agoAdd a keyid attribute to each layer and use it when requesting the
Tom Hughes [Sun, 11 Apr 2010 23:35:10 +0000 (23:35 +0000)]
Add a keyid attribute to each layer and use it when requesting the
key instead of trying to use the layer name, which can be translated
which will stop it working. Closes #2876.

9 years agoLocalisation updates from translatewiki.net (2010-04-09)
Translatewiki [Thu, 8 Apr 2010 23:20:43 +0000 (23:20 +0000)]
Localisation updates from translatewiki.net (2010-04-09)

9 years agoLocalisation updates from translatewiki.net (2010-04-09)
Translatewiki [Thu, 8 Apr 2010 23:20:27 +0000 (23:20 +0000)]
Localisation updates from translatewiki.net (2010-04-09)

9 years agoalways forget this one
Richard Fairhurst [Thu, 8 Apr 2010 08:28:20 +0000 (08:28 +0000)]
always forget this one

9 years agolast point release of Potlatch 1.x...
Richard Fairhurst [Thu, 8 Apr 2010 00:29:32 +0000 (00:29 +0000)]
last point release of Potlatch 1.x...

9 years agoLocalisation updates from translatewiki.net (2010-04-08)
Translatewiki [Wed, 7 Apr 2010 23:17:31 +0000 (23:17 +0000)]
Localisation updates from translatewiki.net (2010-04-08)

9 years agoLocalisation updates from translatewiki.net (2010-04-08)
Translatewiki [Wed, 7 Apr 2010 23:17:14 +0000 (23:17 +0000)]
Localisation updates from translatewiki.net (2010-04-08)

9 years agoUpdate Spanish rails translation from upstream.
Tom Hughes [Wed, 7 Apr 2010 15:29:14 +0000 (15:29 +0000)]
Update Spanish rails translation from upstream.

9 years agoAdd translation to date.abbr_day_names for Saturday.
Tom Hughes [Wed, 7 Apr 2010 13:17:17 +0000 (13:17 +0000)]
Add translation to date.abbr_day_names for Saturday.

9 years agoLoad timecop in the test environment only.
Tom Hughes [Wed, 7 Apr 2010 10:59:19 +0000 (10:59 +0000)]
Load timecop in the test environment only.

9 years agoRevert copyright page from the trunk for now.
Tom Hughes [Wed, 7 Apr 2010 09:45:41 +0000 (09:45 +0000)]
Revert copyright page from the trunk for now.

9 years agoMake a branch for working on the copyright page.
Tom Hughes [Wed, 7 Apr 2010 09:44:30 +0000 (09:44 +0000)]
Make a branch for working on the copyright page.

9 years agoLocalisation updates from translatewiki.net (2010-04-07)
Translatewiki [Tue, 6 Apr 2010 22:32:09 +0000 (22:32 +0000)]
Localisation updates from translatewiki.net (2010-04-07)

9 years agoLocalisation updates from translatewiki.net (2010-04-07)
Translatewiki [Tue, 6 Apr 2010 22:30:21 +0000 (22:30 +0000)]
Localisation updates from translatewiki.net (2010-04-07)

9 years agoLocalisation updates from translatewiki.net (2010-04-07)
Translatewiki [Tue, 6 Apr 2010 22:25:20 +0000 (22:25 +0000)]
Localisation updates from translatewiki.net (2010-04-07)

9 years agoLocalisation updates from translatewiki.net (2010-04-07)
Translatewiki [Tue, 6 Apr 2010 22:20:45 +0000 (22:20 +0000)]
Localisation updates from translatewiki.net (2010-04-07)

9 years agoTweak the new copyright page a bit.
Tom Hughes [Tue, 6 Apr 2010 20:11:33 +0000 (20:11 +0000)]
Tweak the new copyright page a bit.