]> git.openstreetmap.org Git - rails.git/log
rails.git
13 years agoUse config.filter_parameters instead of filter_parameter_logging
Tom Hughes [Fri, 3 Sep 2010 16:04:42 +0000 (17:04 +0100)]
Use  config.filter_parameters instead of filter_parameter_logging

13 years agoReplace request.request_uri with request.fullpath
Tom Hughes [Fri, 3 Sep 2010 16:02:13 +0000 (17:02 +0100)]
Replace request.request_uri with request.fullpath

13 years agoUse form_tag instead of building forms by hand
Tom Hughes [Fri, 3 Sep 2010 15:53:01 +0000 (16:53 +0100)]
Use form_tag instead of building forms by hand

In order for CSRF protection to work we need to use form_for or form_tag
to build all forms so that the authenticity token is added.

13 years agoDon't allow STARTTLS to be used when sending mail
Tom Hughes [Fri, 3 Sep 2010 15:52:31 +0000 (16:52 +0100)]
Don't allow STARTTLS to be used when sending mail

Ruby's mail library seems to be very picky about the certificate
validity if STARTTLS is used, so disable it.

13 years agoAdd the dynamic form plugin to get error_messages_for support back
Tom Hughes [Fri, 3 Sep 2010 14:41:00 +0000 (15:41 +0100)]
Add the dynamic form plugin to get error_messages_for support back

13 years agoMake helpers return text instead of appending to the output buffer
Tom Hughes [Fri, 3 Sep 2010 14:25:11 +0000 (15:25 +0100)]
Make helpers return text instead of appending to the output buffer

13 years agoReplace various HTML entities with normal characters
Tom Hughes [Fri, 3 Sep 2010 00:05:59 +0000 (01:05 +0100)]
Replace various HTML entities with normal characters

13 years agoMark some strings that shouldn't be escaped as raw
Tom Hughes [Thu, 2 Sep 2010 23:58:23 +0000 (00:58 +0100)]
Mark some strings that shouldn't be escaped as raw

13 years agoUpdate notifiers to use new ActionMailer API
Tom Hughes [Thu, 2 Sep 2010 23:39:09 +0000 (00:39 +0100)]
Update notifiers to use new ActionMailer API

13 years agoUse new ActionMail API to send emails
Tom Hughes [Thu, 2 Sep 2010 22:40:49 +0000 (23:40 +0100)]
Use new ActionMail API to send emails

13 years agoUse <%= instead of <% for block helpers that use concat
Tom Hughes [Thu, 2 Sep 2010 22:30:56 +0000 (23:30 +0100)]
Use <%= instead of <% for block helpers that use concat

13 years agoUse link_to and form_tag instead of link_to_remote and form_remote_tag
Tom Hughes [Thu, 2 Sep 2010 22:00:44 +0000 (23:00 +0100)]
Use link_to and form_tag instead of link_to_remote and form_remote_tag

13 years agoUse before_validation with :on rather than before_validation_on_xxx
Tom Hughes [Thu, 2 Sep 2010 21:53:01 +0000 (22:53 +0100)]
Use before_validation with :on rather than before_validation_on_xxx

13 years agoUse Rails.xxx instead of RAILS_XXX
Tom Hughes [Thu, 2 Sep 2010 21:49:30 +0000 (22:49 +0100)]
Use Rails.xxx instead of RAILS_XXX

13 years agoUpdate to rails 3
Tom Hughes [Wed, 1 Sep 2010 10:02:58 +0000 (11:02 +0100)]
Update to rails 3

13 years agoRemove old process management scripts
Tom Hughes [Wed, 28 Sep 2011 23:25:38 +0000 (00:25 +0100)]
Remove old process management scripts

13 years agoUpdate Potlatch 2 to 2.3-89-ga94491f build
Tom Hughes [Fri, 11 Nov 2011 19:58:05 +0000 (19:58 +0000)]
Update Potlatch 2 to 2.3-89-ga94491f build

13 years agoAdd a link to the OpenStreetMap Google+ page
Tom Hughes [Mon, 7 Nov 2011 22:38:56 +0000 (22:38 +0000)]
Add a link to the OpenStreetMap Google+ page

13 years agoLocalisation updates from http://translatewiki.net.
Siebrand Mazeland [Sun, 6 Nov 2011 09:36:35 +0000 (10:36 +0100)]
Localisation updates from http://translatewiki.net.

