]> git.openstreetmap.org Git - rails.git/log
rails.git
10 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

10 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

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

10 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

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

10 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

10 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

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

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

10 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

10 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

10 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

10 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

10 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

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

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

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

10 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

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

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

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

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

10 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

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

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

10 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

10 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

10 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

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

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

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

10 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

10 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

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

10 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

10 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

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

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

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

10 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

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

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

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

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

10 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

10 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

10 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

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

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

10 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

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

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

10 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

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

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

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

10 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

10 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

10 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

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

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

10 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

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

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

10 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

10 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

10 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

10 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

10 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

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

10 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

10 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

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

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

10 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

10 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

10 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

10 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

10 years agoAdded tests for old_* redaction routes
Matt Amos [Wed, 28 Mar 2012 17:59:54 +0000 (18:59 +0100)]
Added tests for old_* redaction routes

10 years agoAdded relation redaction logic, same as node and way logic, plus tests
Matt Amos [Wed, 28 Mar 2012 17:45:16 +0000 (18:45 +0100)]
Added relation redaction logic, same as node and way logic, plus tests

10 years agoAltered old_way stuff to be Railsy like old_node is now
Matt Amos [Wed, 28 Mar 2012 17:01:21 +0000 (18:01 +0100)]
Altered old_way stuff to be Railsy like old_node is now

10 years agoCopy the redaction code from nodes to ways
Kai Krueger [Wed, 28 Mar 2012 00:55:31 +0000 (18:55 -0600)]
Copy the redaction code from nodes to ways

10 years agoExpose redactions through the node history API calls
Kai Krueger [Mon, 26 Mar 2012 07:42:42 +0000 (01:42 -0600)]
Expose redactions through the node history API calls

Add the show_redactions=true parameter to the old_node_controller
and add a redacted attribute in node XML output.

10 years agoFixing review comments
Matt Amos [Wed, 28 Mar 2012 12:21:18 +0000 (13:21 +0100)]
Fixing review comments

Added scoping for unredacted items, cleaned up authorization and
railsified old_node_controller.

10 years agoAdding first cut of Redactions support
Matt Amos [Wed, 28 Mar 2012 11:37:40 +0000 (12:37 +0100)]
Adding first cut of Redactions support

Redactions support hiding historical versions of elements and
collecting meta-data about that action together.

10 years agoAdded Emacs temporaries to gitignore.
Matt Amos [Sun, 18 Mar 2012 20:19:04 +0000 (20:19 +0000)]
Added Emacs temporaries to gitignore.

10 years agoRevert "Add notice about upcoming downtime"
Tom Hughes [Wed, 4 Apr 2012 08:50:39 +0000 (09:50 +0100)]
Revert "Add notice about upcoming downtime"

This reverts commit 57787edc20fceec0c199e1b795f3394424d4cca1.

10 years agoAdd redactions table and link it to history tables
Matt Amos [Wed, 4 Apr 2012 07:34:34 +0000 (08:34 +0100)]
Add redactions table and link it to history tables

10 years agoMark yet more methods as needing write access to the database
Tom Hughes [Mon, 2 Apr 2012 18:08:47 +0000 (19:08 +0100)]
Mark yet more methods as needing write access to the database

10 years agoUpdate to rails 3.2.3
Tom Hughes [Mon, 2 Apr 2012 17:47:03 +0000 (18:47 +0100)]
Update to rails 3.2.3

10 years agoWe no longer need to disable sessions when the database is offline
Tom Hughes [Mon, 2 Apr 2012 17:42:14 +0000 (18:42 +0100)]
We no longer need to disable sessions when the database is offline

10 years agoMark some extra methods as needing write access to the database
Tom Hughes [Mon, 2 Apr 2012 17:40:05 +0000 (18:40 +0100)]
Mark some extra methods as needing write access to the database

10 years agoStyle readonly notice correctly
Tom Hughes [Sun, 1 Apr 2012 08:05:47 +0000 (09:05 +0100)]
Style readonly notice correctly

10 years agoRename showData to updateData in start.js.erb to resolve name clash
Kai Krueger [Sat, 31 Mar 2012 05:15:24 +0000 (23:15 -0600)]
Rename showData to updateData in start.js.erb to resolve name clash

10 years agoAdd AND attribution per request
Grant Slater [Fri, 30 Mar 2012 16:08:44 +0000 (18:08 +0200)]
Add AND attribution per request

10 years agoUpdate Potlatch 2 to 2.3-375-g9f05171 build
Tom Hughes [Fri, 30 Mar 2012 12:50:46 +0000 (13:50 +0100)]
Update Potlatch 2 to 2.3-375-g9f05171 build

10 years agoAdd Land Vorarlberg to Austrian copyright attributions
Tom Hughes [Thu, 29 Mar 2012 17:39:03 +0000 (18:39 +0100)]
Add Land Vorarlberg to Austrian copyright attributions

10 years agoImprove styling of notice and alert boxes
Tom Hughes [Thu, 29 Mar 2012 17:32:48 +0000 (18:32 +0100)]
Improve styling of notice and alert boxes

10 years agoAdd notice about upcoming downtime
Tom Hughes [Thu, 29 Mar 2012 17:32:32 +0000 (18:32 +0100)]
Add notice about upcoming downtime

10 years agoTweak the mobile style a little
Tom Hughes [Wed, 28 Mar 2012 23:29:40 +0000 (00:29 +0100)]
Tweak the mobile style a little