rails.git
11 years agobrowse_helper: Correctly link to wiki pages whose keys or values contain spaces
Ævar Arnfjörð Bjarmason [Thu, 17 Jun 2010 13:33:01 +0000 (13:33 +0000)]
browse_helper: Correctly link to wiki pages whose keys or values contain spaces

The update-wiki-pages script normalizes " " to "_" (since MediaWiki
does it by design), but I didn't normalize it back in the
browse_helper.

Consequently objects with tags like "source=Isle of Man Government
aerial imagery (2001)" were never linked to the wiki correctly.

11 years agowiki_pages: Grab a very long "Isle of Man" tag from the wiki
Ævar Arnfjörð Bjarmason [Thu, 17 Jun 2010 13:17:51 +0000 (13:17 +0000)]
wiki_pages: Grab a very long "Isle of Man" tag from the wiki

This funky line wrapping is actually not a YAML syntax error:

    $ ruby -ryaml -rpp -e 'x = YAML.load(File.read("config/wiki_pages.yml")); pp x'|grep -B1 'Isle of'
         "source=Isle_of_Man_Government_aerial_imagery_(2001)"=>
          "Tag:source=Isle of Man Government aerial imagery (2001)",
    --
         "source=Isle_of_Man_Government_1:25000_map_(2007)"=>
          "Tag:source=Isle of Man Government 1:25000 map (2007)",

Abandon all hope ye who use YAML.

11 years agowiki_pages: Run script/misc/update-wiki-pages
Ævar Arnfjörð Bjarmason [Thu, 17 Jun 2010 13:16:07 +0000 (13:16 +0000)]
wiki_pages: Run script/misc/update-wiki-pages

11 years agowiki_pages: The Japanese moved from Ja: to JA:
Ævar Arnfjörð Bjarmason [Thu, 17 Jun 2010 13:14:46 +0000 (13:14 +0000)]
wiki_pages: The Japanese moved from Ja: to JA:

11 years agoLocalisation updates from http://translatewiki.net
Siebrand Mazeland [Wed, 16 Jun 2010 22:26:09 +0000 (00:26 +0200)]
Localisation updates from http://translatewiki.net

11 years agoLink SOTM advert to the landing page
Tom Hughes [Wed, 16 Jun 2010 20:16:42 +0000 (21:16 +0100)]
Link SOTM advert to the landing page

11 years agoCorrect name of ActiveRecord
Tom Hughes [Tue, 15 Jun 2010 16:12:55 +0000 (17:12 +0100)]
Correct name of ActiveRecord

11 years agoMake database offline work in production
Tom Hughes [Tue, 15 Jun 2010 09:40:47 +0000 (10:40 +0100)]
Make database offline work in production

11 years agoMake database offline mode work
Tom Hughes [Tue, 15 Jun 2010 09:07:39 +0000 (10:07 +0100)]
Make database offline mode work

11 years agoCompletely replace rails' version of pk_and_sequence_for
Tom Hughes [Mon, 14 Jun 2010 12:00:49 +0000 (13:00 +0100)]
Completely replace rails' version of pk_and_sequence_for

Falling back to the rails code for pk_and_sequence_for doesn't work
because we still wind up retrying the slow version of the query for
tables with no primary key. So just replace it instead.

11 years agoMonkey patch rails to make system table query efficient
Tom Hughes [Mon, 14 Jun 2010 11:43:39 +0000 (12:43 +0100)]
Monkey patch rails to make system table query efficient

Rails tries to query the system tables to find the primary key
and it's controlling sequence, but it doesn't specify that it is
looking for objects of class "pg_class" so the pg_depend table
has to be sequentially scanned instead of being accessed using
the index.

Tests on the production database show that the time taken for
this query drops from 3.5s to 15ms if the index is used.

11 years agoRename layouts.sotm resource to avoid using stale translations
Tom Hughes [Tue, 8 Jun 2010 17:01:21 +0000 (18:01 +0100)]
Rename layouts.sotm resource to avoid using stale translations

11 years agoAdd advert for SOTM 2010 to sidebar
Tom Hughes [Tue, 8 Jun 2010 16:09:21 +0000 (17:09 +0100)]
Add advert for SOTM 2010 to sidebar

11 years agoRe-using service icon for pedestrian roads
Dan Karran [Sun, 30 May 2010 22:48:02 +0000 (23:48 +0100)]
Re-using service icon for pedestrian roads