13 years agoUpdate Potlatch 2 to 2.3-88-gc431f56 build
Tom Hughes [Tue, 1 Nov 2011 16:24:12 +0000 (16:24 +0000)]
Update Potlatch 2 to 2.3-88-gc431f56 build

13 years agoPrevent map popup from disappearing on mouseout
Martijn van Exel [Sat, 29 Oct 2011 18:24:38 +0000 (12:24 -0600)]
Prevent map popup from disappearing on mouseout

By stopping it closing we allow the user to click on the name of any
nearby mappers or friends in the map on the user page.

13 years agoBounds should be treated as floating point
Tom Hughes [Mon, 31 Oct 2011 10:08:49 +0000 (10:08 +0000)]
Bounds should be treated as floating point

13 years agoFix some XSS issues
Tom Hughes [Sun, 30 Oct 2011 17:23:39 +0000 (17:23 +0000)]
Fix some XSS issues

13 years agoUpdate Potlatch 2 to 2.3-79-g633f140 build
Tom Hughes [Fri, 14 Oct 2011 21:57:06 +0000 (22:57 +0100)]
Update Potlatch 2 to 2.3-79-g633f140 build

13 years agoUpdate Potlatch 2 to 2.3-78-g5634629 build
Tom Hughes [Tue, 11 Oct 2011 07:51:56 +0000 (08:51 +0100)]
Update Potlatch 2 to 2.3-78-g5634629 build

13 years agoUpdate Potlatch 2 to 2.3-75-g0d119e0 build
Tom Hughes [Sat, 8 Oct 2011 11:50:23 +0000 (12:50 +0100)]
Update Potlatch 2 to 2.3-75-g0d119e0 build

13 years agoAdd an inner div for the plugin as swfobject will replace it
Grant Slater [Thu, 6 Oct 2011 00:53:13 +0000 (01:53 +0100)]
Add an inner div for the plugin as swfobject will replace it

13 years agoReplace swfobject 1.5 with swfobject 2
Grant Slater [Wed, 5 Oct 2011 23:05:46 +0000 (00:05 +0100)]
Replace swfobject 1.5 with swfobject 2

13 years agoUpdate Potlatch 2 to 2.3-29-gffe3474 build
Tom Hughes [Mon, 3 Oct 2011 17:19:49 +0000 (18:19 +0100)]
Update Potlatch 2 to 2.3-29-gffe3474 build

13 years agoUpdate Potlatch 2 to 2.3-27-gb6d4754 build
Tom Hughes [Mon, 3 Oct 2011 14:09:49 +0000 (15:09 +0100)]
Update Potlatch 2 to 2.3-27-gb6d4754 build

13 years agoUpdate Potlatch 2 to 2.3-22-g7ed0c35 build
Tom Hughes [Mon, 3 Oct 2011 13:06:44 +0000 (14:06 +0100)]
Update Potlatch 2 to 2.3-22-g7ed0c35 build

13 years agoUpdate Potlatch 2 to 2.3-19-gf15d9bc build
Tom Hughes [Mon, 3 Oct 2011 11:17:39 +0000 (12:17 +0100)]
Update Potlatch 2 to 2.3-19-gf15d9bc build

13 years agoUpdate Potlatch 2 to 2.3-17-ge235e7f build
Tom Hughes [Mon, 3 Oct 2011 07:42:27 +0000 (08:42 +0100)]
Update Potlatch 2 to 2.3-17-ge235e7f build

13 years agoUpdate Potlatch 2 to 2.3-15-gdbaf30f build
Tom Hughes [Sun, 2 Oct 2011 15:13:53 +0000 (16:13 +0100)]
Update Potlatch 2 to 2.3-15-gdbaf30f build

13 years agoUpdate Potlatch 2 to 2.3-11-gfd60020 build
Tom Hughes [Sat, 1 Oct 2011 09:59:16 +0000 (10:59 +0100)]
Update Potlatch 2 to 2.3-11-gfd60020 build

13 years agoFlash 10 is now required
Grant Slater [Sat, 1 Oct 2011 01:22:27 +0000 (03:22 +0200)]
Flash 10 is now required

13 years agoUpdate Potlatch 2 to 2.3-1-gfe8365a build
Tom Hughes [Fri, 30 Sep 2011 18:04:50 +0000 (19:04 +0100)]
Update Potlatch 2 to 2.3-1-gfe8365a build

