]> git.openstreetmap.org Git - rails.git/log
rails.git
12 years agoLocalisation updates from http://translatewiki.net.
Siebrand Mazeland [Fri, 29 Jun 2012 11:48:04 +0000 (11:48 +0000)]
Localisation updates from http://translatewiki.net.

12 years agoLocale maintenance:
Siebrand Mazeland [Fri, 29 Jun 2012 11:33:37 +0000 (11:33 +0000)]
Locale maintenance:
* Rename be-TARASK to be-Tarask
* Rename sr-EC to sr
* Rename sr-EL to sr-Latn
* Update README file in locales/
* Update languages.yml

12 years agoReport the feature limit correctly in the data browser
Tom Hughes [Thu, 28 Jun 2012 17:28:34 +0000 (18:28 +0100)]
Report the feature limit correctly in the data browser

12 years agoMake switching data browser to current map view work
Tom Hughes [Thu, 28 Jun 2012 17:25:24 +0000 (18:25 +0100)]
Make switching data browser to current map view work

12 years agoReplace use of Layer.GML with Layer.Vector
Tom Hughes [Thu, 28 Jun 2012 10:32:03 +0000 (11:32 +0100)]
Replace use of Layer.GML with Layer.Vector

12 years agoUpdate OpenLayers to 2.12
Tom Hughes [Thu, 28 Jun 2012 09:21:13 +0000 (10:21 +0100)]
Update OpenLayers to 2.12

12 years agoPotlatch 2 localisation updates
Tom Hughes [Thu, 28 Jun 2012 08:58:13 +0000 (09:58 +0100)]
Potlatch 2 localisation updates

12 years agoUpdate Polatch 2 to 2.3-403-gd7a64b0 build
Tom Hughes [Thu, 28 Jun 2012 08:56:39 +0000 (09:56 +0100)]
Update Polatch 2 to 2.3-403-gd7a64b0 build

12 years agoLocalisation updates from http://translatewiki.net.
Siebrand Mazeland [Sun, 24 Jun 2012 18:26:13 +0000 (18:26 +0000)]
Localisation updates from http://translatewiki.net.

12 years agoTidy up generation of UJS data attributes
Tom Hughes [Mon, 18 Jun 2012 13:36:59 +0000 (14:36 +0100)]
Tidy up generation of UJS data attributes

12 years agoUpdate Potlatch 2 to 2.3-401-g5359f3d build
Tom Hughes [Mon, 18 Jun 2012 12:34:22 +0000 (13:34 +0100)]
Update Potlatch 2 to 2.3-401-g5359f3d build

12 years agoFix tests to cope with stricter route enforcement in rails 2.3.6
Tom Hughes [Mon, 18 Jun 2012 12:03:03 +0000 (13:03 +0100)]
Fix tests to cope with stricter route enforcement in rails 2.3.6

12 years agoRemove use of deprecated :comment attribute on link_to and button_to
Tom Hughes [Mon, 18 Jun 2012 10:19:32 +0000 (11:19 +0100)]
Remove use of deprecated :comment attribute on link_to and button_to

12 years agoUpdate to rails 3.2.6
Tom Hughes [Mon, 18 Jun 2012 09:50:54 +0000 (10:50 +0100)]
Update to rails 3.2.6

12 years agoLocalisation updates from http://translatewiki.net.
Siebrand Mazeland [Sun, 17 Jun 2012 23:27:55 +0000 (23:27 +0000)]
Localisation updates from http://translatewiki.net.

12 years agoLocalisation updates from http://translatewiki.net.
Siebrand Mazeland [Sun, 10 Jun 2012 23:47:14 +0000 (23:47 +0000)]
Localisation updates from http://translatewiki.net.

12 years agoUse browser detection to decide how many features to show
Tom Hughes [Tue, 5 Jun 2012 11:59:13 +0000 (12:59 +0100)]
Use browser detection to decide how many features to show

Modern browsers are quite happy showing far more than 100 features in
the data browser, so increase the limit to 2000 by default, but keep it
restricted to 500 for IE8 and 100 for older IEs.

12 years agoLocalisation updates from http://translatewiki.net.
Siebrand Mazeland [Mon, 4 Jun 2012 15:04:29 +0000 (15:04 +0000)]
Localisation updates from http://translatewiki.net.

12 years agoFix syntax error
Tom Hughes [Fri, 1 Jun 2012 21:32:11 +0000 (22:32 +0100)]
Fix syntax error