11 years agoUsing generic place_of_worship icon instead of Christian one
Dan Karran [Sun, 30 May 2010 19:10:33 +0000 (20:10 +0100)]
Using generic place_of_worship icon instead of Christian one

11 years agoAdding health related icons
Dan Karran [Sat, 29 May 2010 13:46:35 +0000 (14:46 +0100)]
Adding health related icons

11 years agoMore historic and tourist-related icons
Dan Karran [Sat, 29 May 2010 13:27:15 +0000 (14:27 +0100)]
More historic and tourist-related icons

11 years agoA few more icons
Dan Karran [Sat, 29 May 2010 13:15:58 +0000 (14:15 +0100)]
A few more icons

11 years agoAdd strikethrough style to browser when objects are deleted
Dan Karran [Sat, 29 May 2010 12:57:39 +0000 (13:57 +0100)]
Add strikethrough style to browser when objects are deleted

11 years agoAdding more shop icons
Dan Karran [Fri, 28 May 2010 22:16:29 +0000 (23:16 +0100)]
Adding more shop icons

11 years agoAdd service road and bike parking icons and update the bike rental one
Dan Karran [Fri, 28 May 2010 21:57:11 +0000 (22:57 +0100)]
Add service road and bike parking icons and update the bike rental one

11 years agoAdding highway _link icons like their main counterparts
Dan Karran [Sun, 23 May 2010 13:03:01 +0000 (14:03 +0100)]
Adding highway _link icons like their main counterparts

11 years agoRevert "Switch to using oauth-plugin as a gem"
Tom Hughes [Mon, 7 Jun 2010 15:01:04 +0000 (16:01 +0100)]
Revert "Switch to using oauth-plugin as a gem"

This reverts commit 41a123334bc75d17335e3f242b0243ddfd3e6389.

11 years agoLocalisation updates from http://translatewiki.net
Siebrand Mazeland [Thu, 3 Jun 2010 23:33:00 +0000 (01:33 +0200)]
Localisation updates from http://translatewiki.net

11 years agoUpdate to rails 2.3.8
Tom Hughes [Wed, 26 May 2010 18:54:10 +0000 (19:54 +0100)]
Update to rails 2.3.8

Update site to use rails 2.3.8 which also allows us to drop the
globalize2 plugin as the core rails i18n code can now do fallback
and pluralization.

11 years agoLocalisation updates from http://translatewiki.net
Siebrand Mazeland [Tue, 25 May 2010 14:06:17 +0000 (16:06 +0200)]
Localisation updates from http://translatewiki.net

11 years agoSwitch to using oauth-plugin as a gem
Tom Hughes [Mon, 24 May 2010 11:56:23 +0000 (12:56 +0100)]
Switch to using oauth-plugin as a gem

Use the oauth-plugin as a gem instead of carrying a local copy.

This also required that commit eff06faf46c8f0cc4d92a16f6b2daa22eabb4893 be
reverted as it changed the plugin. I don't think the cosmetic improvement
from that patch is worth the hassle of carrying local changes to the plugin.

11 years agoPull in some upstream updates to http_accept_language
Tom Hughes [Mon, 24 May 2010 11:10:46 +0000 (12:10 +0100)]
Pull in some upstream updates to http_accept_language

11 years agoLocalisation updates from http://translatewiki.net
Siebrand Mazeland [Sun, 23 May 2010 17:36:40 +0000 (19:36 +0200)]
Localisation updates from http://translatewiki.net

Signed-off-by: Siebrand Mazeland <s.mazeland@xs4all.nl>
11 years agoAdd a timeout to the change list pages
Tom Hughes [Fri, 21 May 2010 19:21:41 +0000 (20:21 +0100)]
Add a timeout to the change list pages

11 years agoConvert lat and lon values to integers
Tom Hughes [Fri, 21 May 2010 18:51:30 +0000 (19:51 +0100)]
Convert lat and lon values to integers

Make sure the lat and lon values in changeset bounding box queries
are integers or Postgres will refuse to use the index.

11 years agoLocalisation updates from http://translatewiki.net
Siebrand Mazeland [Tue, 18 May 2010 21:13:25 +0000 (23:13 +0200)]
Localisation updates from http://translatewiki.net

11 years agoResource whose value starts with a colon need to be quoted
Tom Hughes [Tue, 18 May 2010 14:07:46 +0000 (15:07 +0100)]
Resource whose value starts with a colon need to be quoted