13 years agoUpdate Potlatch 2 to 2.2-48-ga7cff2e build
Tom Hughes [Thu, 29 Sep 2011 08:49:18 +0000 (09:49 +0100)]
Update Potlatch 2 to 2.2-48-ga7cff2e build

13 years agoRemove old process management scripts
Tom Hughes [Wed, 28 Sep 2011 23:25:38 +0000 (00:25 +0100)]
Remove old process management scripts

13 years agoLocalisation updates from http://translatewiki.net.
Siebrand Mazeland [Wed, 28 Sep 2011 23:43:04 +0000 (16:43 -0700)]
Localisation updates from http://translatewiki.net.

13 years agoLocalisation updates from http://translatewiki.net.
Siebrand Mazeland [Wed, 28 Sep 2011 20:33:22 +0000 (13:33 -0700)]
Localisation updates from http://translatewiki.net.

13 years agoFix some substitution markers to use %{...} instead of {{...}}
Tom Hughes [Wed, 28 Sep 2011 08:03:05 +0000 (09:03 +0100)]
Fix some substitution markers to use %{...} instead of {{...}}

13 years agoLocalisation updates from http://translatewiki.net.
Siebrand Mazeland [Sun, 25 Sep 2011 22:03:10 +0000 (00:03 +0200)]
Localisation updates from http://translatewiki.net.

13 years agoCoerce the API version to a string
Tom Hughes [Sat, 24 Sep 2011 16:02:27 +0000 (17:02 +0100)]
Coerce the API version to a string

13 years agoAvoid using underscore in anchor names
Tom Hughes [Sat, 24 Sep 2011 15:03:15 +0000 (16:03 +0100)]
Avoid using underscore in anchor names

Perl's YAML parser (wrongly as far as I can see) rejects any anchor
name with an underscore in it.

13 years agoMark all users which have seen the terms as having accepted them
Tom Hughes [Sat, 24 Sep 2011 14:23:24 +0000 (15:23 +0100)]
Mark all users which have seen the terms as having accepted them

13 years agoAdd some tests for password logins
Tom Hughes [Sat, 24 Sep 2011 14:19:34 +0000 (15:19 +0100)]
Add some tests for password logins

13 years agoUpdate tests for changes to login form
Tom Hughes [Sat, 24 Sep 2011 14:13:40 +0000 (15:13 +0100)]
Update tests for changes to login form

13 years agoAdd support for manual tracking of a Piwik goal on signup
Tom Hughes [Tue, 20 Sep 2011 20:40:53 +0000 (21:40 +0100)]
Add support for manual tracking of a Piwik goal on signup

13 years agoRemove SOTM advert
Tom Hughes [Tue, 20 Sep 2011 20:31:11 +0000 (21:31 +0100)]
Remove SOTM advert

13 years agoRework notes interface using OpenLayers and rails
Tom Hughes [Sun, 18 Sep 2011 18:30:44 +0000 (19:30 +0100)]
Rework notes interface using OpenLayers and rails

13 years agoAdd some more languages to the OpenLayers build
Tom Hughes [Sun, 18 Sep 2011 23:11:56 +0000 (00:11 +0100)]
Add some more languages to the OpenLayers build

13 years agoReturn GeoJSON for notes when JSON format is requested
Tom Hughes [Sun, 18 Sep 2011 17:54:39 +0000 (18:54 +0100)]
Return GeoJSON for notes when JSON format is requested

13 years agoMerge branch 'master' into openstreetbugs
Tom Hughes [Sun, 18 Sep 2011 13:26:59 +0000 (14:26 +0100)]
Merge branch 'master' into openstreetbugs

13 years agoAdd support for Piwik analytics
Tom Hughes [Fri, 16 Sep 2011 23:11:53 +0000 (00:11 +0100)]
Add support for Piwik analytics

13 years agoMake sure asking a node for it's history returns an ordered list
Tom Hughes [Wed, 14 Sep 2011 09:16:44 +0000 (10:16 +0100)]
Make sure asking a node for it's history returns an ordered list

13 years agoAdd the PinchZoom control to the OpenLayers build
Tom Hughes [Mon, 12 Sep 2011 13:46:13 +0000 (14:46 +0100)]
Add the PinchZoom control to the OpenLayers build

13 years agoUpgrade to OpenLayers 2.11
Tom Hughes [Sun, 11 Sep 2011 16:45:54 +0000 (17:45 +0100)]
Upgrade to OpenLayers 2.11