12 years agoReplace link_to_function with UJS based code
Tom Hughes [Fri, 1 Jun 2012 15:45:32 +0000 (16:45 +0100)]
Replace link_to_function with UJS based code

12 years agoDon't try and look for variables in non-existent values
Tom Hughes [Fri, 1 Jun 2012 14:48:23 +0000 (15:48 +0100)]
Don't try and look for variables in non-existent values

12 years agoStick with CPK 5.0.4 for now as later versions seem to fail
Tom Hughes [Fri, 1 Jun 2012 14:34:28 +0000 (15:34 +0100)]
Stick with CPK 5.0.4 for now as later versions seem to fail

12 years agoUpdate to rails 3.2.5
Tom Hughes [Fri, 1 Jun 2012 14:17:01 +0000 (15:17 +0100)]
Update to rails 3.2.5

12 years agoRemove postscript export option as it doesn't really work
Tom Hughes [Wed, 30 May 2012 19:24:53 +0000 (20:24 +0100)]
Remove postscript export option as it doesn't really work

12 years agoPotlatch 2 localisation updates
Tom Hughes [Sun, 27 May 2012 12:56:50 +0000 (13:56 +0100)]
Potlatch 2 localisation updates

12 years agoGet all the tests passing under ruby 1.9
Tom Hughes [Sun, 27 May 2012 12:50:41 +0000 (13:50 +0100)]
Get all the tests passing under ruby 1.9

12 years agoLocalisation updates from http://translatewiki.net.
Siebrand Mazeland [Sat, 26 May 2012 21:20:24 +0000 (21:20 +0000)]
Localisation updates from http://translatewiki.net.

12 years agoUpdate Potlatch 2 to 2.3-396-g24ec597 build
Tom Hughes [Thu, 24 May 2012 10:06:37 +0000 (11:06 +0100)]
Update Potlatch 2 to 2.3-396-g24ec597 build

12 years agoUpdate Potlatch 2 to 2.3-393-gd6503c3 build
Tom Hughes [Mon, 21 May 2012 18:12:15 +0000 (19:12 +0100)]
Update Potlatch 2 to 2.3-393-gd6503c3 build

12 years agoPotlatch 2 localisation updates
Tom Hughes [Mon, 21 May 2012 18:11:41 +0000 (19:11 +0100)]
Potlatch 2 localisation updates

12 years agoLocalisation updates from http://translatewiki.net.
Siebrand Mazeland [Sun, 20 May 2012 11:12:40 +0000 (11:12 +0000)]
Localisation updates from http://translatewiki.net.

12 years agoAdd Land Tirol attribution to copyright page
Tom Hughes [Wed, 16 May 2012 23:06:41 +0000 (00:06 +0100)]
Add Land Tirol attribution to copyright page

12 years agoDon't show deleted comments in a user's diary comment list
Tom Hughes [Tue, 15 May 2012 17:58:13 +0000 (18:58 +0100)]
Don't show deleted comments in a user's diary comment list

12 years agoFixed diary entry and comment hiding for mass assignment protection
Tom Hughes [Sun, 13 May 2012 17:44:54 +0000 (18:44 +0100)]
Fixed diary entry and comment hiding for mass assignment protection

12 years agoUse POST for hiding diary entries and comments
Tom Hughes [Sun, 13 May 2012 17:43:44 +0000 (18:43 +0100)]
Use POST for hiding diary entries and comments

12 years agoUpdate Potlatch 2 to 2.3-390-g71b0be0 build
Tom Hughes [Sun, 13 May 2012 13:25:03 +0000 (14:25 +0100)]
Update Potlatch 2 to 2.3-390-g71b0be0 build

12 years agoPotlatch 2 localisation updates
Tom Hughes [Sun, 13 May 2012 13:23:49 +0000 (14:23 +0100)]
Potlatch 2 localisation updates

12 years agoLocalisation updates from http://translatewiki.net.
Siebrand Mazeland [Sat, 12 May 2012 18:47:19 +0000 (18:47 +0000)]
Localisation updates from http://translatewiki.net.

12 years agoUse memcache to store temporary OpenID data
Tom Hughes [Wed, 9 May 2012 09:14:58 +0000 (10:14 +0100)]
Use memcache to store temporary OpenID data

OpenID nonces and associations need to be visible across all the
servers in the production cluster, so store them in memcache where
everything can see them properly.