Stop resources looking like symbols when they start with a colon by
quoting them.

11 years agoFix a typo in the native copyright text
Andrzej Zaborowski [Wed, 12 May 2010 22:32:07 +0000 (00:32 +0200)]
Fix a typo in the native copyright text

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
11 years agoAdd "UMP-pcPL" as CC-BY-SA source in the list of attributions.
Andrzej Zaborowski [Wed, 12 May 2010 22:32:07 +0000 (00:32 +0200)]
Add "UMP-pcPL" as CC-BY-SA source in the list of attributions.

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
11 years agoTweak resource names to make them fit the normal naming scheme
Tom Hughes [Mon, 17 May 2010 23:09:29 +0000 (00:09 +0100)]
Tweak resource names to make them fit the normal naming scheme

11 years agoAllow for formatting of the nominatim prefix in the i18n system
Ævar Arnfjörð Bjarmason [Sun, 16 May 2010 15:54:11 +0000 (15:54 +0000)]
Allow for formatting of the nominatim prefix in the i18n system

It's a pain to translate nominatim as-is because the context forces me
to translate things in the accusative case. Now I can change
"{{name}}" into "{{name}}:" and translate things in the nominative
case.

Not putting the message in search_osm_nominatim so I don't infringe
upon its namespace.

11 years agouser.login.account suspended so translators don't have to type out anchors
Ævar Arnfjörð Bjarmason [Sun, 16 May 2010 16:39:16 +0000 (16:39 +0000)]
user.login.account suspended so translators don't have to type out anchors

11 years agoChange user.suspended.body so translators don't have to type out anchors
Ævar Arnfjörð Bjarmason [Sun, 16 May 2010 16:35:22 +0000 (16:35 +0000)]
Change user.suspended.body so translators don't have to type out anchors

11 years agoRemove user.terms.legale_button. Added in 9a9e13af but since removed
Ævar Arnfjörð Bjarmason [Sun, 16 May 2010 16:22:01 +0000 (16:22 +0000)]
Remove user.terms.legale_button. Added in 9a9e13af but since removed

11 years agoLocalisation updates from translatewiki.net
Siebrand Mazeland [Sun, 16 May 2010 15:50:01 +0000 (17:50 +0200)]
Localisation updates from translatewiki.net

11 years agoTidy up addition of icons to relation members
Tom Hughes [Sun, 16 May 2010 12:07:25 +0000 (13:07 +0100)]
Tidy up addition of icons to relation members

11 years agoRename css_class to link_class for consistency
Tom Hughes [Sun, 16 May 2010 11:57:00 +0000 (12:57 +0100)]
Rename css_class to link_class for consistency

11 years agoOnly include tags which affect the icon in the link title
Tom Hughes [Sun, 16 May 2010 11:55:10 +0000 (12:55 +0100)]
Only include tags which affect the icon in the link title

11 years agoRename browser-icons to browse everywhere and only load CSS when needed
Tom Hughes [Sun, 16 May 2010 11:23:12 +0000 (12:23 +0100)]
Rename browser-icons to browse everywhere and only load CSS when needed

11 years agoPatch from bug #2787 to add icons to data browser pages
Dan Karran [Tue, 20 Apr 2010 08:08:51 +0000 (09:08 +0100)]
Patch from bug #2787 to add icons to data browser pages

11 years agoFix some bogus down migrations
Tom Hughes [Sun, 16 May 2010 11:10:28 +0000 (12:10 +0100)]
Fix some bogus down migrations

11 years agoBump config/wiki_pages.yml with script/misc/update-wiki-pages
Ævar Arnfjörð Bjarmason [Fri, 14 May 2010 14:22:14 +0000 (14:22 +0000)]
Bump config/wiki_pages.yml with script/misc/update-wiki-pages

11 years agoLocalisation updates from translatewiki.net (2010-05-09)
Siebrand Mazeland [Thu, 13 May 2010 21:14:42 +0000 (23:14 +0200)]
Localisation updates from translatewiki.net (2010-05-09)

Signed-off-by: Siebrand Mazeland <s.mazeland@xs4all.nl>
11 years agoAdd user_id + created_at index to changesets
Tom Hughes [Thu, 13 May 2010 17:16:31 +0000 (18:16 +0100)]
Add user_id + created_at index to changesets

Browsing changesets for a user will be much faster if we can get the
user's changesets in date order.