13 years agoLocalisation updates from http://translatewiki.net.
Siebrand Mazeland [Sun, 11 Sep 2011 14:24:59 +0000 (16:24 +0200)]
Localisation updates from http://translatewiki.net.

13 years agoUse parent.tile.openstreetmap.org for the export URL
Tom Hughes [Thu, 8 Sep 2011 10:47:00 +0000 (11:47 +0100)]
Use parent.tile.openstreetmap.org for the export URL

13 years agoImprove formatting of note descriptions in GPX and RSS responses
Tom Hughes [Sun, 28 Aug 2011 16:58:02 +0000 (17:58 +0100)]
Improve formatting of note descriptions in GPX and RSS responses

13 years agoAllow the format to be selected for note API responses
Tom Hughes [Sun, 28 Aug 2011 15:25:32 +0000 (16:25 +0100)]
Allow the format to be selected for note API responses

13 years agoMerge branch 'master' into openstreetbugs
Tom Hughes [Wed, 24 Aug 2011 20:25:05 +0000 (21:25 +0100)]
Merge branch 'master' into openstreetbugs

13 years agoRemove link to ethnio script which was never used
Tom Hughes [Tue, 23 Aug 2011 10:12:29 +0000 (11:12 +0100)]
Remove link to ethnio script which was never used

13 years agoRemove :root qualifiers as they don't seem to work in rails 2.3.14
Tom Hughes [Mon, 22 Aug 2011 21:42:38 +0000 (22:42 +0100)]
Remove :root qualifiers as they don't seem to work in rails 2.3.14

13 years agoUpdate to rails 2.3.14
Tom Hughes [Mon, 22 Aug 2011 21:24:16 +0000 (22:24 +0100)]
Update to rails 2.3.14

13 years agoDisable the openid_url field when it isn't shown
Tom Hughes [Mon, 22 Aug 2011 10:40:08 +0000 (11:40 +0100)]
Disable the openid_url field when it isn't shown

13 years agoFix incorrect interpolation variable
Tom Hughes [Mon, 22 Aug 2011 10:16:41 +0000 (11:16 +0100)]
Fix incorrect interpolation variable

13 years agoDon't show the openid field if the URL is the empty string
Tom Hughes [Mon, 22 Aug 2011 10:00:42 +0000 (11:00 +0100)]
Don't show the openid field if the URL is the empty string

13 years agoHide and show the openid field on the signup page correctly
Tom Hughes [Mon, 22 Aug 2011 09:59:49 +0000 (10:59 +0100)]
Hide and show the openid field on the signup page correctly

13 years agoFix issues with variables.
Siebrand Mazeland [Mon, 15 Aug 2011 08:53:31 +0000 (10:53 +0200)]
Fix issues with variables.

13 years agoFix old variables.
Siebrand Mazeland [Mon, 15 Aug 2011 08:41:10 +0000 (10:41 +0200)]
Fix old variables.

13 years agoLocalisation updates from http://translatewiki.net.
Siebrand Mazeland [Mon, 15 Aug 2011 08:38:06 +0000 (10:38 +0200)]
Localisation updates from http://translatewiki.net.

13 years agoLocalisation updates from http://translatewiki.net.
Siebrand Mazeland [Mon, 15 Aug 2011 08:22:11 +0000 (10:22 +0200)]
Localisation updates from http://translatewiki.net.

13 years agoTurn on the note layer when adding a note
Tom Hughes [Sun, 14 Aug 2011 16:21:20 +0000 (17:21 +0100)]
Turn on the note layer when adding a note

13 years agoRemove the notes control
Tom Hughes [Sun, 14 Aug 2011 16:09:40 +0000 (17:09 +0100)]
Remove the notes control

The control existed to allow creation of notes by clicking on the map
but as we're not doing that we don't need it.

13 years agoMore cleanup work on the notes javascript
Tom Hughes [Sun, 14 Aug 2011 15:57:46 +0000 (16:57 +0100)]
More cleanup work on the notes javascript

13 years agoMove the marker with the mouse when positioning a note
Tom Hughes [Sat, 13 Aug 2011 18:15:21 +0000 (19:15 +0100)]
Move the marker with the mouse when positioning a note

13 years agoTidy up some insanity in the creating of new notes
Tom Hughes [Sat, 13 Aug 2011 18:11:05 +0000 (19:11 +0100)]
Tidy up some insanity in the creating of new notes