12 years agoUpdate Potlatch 2 to 2.3-388-g7902b3f build
Tom Hughes [Tue, 8 May 2012 09:56:02 +0000 (10:56 +0100)]
Update Potlatch 2 to 2.3-388-g7902b3f build

12 years agoLocalisation updates from http://translatewiki.net.
Siebrand Mazeland [Sun, 6 May 2012 17:12:15 +0000 (17:12 +0000)]
Localisation updates from http://translatewiki.net.

12 years agoPotlatch 2 localisation updates
Tom Hughes [Sat, 5 May 2012 14:43:07 +0000 (15:43 +0100)]
Potlatch 2 localisation updates

12 years agoTest new API permissions route
Tom Hughes [Sat, 5 May 2012 14:30:10 +0000 (15:30 +0100)]
Test new API permissions route

12 years agoImplement API endpoint to query permissions.
Enno Brehm [Thu, 26 Apr 2012 15:26:26 +0000 (17:26 +0200)]
Implement API endpoint to query permissions.

12 years agoAdd google webmaster auth file for Grant
Grant Slater [Fri, 4 May 2012 15:04:53 +0000 (16:04 +0100)]
Add google webmaster auth file for Grant

12 years agoLocalisation updates from http://translatewiki.net.
Siebrand Mazeland [Thu, 3 May 2012 21:56:48 +0000 (21:56 +0000)]
Localisation updates from http://translatewiki.net.

12 years agoUpdate fixture so active_block appears live...
Tom Hughes [Tue, 1 May 2012 20:27:51 +0000 (21:27 +0100)]
Update fixture so active_block appears live...

12 years agoAdd some basic changeset feed tests
Tom Hughes [Tue, 1 May 2012 20:14:50 +0000 (21:14 +0100)]
Add some basic changeset feed tests

12 years agoError in a changeset feed is requested for a non-existent user
Tom Hughes [Tue, 1 May 2012 19:40:59 +0000 (20:40 +0100)]
Error in a changeset feed is requested for a non-existent user

12 years agoUse openstreetmap-oauth-plugin for now
Tom Hughes [Tue, 1 May 2012 09:31:36 +0000 (10:31 +0100)]
Use openstreetmap-oauth-plugin for now

12 years agoCC-BY -> CC BY
Siebrand Mazeland [Mon, 30 Apr 2012 21:16:48 +0000 (23:16 +0200)]
CC-BY -> CC BY

12 years agoLocalisation updates from http://translatewiki.net.
Siebrand Mazeland [Sun, 29 Apr 2012 23:02:51 +0000 (23:02 +0000)]
Localisation updates from http://translatewiki.net.

12 years agoRevert "Install the local build of the oauth-plugin gem from git"
Tom Hughes [Sun, 29 Apr 2012 21:52:28 +0000 (22:52 +0100)]
Revert "Install the local build of the oauth-plugin gem from git"

This reverts commit 169a29a5d7c4352f2742d6e1257af6b78bc90b20.

12 years agoInstall the local build of the oauth-plugin gem from git
Tom Hughes [Sun, 29 Apr 2012 19:46:20 +0000 (20:46 +0100)]
Install the local build of the oauth-plugin gem from git

12 years agoTest that revoking OAuth tokens works
Tom Hughes [Tue, 24 Apr 2012 20:28:20 +0000 (21:28 +0100)]
Test that revoking OAuth tokens works

12 years agoRequire version 0.4.0.1 of the oauth-plugin gem
Tom Hughes [Tue, 24 Apr 2012 20:27:36 +0000 (21:27 +0100)]
Require version 0.4.0.1 of the oauth-plugin gem

This is special local build to fix a security issue while a new
upstream release is pending.

12 years agoShow a delete button on the OAuth application view
Tom Hughes [Mon, 23 Apr 2012 20:30:57 +0000 (21:30 +0100)]
Show a delete button on the OAuth application view

12 years agoDelete tokens for an application when the application is deleted
Tom Hughes [Mon, 23 Apr 2012 20:30:41 +0000 (21:30 +0100)]
Delete tokens for an application when the application is deleted

12 years agoPotlatch 2 localisation updates
Tom Hughes [Mon, 23 Apr 2012 20:23:28 +0000 (21:23 +0100)]
Potlatch 2 localisation updates

12 years agoRearrange the left menu
Tom Hughes [Mon, 23 Apr 2012 20:02:55 +0000 (21:02 +0100)]
Rearrange the left menu

