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

12 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

12 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

12 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

12 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

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

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

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

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

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

12 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

12 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

12 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

12 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

12 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

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

12 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

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

12 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

12 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

12 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

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

12 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

12 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

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

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

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

12 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

12 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

12 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

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

12 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

12 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

12 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

12 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

12 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

12 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

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

12 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

12 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

12 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

12 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

12 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

12 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

12 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

12 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

12 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

12 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

12 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

12 years agoAllow the development enviroment to work in offline mode
Tom Hughes [Wed, 21 Mar 2012 10:01:23 +0000 (10:01 +0000)]
Allow the development enviroment to work in offline mode

12 years agoPotlatch 2 compiled with Flex 4.5 requires Flash 10.2.0 or above
Grant Slater [Tue, 20 Mar 2012 22:55:15 +0000 (22:55 +0000)]
Potlatch 2 compiled with Flex 4.5 requires Flash 10.2.0 or above

12 years agoAdd functional tests for the user_roles controller
Tom Hughes [Tue, 20 Mar 2012 17:02:43 +0000 (17:02 +0000)]
Add functional tests for the user_roles controller

12 years agoGet rid of custom CSRF protection for user role changes
Tom Hughes [Tue, 20 Mar 2012 16:22:07 +0000 (16:22 +0000)]
Get rid of custom CSRF protection for user role changes

By restricting role changes to POST requests, which they should be
anyway, we get all the rails CSRF protection for free.

12 years agoFixed for offline mode
Tom Hughes [Tue, 20 Mar 2012 13:45:10 +0000 (13:45 +0000)]
Fixed for offline mode

12 years agoAdjust spam scoring to try and reduce false positives
Tom Hughes [Tue, 20 Mar 2012 13:28:57 +0000 (13:28 +0000)]
Adjust spam scoring to try and reduce false positives

12 years agoAvoid dragging ActionView::Helpers::TextHelper into RichText objects
Tom Hughes [Mon, 19 Mar 2012 11:59:54 +0000 (11:59 +0000)]
Avoid dragging ActionView::Helpers::TextHelper into RichText objects

Dragging in TextHelper gets us a truncate method which hides the one
we inherited from String and which we want.

12 years agoAdd functional tests for user blocks
Tom Hughes [Mon, 19 Mar 2012 11:26:02 +0000 (11:26 +0000)]
Add functional tests for user blocks

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

12 years agoHandle reason as a rich text area when editing a block
Tom Hughes [Mon, 19 Mar 2012 11:24:47 +0000 (11:24 +0000)]
Handle reason as a rich text area when editing a block

12 years agoAdd "text" to the valid formats
Tom Hughes [Sun, 18 Mar 2012 13:18:22 +0000 (13:18 +0000)]
Add "text" to the valid formats

12 years agoUpdate Potlatch 2 to 2.3-233-g066c642 release
Tom Hughes [Sun, 18 Mar 2012 12:12:43 +0000 (12:12 +0000)]
Update Potlatch 2 to 2.3-233-g066c642 release

12 years agoTidy up the trace paging view
Tristen Brown [Sat, 17 Mar 2012 21:06:30 +0000 (17:06 -0400)]
Tidy up the trace paging view

12 years agoMake the disabled state of the primary menu items more obvious
Tristen Brown [Sat, 17 Mar 2012 19:00:48 +0000 (15:00 -0400)]
Make the disabled state of the primary menu items more obvious

12 years agoUpdate schema
Tom Hughes [Sat, 17 Mar 2012 17:14:11 +0000 (17:14 +0000)]
Update schema

12 years agoUpdate to rails-i18n 0.5.2 and remove monkey patch
Tom Hughes [Sat, 17 Mar 2012 17:04:02 +0000 (17:04 +0000)]
Update to rails-i18n 0.5.2 and remove monkey patch

12 years agoDon't display Markdown help when editing an old diary entry
Tom Hughes [Sat, 17 Mar 2012 16:19:52 +0000 (16:19 +0000)]
Don't display Markdown help when editing an old diary entry