11 years agoSwitch to date stamped migrations to make branching easier to handle
Tom Hughes [Thu, 13 May 2010 17:16:00 +0000 (18:16 +0100)]
Switch to date stamped migrations to make branching easier to handle

11 years agoIgnore unknown countries when doing geolocation
Tom Hughes [Thu, 13 May 2010 14:32:46 +0000 (15:32 +0100)]
Ignore unknown countries when doing geolocation

11 years agoUbuntu Hardy only has rubygems 1.3.1 and it seems to work
Tom Hughes [Thu, 13 May 2010 11:58:22 +0000 (12:58 +0100)]
Ubuntu Hardy only has rubygems 1.3.1 and it seems to work

11 years agoUpdate various files to match current rails versions
Tom Hughes [Thu, 13 May 2010 09:54:16 +0000 (10:54 +0100)]
Update various files to match current rails versions

11 years agoMerge branch 'master' of git://git.openstreetmap.org/rails
Tom Hughes [Tue, 11 May 2010 18:45:48 +0000 (19:45 +0100)]
Merge branch 'master' of git://git.openstreetmap.org/rails

11 years agoFix site name
Tom Hughes [Tue, 11 May 2010 18:44:47 +0000 (19:44 +0100)]
Fix site name

11 years agoUpdate test to reflect changes in signup page
Tom Hughes [Tue, 11 May 2010 18:17:14 +0000 (19:17 +0100)]
Update test to reflect changes in signup page

11 years agoAdd parentheses to avoid warning
Tom Hughes [Tue, 11 May 2010 18:13:38 +0000 (19:13 +0100)]
Add parentheses to avoid warning

11 years agoMerge branch 'master' into terms
Tom Hughes [Tue, 11 May 2010 18:07:00 +0000 (19:07 +0100)]
Merge branch 'master' into terms

11 years agoRenumber migration to avoid conflict with master
Tom Hughes [Tue, 11 May 2010 18:06:30 +0000 (19:06 +0100)]
Renumber migration to avoid conflict with master

11 years agoAdd spam block ACLs with the right key
Tom Hughes [Tue, 11 May 2010 07:59:04 +0000 (08:59 +0100)]
Add spam block ACLs with the right key

11 years agoLocalisation updates from translatewiki.net (2010-05-09)
Siebrand Mazeland [Sun, 9 May 2010 17:06:31 +0000 (19:06 +0200)]
Localisation updates from translatewiki.net (2010-05-09)

11 years agoMerge branch 'master' into terms
Tom Hughes [Sun, 9 May 2010 16:16:43 +0000 (17:16 +0100)]
Merge branch 'master' into terms

11 years agoUpdated README to points to the wiki, git etc.
Ævar Arnfjörð Bjarmason [Sun, 9 May 2010 15:56:00 +0000 (15:56 +0000)]
Updated README to points to the wiki, git etc.

Link to the documentation page on the wiki, and hint at say how to
send patches.

11 years agoREADME is in Markdown format. Move it to README.mkdn
Ævar Arnfjörð Bjarmason [Sun, 9 May 2010 15:51:22 +0000 (15:51 +0000)]
README is in Markdown format. Move it to README.mkdn

This way it'll be displayed properly my GitHub and other Markdown
readers.

11 years agoOnly set pending users to active on a password reset
Tom Hughes [Sun, 9 May 2010 07:44:17 +0000 (08:44 +0100)]
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.

11 years agoBump config/wiki_pages.yml with script/misc/update-wiki-pages
Ævar Arnfjörð Bjarmason [Sat, 8 May 2010 18:10:25 +0000 (18:10 +0000)]
Bump config/wiki_pages.yml with script/misc/update-wiki-pages

11 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.

11 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.

11 years agoMerge branch 'master' into terms
Tom Hughes [Fri, 7 May 2010 21:23:20 +0000 (22:23 +0100)]
Merge branch 'master' into terms

Conflicts:
config/application.yml
lib/osm.rb
public/stylesheets/common.css

11 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.

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

11 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

11 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

11 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.

11 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.

11 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

11 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

11 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

11 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

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

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

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

11 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

11 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

11 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

11 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

11 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.

11 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.

11 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

11 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

11 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

11 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

11 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

11 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)

11 years agoMerge branch 'master' into terms
Tom Hughes [Wed, 5 May 2010 14:29:48 +0000 (15:29 +0100)]
Merge branch 'master' into terms

11 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>
11 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

11 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

11 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