12 years agoRemove border for arrow
Tom MacWright [Thu, 12 Apr 2012 14:57:08 +0000 (10:57 -0400)]
Remove border for arrow

12 years agoStop the menu appearing when the anchor is disabled
Tom Hughes [Thu, 12 Apr 2012 14:41:11 +0000 (15:41 +0100)]
Stop the menu appearing when the anchor is disabled

12 years agoFix some issues with the new edit menu code
Tom Hughes [Wed, 11 Apr 2012 18:19:21 +0000 (19:19 +0100)]
Fix some issues with the new edit menu code

Make sure that the arrow icons are always displayed, and that menus
are aligned in the requested way.

12 years agoRework the edit tab and it's associated drop down menu
Tom MacWright [Wed, 11 Apr 2012 17:18:39 +0000 (13:18 -0400)]
Rework the edit tab and it's associated drop down menu

This changes the behavior of the editing tabs in three places. Instead
of the current hovering behavior, you can click on the arrow and get the
drop-down menu. Any click outside that on the page will deactivate the
menu, following the UI paradigm of most desktop environments.

This also simplifies the javascript code significantly.

12 years agoThis simply moves GPS Traces to the left bar
Tom MacWright [Wed, 11 Apr 2012 16:14:28 +0000 (12:14 -0400)]
This simply moves GPS Traces to the left bar

The left bar is a bit of a kludge of random items right now, but it's a
little better having the GPS Traces item there, because it now makes the
top bar only items that are actually related to the map state.

12 years agoLocalisation updates from http://translatewiki.net.
Siebrand Mazeland [Sat, 21 Apr 2012 10:25:25 +0000 (10:25 +0000)]
Localisation updates from http://translatewiki.net.

12 years agoUpdate to use api.geonames.org instead of ws.geonames.org
Tom Hughes [Wed, 18 Apr 2012 17:44:37 +0000 (18:44 +0100)]
Update to use api.geonames.org instead of ws.geonames.org

12 years agoUpdate spam block script for mass assignment protection changes
Tom Hughes [Mon, 16 Apr 2012 07:44:38 +0000 (08:44 +0100)]
Update spam block script for mass assignment protection changes

12 years agoUpdate rails-i18n to 0.6.3
Tom Hughes [Sun, 15 Apr 2012 22:11:03 +0000 (23:11 +0100)]
Update rails-i18n to 0.6.3

12 years agoPolatch 2 localisation updates
Tom Hughes [Sun, 15 Apr 2012 21:34:57 +0000 (22:34 +0100)]
Polatch 2 localisation updates

12 years agoLocalisation updates from http://translatewiki.net.
Siebrand Mazeland [Sun, 15 Apr 2012 11:49:19 +0000 (11:49 +0000)]
Localisation updates from http://translatewiki.net.

12 years agoDon't show "Browse Map Data" when we're not on the map view
Tom Hughes [Thu, 12 Apr 2012 14:49:41 +0000 (15:49 +0100)]
Don't show "Browse Map Data" when we're not on the map view

12 years agoUpdate database schema
Tom Hughes [Mon, 9 Apr 2012 19:52:32 +0000 (20:52 +0100)]
Update database schema

12 years agoFix broken interpolation variables
Tom Hughes [Mon, 9 Apr 2012 19:52:09 +0000 (20:52 +0100)]
Fix broken interpolation variables

12 years agoUpdate Potlatch 2 to 2.3-380-gd20f3c8 build
Tom Hughes [Mon, 9 Apr 2012 19:32:30 +0000 (20:32 +0100)]
Update Potlatch 2 to 2.3-380-gd20f3c8 build

12 years agoLocalisation updates from http://translatewiki.net.
Siebrand Mazeland [Sun, 8 Apr 2012 23:01:15 +0000 (01:01 +0200)]
Localisation updates from http://translatewiki.net.

12 years agourl -> URL
Siebrand Mazeland [Fri, 6 Apr 2012 10:28:27 +0000 (12:28 +0200)]
url -> URL

12 years agoImprove styling of redaction view
Tom Hughes [Thu, 5 Apr 2012 13:33:13 +0000 (14:33 +0100)]
Improve styling of redaction view

12 years agoNo need for explicit h() escaping in new code
Tom Hughes [Thu, 5 Apr 2012 13:09:19 +0000 (14:09 +0100)]
No need for explicit h() escaping in new code