13 years agoFirst pass at banishing the words "bug" and "OpenStreetBugs"
Tom Hughes [Sat, 13 Aug 2011 17:33:22 +0000 (18:33 +0100)]
First pass at banishing the words "bug" and "OpenStreetBugs"

13 years agoEnable the note later when going from the browser to the map view
Tom Hughes [Sat, 13 Aug 2011 16:09:07 +0000 (17:09 +0100)]
Enable the note later when going from the browser to the map view

13 years agoAdd next/previous tooltips for browsing notes
Tom Hughes [Sat, 13 Aug 2011 15:51:21 +0000 (16:51 +0100)]
Add next/previous tooltips for browsing notes

13 years agoGet the note browse pages into a vaguely working state
Tom Hughes [Sat, 13 Aug 2011 12:25:41 +0000 (13:25 +0100)]
Get the note browse pages into a vaguely working state

13 years agoUse correct URL for note details
Tom Hughes [Sat, 13 Aug 2011 10:51:32 +0000 (11:51 +0100)]
Use correct URL for note details

13 years agoMerge branch 'master' into openstreetbugs
Tom Hughes [Sat, 13 Aug 2011 10:48:04 +0000 (11:48 +0100)]
Merge branch 'master' into openstreetbugs

Conflicts:
app/views/browse/_map.html.erb
app/views/site/index.html.erb

13 years agoAllow the log location to be changed in production
Tom Hughes [Fri, 12 Aug 2011 21:27:15 +0000 (22:27 +0100)]
Allow the log location to be changed in production

13 years agoPass the right extent for a changeset to the remote control handler
Tom Hughes [Fri, 12 Aug 2011 18:26:12 +0000 (19:26 +0100)]
Pass the right extent for a changeset to the remote control handler

13 years agoAdd a small buffer to the extent before passing it to the remote control
Tom Hughes [Fri, 12 Aug 2011 18:18:15 +0000 (19:18 +0100)]
Add a small buffer to the extent before passing it to the remote control

13 years agoFix syntax error in Hebrew.
Siebrand Mazeland [Fri, 5 Aug 2011 14:08:05 +0000 (16:08 +0200)]
Fix syntax error in Hebrew.

13 years agoRemove trailing space.
Siebrand Mazeland [Fri, 5 Aug 2011 14:00:36 +0000 (16:00 +0200)]
Remove trailing space.

13 years agoFix for Hebrew directionality. Spotted by Aude.
Siebrand Mazeland [Fri, 5 Aug 2011 08:49:12 +0000 (10:49 +0200)]
Fix for Hebrew directionality. Spotted by Aude.

13 years agoShow the current location when editing a diary entry with a location
Tom Hughes [Mon, 1 Aug 2011 15:59:40 +0000 (16:59 +0100)]
Show the current location when editing a diary entry with a location

13 years agoStyle the map div correctly when editing an existing diary entry
Tom Hughes [Mon, 1 Aug 2011 15:54:33 +0000 (16:54 +0100)]
Style the map div correctly when editing an existing diary entry

13 years agoDon't create the map until after the div for it is made visible
Tom Hughes [Mon, 1 Aug 2011 08:09:24 +0000 (09:09 +0100)]
Don't create the map until after the div for it is made visible

13 years agoFix an accidental CSS match that broke user popups on maps
Tom Hughes [Sun, 31 Jul 2011 15:21:35 +0000 (16:21 +0100)]
Fix an accidental CSS match that broke user popups on maps

13 years agoUpdate Potlatch 2 to 2.2-41-gec89ae9 build
Tom Hughes [Tue, 19 Jul 2011 21:34:23 +0000 (22:34 +0100)]
Update Potlatch 2 to 2.2-41-gec89ae9 build

13 years agoAdd edit links to data browser pages
Tom Hughes [Tue, 19 Jul 2011 21:22:04 +0000 (22:22 +0100)]
Add edit links to data browser pages

13 years agoImplement a generic system for updating coordinates on links
Tom Hughes [Tue, 19 Jul 2011 10:05:06 +0000 (11:05 +0100)]
Implement a generic system for updating coordinates on links

13 years agoAdd style rules for the main page when invoked for an export
Tom Hughes [Tue, 19 Jul 2011 09:01:54 +0000 (10:01 +0100)]
Add style rules for the main page when invoked for an export

13 years agoDisable the edit tab until we have some coordinates to edit at
Tom Hughes [Tue, 19 Jul 2011 08:44:02 +0000 (09:44 +0100)]
Disable the edit tab until we have some coordinates to edit at