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

12 years agoSet the user description to markdown formatting when it changes
Tom Hughes [Sat, 17 Mar 2012 16:10:58 +0000 (16:10 +0000)]
Set the user description to markdown formatting when it changes

12 years agoAdd some tests for the RichText module
Tom Hughes [Fri, 16 Mar 2012 22:38:27 +0000 (22:38 +0000)]
Add some tests for the RichText module

12 years agoAdd rel="nofollow" to links generated from Markdown
Tom Hughes [Fri, 16 Mar 2012 22:38:04 +0000 (22:38 +0000)]
Add rel="nofollow" to links generated from Markdown

12 years agoDrop the contents of <script> and <style> tags when we strip them
Tom Hughes [Fri, 16 Mar 2012 22:37:15 +0000 (22:37 +0000)]
Drop the contents of <script> and <style> tags when we strip them

12 years agoTreat messages received by email as plain text
Tom Hughes [Fri, 16 Mar 2012 17:01:31 +0000 (17:01 +0000)]
Treat messages received by email as plain text

Move creation of a message from an email into the message model and
adjust the logic to treat messages received by email as plain text.

12 years agoAdd a simple "text" format to the RichText module
Tom Hughes [Fri, 16 Mar 2012 17:00:59 +0000 (17:00 +0000)]
Add a simple "text" format to the RichText module

12 years agoLink to the Markdown spec
Tom Hughes [Sun, 11 Mar 2012 10:09:03 +0000 (10:09 +0000)]
Link to the Markdown spec

12 years agoUpdate schema
Tom Hughes [Sat, 10 Mar 2012 14:15:24 +0000 (14:15 +0000)]
Update schema

12 years agoAdd an HTML version of the diary comment notification mail
Tom Hughes [Mon, 5 Mar 2012 23:00:52 +0000 (23:00 +0000)]
Add an HTML version of the diary comment notification mail

12 years agoMake spam scoring work with new rich text system
Tom Hughes [Mon, 5 Mar 2012 22:46:28 +0000 (22:46 +0000)]
Make spam scoring work with new rich text system

12 years agoOnly reload the preview if the content has changed
Tom Hughes [Sun, 4 Mar 2012 17:13:17 +0000 (17:13 +0000)]
Only reload the preview if the content has changed

12 years agoShow an animation while a preview is loading
Tom Hughes [Sun, 4 Mar 2012 16:22:08 +0000 (16:22 +0000)]
Show an animation while a preview is loading

12 years agoAdd preview functionality to rich text controls
Tom Hughes [Sat, 3 Mar 2012 18:40:44 +0000 (18:40 +0000)]
Add preview functionality to rich text controls

12 years agoGrow text areas automatically in response to input
Tom Hughes [Wed, 15 Feb 2012 21:30:34 +0000 (21:30 +0000)]
Grow text areas automatically in response to input

12 years agoTreat all newly entered blocks of text as Markdown
Tom Hughes [Wed, 15 Feb 2012 00:48:52 +0000 (00:48 +0000)]
Treat all newly entered blocks of text as Markdown

12 years agoOnly mark a message as read after we have validated the email reply
Tom Hughes [Fri, 16 Mar 2012 15:44:40 +0000 (15:44 +0000)]
Only mark a message as read after we have validated the email reply

12 years agoMark a message as read when we receive an email reply to it
Tom Hughes [Fri, 16 Mar 2012 15:17:50 +0000 (15:17 +0000)]
Mark a message as read when we receive an email reply to it

12 years agoUpdate Potlatch 2 to 2.3-230-gc79b527 build
Tom Hughes [Fri, 16 Mar 2012 09:06:43 +0000 (09:06 +0000)]
Update Potlatch 2 to 2.3-230-gc79b527 build

12 years agoRemoved Osmrender export test
Tom Hughes [Fri, 16 Mar 2012 09:06:17 +0000 (09:06 +0000)]
Removed Osmrender export test

12 years agoLocalisation updates from http://translatewiki.net. Cleanups for Russian translations.
Siebrand Mazeland [Thu, 15 Mar 2012 19:44:49 +0000 (20:44 +0100)]
Localisation updates from http://translatewiki.net. Cleanups for Russian translations.

12 years agoIt's zoomToExtent, not setExtent
Tom Hughes [Thu, 15 Mar 2012 17:01:16 +0000 (17:01 +0000)]
It's zoomToExtent, not setExtent

12 years agoDisable the export button until a format is selected
Tom Hughes [Thu, 15 Mar 2012 14:50:43 +0000 (14:50 +0000)]
Disable the export button until a format is selected

12 years agoRemoved code for handling Osmrender export requests
Tom Hughes [Thu, 15 Mar 2012 14:43:03 +0000 (14:43 +0000)]
Removed code for handling Osmrender export requests

12 years agoRefactor calculation of zoom level based on a scale
Tom Hughes [Wed, 14 Mar 2012 19:12:32 +0000 (19:12 +0000)]
Refactor calculation of zoom level based on a scale

12 years agoChange abstraction level for map functions
Tom MacWright [Mon, 12 Mar 2012 16:52:40 +0000 (12:52 -0400)]
Change abstraction level for map functions

This commit should have no functional affect. It just changes the
abstraction level of OpenLayers from completely abstracting away
getMapExtent etc, to using OpenLayers's functionality directly but
providing proj and unproj to make projections palatable.

12 years agoAdd missing </div> tag
Tom Hughes [Wed, 14 Mar 2012 18:29:19 +0000 (18:29 +0000)]
Add missing </div> tag

12 years agoAdd _html suffixes to some resource strings which have changed
Tom Hughes [Wed, 14 Mar 2012 17:51:42 +0000 (17:51 +0000)]
Add _html suffixes to some resource strings which have changed

Where a translatable string contains (directly or indirectly via
interpolations) some HTML it is better to add an _html suffix to
the key rather than wrap the result in raw so that escaping is
handled automatically for interpolations.

It's not worth doing until a string is changed and needs to be
retranslated though, as it will just break translations.

12 years agoAdjust width of donate box so it centres properly
Tom Hughes [Wed, 14 Mar 2012 17:44:45 +0000 (17:44 +0000)]
Adjust width of donate box so it centres properly

12 years agoFront page copy revision
Tom MacWright [Wed, 14 Mar 2012 15:16:10 +0000 (11:16 -0400)]
Front page copy revision

This edits the front page copy to be more direct, link off to more
useful resources, and guide people to register for an account. It
also moves partner links to below the donate link.

12 years agoUpdate Potlatch 2 to 2.3-226-g5642465 build
Tom Hughes [Wed, 14 Mar 2012 14:26:28 +0000 (14:26 +0000)]
Update Potlatch 2 to 2.3-226-g5642465 build

12 years agoAdd missing translation for new community submenu
Tom Hughes [Wed, 14 Mar 2012 14:25:55 +0000 (14:25 +0000)]
Add missing translation for new community submenu