12 years agoPrefer using _html locale keys to the raw function
Tom Hughes [Thu, 5 Apr 2012 13:08:31 +0000 (14:08 +0100)]
Prefer using _html locale keys to the raw function

12 years agoRemoved lookup of current element in calls to history
Matt Amos [Wed, 4 Apr 2012 18:13:07 +0000 (19:13 +0100)]
Removed lookup of current element in calls to history

12 years agoRemoved user checks from to_xml_node, as these should already be
Matt Amos [Wed, 4 Apr 2012 17:17:23 +0000 (18:17 +0100)]
Removed user checks from to_xml_node, as these should already be
handled at the controller level.

12 years agoFixed redaction attribute on old nodes and ways, added same
Matt Amos [Wed, 4 Apr 2012 16:22:33 +0000 (17:22 +0100)]
Fixed redaction attribute on old nodes and ways, added same
functionality to relations.

12 years agoRemoved early return from printable name method
Matt Amos [Wed, 4 Apr 2012 15:58:28 +0000 (16:58 +0100)]
Removed early return from printable name method

12 years agoSet defaults properly on redaction model, and remove unnecessary
Matt Amos [Wed, 4 Apr 2012 15:56:24 +0000 (16:56 +0100)]
Set defaults properly on redaction model, and remove unnecessary
guards around update.

12 years agoDecided that restricting redacts to the user who created the
Matt Amos [Wed, 4 Apr 2012 15:51:03 +0000 (16:51 +0100)]
Decided that restricting redacts to the user who created the
redaction is an unnecessary restriction.

12 years agoRefactored common functionality from object history controllers
Matt Amos [Wed, 4 Apr 2012 15:49:28 +0000 (16:49 +0100)]
Refactored common functionality from object history controllers

12 years agoBetter comments in application controller logic
Matt Amos [Wed, 4 Apr 2012 15:10:45 +0000 (16:10 +0100)]
Better comments in application controller logic

12 years agoUsed `unredacted` scope rather than explicit SQL
Matt Amos [Wed, 4 Apr 2012 14:13:17 +0000 (15:13 +0100)]
Used `unredacted` scope rather than explicit SQL

12 years agoAdded redactions controller test and fixed a bug in the controller
Matt Amos [Tue, 3 Apr 2012 19:09:17 +0000 (20:09 +0100)]
Added redactions controller test and fixed a bug in the controller

12 years agoFixed fixture after adding link from redaction to user
Matt Amos [Tue, 3 Apr 2012 17:11:20 +0000 (18:11 +0100)]
Fixed fixture after adding link from redaction to user

12 years agoStop the data browser leaking details of redactions
Matt Amos [Mon, 2 Apr 2012 13:30:57 +0000 (14:30 +0100)]
Stop the data browser leaking details of redactions

Altered styling of redacted versions in changeset list so that they
appear deleted and don't leak tag information.

12 years agoFixed redaction link in browse/history page
Matt Amos [Mon, 2 Apr 2012 11:48:52 +0000 (12:48 +0100)]
Fixed redaction link in browse/history page

12 years agoFixed redaction link in redactions list
Matt Amos [Mon, 2 Apr 2012 11:48:21 +0000 (12:48 +0100)]
Fixed redaction link in redactions list

12 years agoFixed typo in translation
Matt Amos [Mon, 2 Apr 2012 11:03:52 +0000 (12:03 +0100)]
Fixed typo in translation

12 years agoAdded redactions resource
Matt Amos [Sat, 31 Mar 2012 22:44:18 +0000 (23:44 +0100)]
Added redactions resource

12 years agoFixed AMF controller methods to hide redacted ways
Matt Amos [Sat, 31 Mar 2012 19:16:33 +0000 (20:16 +0100)]
Fixed AMF controller methods to hide redacted ways

12 years agoFixed AMF controller methods to hide redacted nodes
Matt Amos [Sat, 31 Mar 2012 19:12:25 +0000 (20:12 +0100)]
Fixed AMF controller methods to hide redacted nodes

12 years agoAdded tests for browsing object histories with redacted elements
Matt Amos [Thu, 29 Mar 2012 16:07:24 +0000 (17:07 +0100)]
Added tests for browsing object histories with redacted elements

12 years agoAdded test for changeset/download hiding redacted elements
Matt Amos [Thu, 29 Mar 2012 15:12:01 +0000 (16:12 +0100)]
Added test for changeset/download hiding redacted elements