rails.git
8 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

8 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

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

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

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

8 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

8 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

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

8 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

8 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

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

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

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

8 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

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

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

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

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

8 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

8 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

8 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

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

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

8 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

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

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

8 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

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

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

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

8 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

8 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

8 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

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

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

8 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

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

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

8 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

8 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

8 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

8 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

8 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

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

8 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

8 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

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

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

8 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

8 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

8 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

8 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

8 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

8 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

8 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

8 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

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

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

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

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

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

8 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

8 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

8 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

8 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

8 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

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

8 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

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

8 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

8 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

8 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

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

8 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

8 years agoRemove mention of Tiles@Home from noscript text
Tom Hughes [Wed, 28 Mar 2012 21:55:48 +0000 (22:55 +0100)]
Remove mention of Tiles@Home from noscript text

8 years agoRename toggleData to showData
Tom Hughes [Wed, 28 Mar 2012 20:20:40 +0000 (21:20 +0100)]
Rename toggleData to showData

8 years agoRearrange layer switcher assets
Tom Hughes [Wed, 28 Mar 2012 20:18:47 +0000 (21:18 +0100)]
Rearrange layer switcher assets

8 years agoIntroduce a new layer switcher
Tom MacWright [Fri, 23 Mar 2012 21:45:50 +0000 (17:45 -0400)]
Introduce a new layer switcher

The new layer switcher behaves the same as the standard one but
has less cruft and more attractive styling.

8 years agoSend a Content-Length header when streaming a file
Tom Hughes [Wed, 28 Mar 2012 17:44:02 +0000 (18:44 +0100)]
Send a Content-Length header when streaming a file

8 years agoUpdate rails-i18n to 0.6.2
Tom Hughes [Wed, 28 Mar 2012 15:31:37 +0000 (16:31 +0100)]
Update rails-i18n to 0.6.2

8 years agoOnly require a readable database for login, not a writable one
Tom Hughes [Wed, 28 Mar 2012 09:08:38 +0000 (10:08 +0100)]
Only require a readable database for login, not a writable one

8 years agoDrop the sessions table
Tom Hughes [Wed, 28 Mar 2012 09:07:58 +0000 (10:07 +0100)]
Drop the sessions table

8 years agoRemoved temporary code for promoting databases sessions to memcached
Tom Hughes [Wed, 28 Mar 2012 09:04:56 +0000 (10:04 +0100)]
Removed temporary code for promoting databases sessions to memcached

8 years agoUpdate Potlatch 2 to 2.3-371-ga5f763a build
Tom Hughes [Tue, 27 Mar 2012 10:55:29 +0000 (11:55 +0100)]
Update Potlatch 2 to 2.3-371-ga5f763a build

8 years agoLoad Potlatch 2 through the asset pipeline
Tom Hughes [Sun, 25 Mar 2012 22:15:19 +0000 (23:15 +0100)]
Load Potlatch 2 through the asset pipeline

8 years agoMove swfobject to the vendor assets tree
Tom Hughes [Sun, 25 Mar 2012 21:49:23 +0000 (22:49 +0100)]
Move swfobject to the vendor assets tree

8 years agoUpdate Potlatch 2 to 2.3-367-ga54da3b build
Tom Hughes [Sun, 25 Mar 2012 21:42:18 +0000 (22:42 +0100)]
Update Potlatch 2 to 2.3-367-ga54da3b build

8 years agoMake sure text in Markdown help is aligned correctly
Tom Hughes [Fri, 23 Mar 2012 00:19:06 +0000 (00:19 +0000)]
Make sure text in Markdown help is aligned correctly

8 years agoAdd functional tests for messages
Tom Hughes [Thu, 22 Mar 2012 22:58:57 +0000 (22:58 +0000)]
Add functional tests for messages

Also fixes various issues in the code discovered while writing
the tests, and adds some named routes for messages.

8 years agoHandle change from @to_user to @this_user for new message action
Tom Hughes [Thu, 22 Mar 2012 19:47:24 +0000 (19:47 +0000)]
Handle change from @to_user to @this_user for new message action

8 years agoTest that viewing a block marks it as seen
Tom Hughes [Thu, 22 Mar 2012 19:23:43 +0000 (19:23 +0000)]
Test that viewing a block marks it as seen

8 years agoAdd comments to the user block functional tests
Tom Hughes [Thu, 22 Mar 2012 19:01:50 +0000 (19:01 +0000)]
Add comments to the user block functional tests

8 years agoRemove final comma from JS array which confused older versions of IE
Grant Slater [Thu, 22 Mar 2012 14:24:51 +0000 (14:24 +0000)]
Remove final comma from JS array which confused older versions of IE

8 years agoFactor out common code for looking up users
Tom Hughes [Wed, 21 Mar 2012 22:22:33 +0000 (22:22 +0000)]
Factor out common code for looking up users

8 years agoUse one "no_such_user" view everywhere
Tom Hughes [Wed, 21 Mar 2012 21:47:09 +0000 (21:47 +0000)]
Use one "no_such_user" view everywhere

8 years agoMove generation of role icons into a helper
Tom Hughes [Wed, 21 Mar 2012 19:20:40 +0000 (19:20 +0000)]
Move generation of role icons into a helper

8 years agoSet required Flash version to 10.1.x per request of RichardF
Grant Slater [Wed, 21 Mar 2012 10:38:08 +0000 (10:38 +0000)]
Set required Flash version to 10.1.x per request of RichardF

8 years agoUpdate Potlatch 2 to 2.3-236-ge27f26d build
Tom Hughes [Wed, 21 Mar 2012 10:51:04 +0000 (10:51 +0000)]
Update Potlatch 2 to 2.3-236-ge27f26d build

8 years agoImprove styling of notice boxes to match new sidebar styling
Tom Hughes [Wed, 21 Mar 2012 10:43:05 +0000 (10:43 +0000)]
Improve styling of notice boxes to match new sidebar styling

8 years agoImprove styling of alert boxes to match new sidebar styling
Tom Hughes [Wed, 21 Mar 2012 10:38:12 +0000 (10:38 +0000)]
Improve styling of alert boxes to match new sidebar styling