]> git.openstreetmap.org Git - rails.git/log
rails.git
14 years agoAdd support for conditional deletes in changeset uploads
Tom Hughes [Mon, 13 Dec 2010 00:21:47 +0000 (00:21 +0000)]
Add support for conditional deletes in changeset uploads

A delete element in an osmChange upload can now have an if-unused
attribute to indicate that the delete should not be done if the
object is still in use.

14 years agoAllow the client to request errors as an XML document
Tom Hughes [Sun, 12 Dec 2010 16:58:34 +0000 (16:58 +0000)]
Allow the client to request errors as an XML document

14 years agoChannel all error reporting through report_error
Tom Hughes [Sun, 12 Dec 2010 16:25:01 +0000 (16:25 +0000)]
Channel all error reporting through report_error

14 years agoUpdate Potlatch 2 to r24694 build
Tom Hughes [Sat, 11 Dec 2010 00:11:39 +0000 (00:11 +0000)]
Update Potlatch 2 to r24694 build

14 years agoUpdate Potlatch 2 to r24693 build
Tom Hughes [Fri, 10 Dec 2010 22:20:38 +0000 (22:20 +0000)]
Update Potlatch 2 to r24693 build

14 years agoRelative URLs seem to upset OAuth so use the host from the request
Tom Hughes [Fri, 10 Dec 2010 14:20:24 +0000 (14:20 +0000)]
Relative URLs seem to upset OAuth so use the host from the request

14 years agoUse relative URLs rather than hard coding the server name
Tom Hughes [Fri, 10 Dec 2010 13:32:06 +0000 (13:32 +0000)]
Use relative URLs rather than hard coding the server name

14 years agoUpdate Potlatch 2 to r24663 build
Tom Hughes [Thu, 9 Dec 2010 12:08:35 +0000 (12:08 +0000)]
Update Potlatch 2 to r24663 build

14 years agoFix invalid vertical-align in stylesheet
Tom Hughes [Tue, 7 Dec 2010 11:06:54 +0000 (11:06 +0000)]
Fix invalid vertical-align in stylesheet

14 years agoMake sure deleted relations are crossed out when browsing a changeset
Tom Hughes [Wed, 8 Dec 2010 12:44:19 +0000 (12:44 +0000)]
Make sure deleted relations are crossed out when browsing a changeset

14 years agoUpdate Potlatch 2 to r24636 build
Tom Hughes [Tue, 7 Dec 2010 00:27:50 +0000 (00:27 +0000)]
Update Potlatch 2 to r24636 build

14 years agoUpdate Potlatch 2 to r24608 build
Tom Hughes [Mon, 6 Dec 2010 10:00:25 +0000 (10:00 +0000)]
Update Potlatch 2 to r24608 build

14 years agoUpdate expected GPS namespace in tests
Shaun McDonald [Mon, 6 Dec 2010 00:30:05 +0000 (00:30 +0000)]
Update expected GPS namespace in tests

Update tests to expect the correct GPX namespace URL to reflect the
change made in 7369b7427c3df17314cfa5e9f69bedd78f760047 ane make the
tests pass again.

14 years agoAvoid integer overflow when computing shortcodes
Matt Amos [Sun, 5 Dec 2010 11:00:57 +0000 (11:00 +0000)]
Avoid integer overflow when computing shortcodes

Although javascript's numbers are double precision floating point
number which support 52 bits of precision the bitwise operations are
only guaranteed to work at 32 bits of precision so we need to avoid
relying on them doing more than that.

14 years agoUpdate Potlatch 2 to r24576 build
Tom Hughes [Sat, 4 Dec 2010 14:44:50 +0000 (14:44 +0000)]
Update Potlatch 2 to r24576 build

14 years agoAdd a javascript callback for Potlatch 2 to update links as the map moves
Tom Hughes [Fri, 3 Dec 2010 15:08:48 +0000 (15:08 +0000)]
Add a javascript callback for Potlatch 2 to update links as the map moves

14 years agoUpdate Potlatch 2 to r24558 build
Tom Hughes [Fri, 3 Dec 2010 15:01:28 +0000 (15:01 +0000)]
Update Potlatch 2 to r24558 build

14 years agoRemove bogus trailing slash from GPX namespace URL
Tom Hughes [Thu, 2 Dec 2010 19:23:38 +0000 (19:23 +0000)]
Remove bogus trailing slash from GPX namespace URL

14 years agoNew highway icons for Potlatch 2
Tom Hughes [Thu, 2 Dec 2010 11:35:54 +0000 (11:35 +0000)]
New highway icons for Potlatch 2

14 years agoUpdate Potlatch 2 to r24500 build
Tom Hughes [Wed, 1 Dec 2010 16:23:42 +0000 (16:23 +0000)]
Update Potlatch 2 to r24500 build

14 years agoUpdate Potlatch 2 to r24494 build
Tom Hughes [Wed, 1 Dec 2010 12:50:59 +0000 (12:50 +0000)]
Update Potlatch 2 to r24494 build

14 years agoUpdate Potlatch 2 to r24490 build
Tom Hughes [Wed, 1 Dec 2010 10:33:31 +0000 (10:33 +0000)]
Update Potlatch 2 to r24490 build

14 years agoFix test for change to editor options
Tom Hughes [Wed, 1 Dec 2010 09:27:12 +0000 (09:27 +0000)]
Fix test for change to editor options

14 years agoReplace JOSM editing option with generic Remote Control option
Tom Hughes [Wed, 1 Dec 2010 09:25:27 +0000 (09:25 +0000)]
Replace JOSM editing option with generic Remote Control option

14 years agoUpdate Potlatch 2 to r24483 build
Tom Hughes [Tue, 30 Nov 2010 21:39:40 +0000 (21:39 +0000)]
Update Potlatch 2 to r24483 build

14 years agoImprove the unsaved edits warning for Potlatch 2
Tom Hughes [Tue, 30 Nov 2010 21:12:21 +0000 (21:12 +0000)]
Improve the unsaved edits warning for Potlatch 2

14 years agoLocalisation updates from http://translatewiki.net.
Siebrand Mazeland [Tue, 30 Nov 2010 20:28:21 +0000 (21:28 +0100)]
Localisation updates from http://translatewiki.net.

14 years agoUpdate Potlatch 2 to r24481 build
Tom Hughes [Tue, 30 Nov 2010 20:27:39 +0000 (20:27 +0000)]
Update Potlatch 2 to r24481 build

14 years agoUpdate Potlatch 2 to r24477 build
Tom Hughes [Tue, 30 Nov 2010 18:04:59 +0000 (18:04 +0000)]
Update Potlatch 2 to r24477 build

14 years agoAdd the Bing imagery to Potlatch 2
Tom Hughes [Tue, 30 Nov 2010 17:40:25 +0000 (17:40 +0000)]
Add the Bing imagery to Potlatch 2

14 years agoMake setPosition reposition Potlatch 2 instead of reloading it
Tom Hughes [Tue, 30 Nov 2010 17:18:16 +0000 (17:18 +0000)]
Make setPosition reposition Potlatch 2 instead of reloading it

14 years agoMake launching of Potlatch 2 from the GPS trace list work
Tom Hughes [Tue, 30 Nov 2010 17:11:49 +0000 (17:11 +0000)]
Make launching of Potlatch 2 from the GPS trace list work

14 years agoWire up maximise/minimise support for Potlatch 2
Tom Hughes [Tue, 30 Nov 2010 17:05:49 +0000 (17:05 +0000)]
Wire up maximise/minimise support for Potlatch 2

14 years agoUpdate Potlatch 2 to r24474 build
Tom Hughes [Tue, 30 Nov 2010 17:02:03 +0000 (17:02 +0000)]
Update Potlatch 2 to r24474 build

14 years agoCorrect a few interpolation variables in the Turkish translation
Tom Hughes [Tue, 30 Nov 2010 08:57:54 +0000 (08:57 +0000)]
Correct a few interpolation variables in the Turkish translation

14 years agoFixup tests for changes to multi-editor functionality
Tom Hughes [Mon, 29 Nov 2010 21:19:01 +0000 (21:19 +0000)]
Fixup tests for changes to multi-editor functionality

14 years agoHide the edit menu when printing
Tom Hughes [Mon, 29 Nov 2010 20:59:59 +0000 (20:59 +0000)]
Hide the edit menu when printing

14 years agoLocalisation updates from http://translatewiki.net.
Siebrand Mazeland [Mon, 29 Nov 2010 16:16:20 +0000 (17:16 +0100)]
Localisation updates from http://translatewiki.net.

14 years agoUpdate Potlatch 2 to r24454 build
Tom Hughes [Mon, 29 Nov 2010 12:14:12 +0000 (12:14 +0000)]
Update Potlatch 2 to r24454 build

14 years agoUpdate Potlatch 2 to r24423 build
Tom Hughes [Sat, 27 Nov 2010 00:05:36 +0000 (00:05 +0000)]
Update Potlatch 2 to r24423 build

14 years agoUpdate Potlatch 2 to r24332 build
Tom Hughes [Mon, 22 Nov 2010 16:43:56 +0000 (16:43 +0000)]
Update Potlatch 2 to r24332 build

14 years agoUpdate Potlatch 2 to r24317 build
Tom Hughes [Sun, 21 Nov 2010 08:44:29 +0000 (08:44 +0000)]
Update Potlatch 2 to r24317 build

14 years agoUse prototype based event handling for consistency
Tom Hughes [Wed, 17 Nov 2010 16:31:03 +0000 (16:31 +0000)]
Use prototype based event handling for consistency

14 years agoDon't display the menu when the anchor is disabled
Tom Hughes [Wed, 17 Nov 2010 15:52:08 +0000 (15:52 +0000)]
Don't display the menu when the anchor is disabled

14 years agoUse prototype to capture events so the menus work on IE
Tom Hughes [Wed, 17 Nov 2010 15:47:59 +0000 (15:47 +0000)]
Use prototype to capture events so the menus work on IE

14 years agoAdd an explicit "default editor" option to the user settings
Tom Hughes [Tue, 16 Nov 2010 21:13:29 +0000 (21:13 +0000)]
Add an explicit "default editor" option to the user settings

14 years agoUpdate Potlatch 2 styles
Tom Hughes [Tue, 16 Nov 2010 20:18:47 +0000 (20:18 +0000)]
Update Potlatch 2 styles

14 years agoUpdate Potlatch 2 to r24252 build
Tom Hughes [Tue, 16 Nov 2010 09:36:21 +0000 (09:36 +0000)]
Update Potlatch 2 to r24252 build

14 years agoImplement automatic OAuth setup for Potlatch 2
Tom Hughes [Tue, 16 Nov 2010 00:50:12 +0000 (00:50 +0000)]
Implement automatic OAuth setup for Potlatch 2

14 years agoWarn if we fail to contact JOSM
Tom Hughes [Mon, 15 Nov 2010 09:34:09 +0000 (09:34 +0000)]
Warn if we fail to contact JOSM

14 years agoShow a popup listing available editors when hovering over the edit tab
Tom Hughes [Mon, 15 Nov 2010 00:44:17 +0000 (00:44 +0000)]
Show a popup listing available editors when hovering over the edit tab

14 years agoOnly Potlatch 1 needs a token to be created
Tom Hughes [Sun, 14 Nov 2010 17:36:46 +0000 (17:36 +0000)]
Only Potlatch 1 needs a token to be created

14 years agoMake JOSM remote control based editing work
Tom Hughes [Sun, 14 Nov 2010 17:35:08 +0000 (17:35 +0000)]
Make JOSM remote control based editing work

14 years agoAdd Potlatch 2 as an editor option
Tom Hughes [Sun, 14 Nov 2010 14:44:35 +0000 (14:44 +0000)]
Add Potlatch 2 as an editor option

14 years agoInitial work on support for multiple editors
Matt Amos [Sun, 14 Nov 2010 12:40:44 +0000 (12:40 +0000)]
Initial work on support for multiple editors

14 years agoDon't show user navigation links for non-public users
Tom Hughes [Tue, 23 Nov 2010 09:30:22 +0000 (09:30 +0000)]
Don't show user navigation links for non-public users

The changeset browser pages should not show the per-user navigation links
for changesets made by users that have not made their edits public.

14 years agoProtect against interception of confirmation emails
Tom Hughes [Mon, 15 Nov 2010 21:41:32 +0000 (21:41 +0000)]
Protect against interception of confirmation emails

When processing an account confirmation email don't automatically
log the user in unless their browser session has a token that
matches the same user. Closes #3337.

14 years agoDB Function add standard pgsql include dir too
Grant Slater [Fri, 12 Nov 2010 15:31:44 +0000 (15:31 +0000)]
DB Function add standard pgsql include dir too

14 years agoHide the scale bar when printing
Tom Hughes [Tue, 9 Nov 2010 14:29:05 +0000 (14:29 +0000)]
Hide the scale bar when printing

14 years agoAdd a scale bar that changes with latitude (from OpenLayers 2.10)
Andy Allan [Tue, 9 Nov 2010 14:18:16 +0000 (14:18 +0000)]
Add a scale bar that changes with latitude (from OpenLayers 2.10)

14 years agoLocalisation updates from http://translatewiki.net.
Siebrand Mazeland [Sun, 7 Nov 2010 20:55:58 +0000 (21:55 +0100)]
Localisation updates from http://translatewiki.net.

14 years agoAllow the Nominatim instance used to be configured
Tom Hughes [Tue, 2 Nov 2010 10:40:43 +0000 (10:40 +0000)]
Allow the Nominatim instance used to be configured

14 years agoLocalisation updates from http://translatewiki.net.
Siebrand Mazeland [Thu, 28 Oct 2010 23:35:34 +0000 (01:35 +0200)]
Localisation updates from http://translatewiki.net.

14 years agoLocalisation updates from http://translatewiki.net
Siebrand Mazeland [Mon, 18 Oct 2010 19:35:37 +0000 (21:35 +0200)]
Localisation updates from http://translatewiki.net

14 years agoRemove duplicate (and inconsistent) title from the map key
Tom Hughes [Thu, 14 Oct 2010 17:11:56 +0000 (18:11 +0100)]
Remove duplicate (and inconsistent) title from the map key

The map key had a heading in the title bar space and then another
inconsistent one inside the sidebar - the second one has been removed.

The tooltop for the map key link has also been improved.

14 years agoHandle attempts to agree terms by users with validation errors better
Tom Hughes [Tue, 12 Oct 2010 19:34:49 +0000 (20:34 +0100)]
Handle attempts to agree terms by users with validation errors better

14 years agoThere are five trace fixtures now
Tom Hughes [Mon, 11 Oct 2010 22:35:44 +0000 (23:35 +0100)]
There are five trace fixtures now

14 years agoMake trace API a proper CRUD API like other object types
Tom Hughes [Mon, 11 Oct 2010 22:09:27 +0000 (23:09 +0100)]
Make trace API a proper CRUD API like other object types

14 years agoInclude description and tags in GPX details API response
Tom Hughes [Mon, 11 Oct 2010 18:10:42 +0000 (19:10 +0100)]
Include description and tags in GPX details API response

14 years agoMake permalinks draggable
Tom Hughes [Mon, 11 Oct 2010 07:39:05 +0000 (08:39 +0100)]
Make permalinks draggable

Move the div containing the permalinks outside the map div so that
they aren't affected by the OpenLayers event handlers and hence get
the normal drag handling for links. Closes #3251.

14 years agoThe read flag is a boolean
Tom Hughes [Fri, 8 Oct 2010 14:25:10 +0000 (15:25 +0100)]
The read flag is a boolean

14 years agoFix for postgres boolean support
Tom Hughes [Fri, 8 Oct 2010 11:27:37 +0000 (12:27 +0100)]
Fix for postgres boolean support

14 years agoInterplation variable names shouldn't be translated...
Tom Hughes [Mon, 4 Oct 2010 20:47:31 +0000 (21:47 +0100)]
Interplation variable names shouldn't be translated...

14 years agoAllow users to send themselves a new confirmation email
Tom Hughes [Mon, 4 Oct 2010 20:38:02 +0000 (21:38 +0100)]
Allow users to send themselves a new confirmation email

Add a method which generates a new confirmation email, and provide
links to it from appropriate places.

14 years agoInvite users to fill in their profile after confirming an account
Tom Hughes [Mon, 4 Oct 2010 18:45:26 +0000 (19:45 +0100)]
Invite users to fill in their profile after confirming an account

14 years agoImprove the flash message shown after a user signs up
Tom Hughes [Mon, 4 Oct 2010 18:10:00 +0000 (19:10 +0100)]
Improve the flash message shown after a user signs up

Make the message a bit more friendly and include the email address
the confirmation was sent to.

14 years agoUse javascript to automatically submit confirmation forms
Tom Hughes [Mon, 4 Oct 2010 16:47:56 +0000 (17:47 +0100)]
Use javascript to automatically submit confirmation forms

In order to avoid forcing the user to press a confirm button, whilst
still not running into the problems we used to have with virus scanners
activating accounts we use javascript to hide and then automatically
submit the confirmation form.

14 years agoLocalisation updates from http://translatewiki.net
Siebrand Mazeland [Sun, 3 Oct 2010 20:36:22 +0000 (22:36 +0200)]
Localisation updates from http://translatewiki.net

14 years agoUpdate the airport tag to use the standard aeroway=aerodrome
Shaun McDonald [Wed, 29 Sep 2010 09:51:47 +0000 (10:51 +0100)]
Update the airport tag to use the standard aeroway=aerodrome

Update the airport tag to use the standard aeroway=aerodrome instead
of the amenity=airport as pointed out on potlatch-dev mailing list.

14 years agoRequire a specific version of the oauth plugin
Tom Hughes [Fri, 24 Sep 2010 10:02:41 +0000 (11:02 +0100)]
Require a specific version of the oauth plugin

It looks likely that the API  will change in future versions of
the oauth plugin, so require a known working version for now.

14 years agoDisplay the verifier if OAuth 1.0a is being used in OOB mode
Tom Hughes [Mon, 20 Sep 2010 20:44:54 +0000 (21:44 +0100)]
Display the verifier if OAuth 1.0a is being used in OOB mode

14 years agoUpdate oauth models and controllers for OAuth 1.0a support
Tom Hughes [Fri, 10 Sep 2010 09:31:44 +0000 (10:31 +0100)]
Update oauth models and controllers for OAuth 1.0a support

14 years agoRemove oauth-plugin from vendor and require gem version instead
Tom Hughes [Fri, 10 Sep 2010 08:30:21 +0000 (09:30 +0100)]
Remove oauth-plugin from vendor and require gem version instead

14 years agowiki_pages: Run script/misc/update-wiki-pages
Ævar Arnfjörð Bjarmason [Thu, 16 Sep 2010 15:13:15 +0000 (15:13 +0000)]
wiki_pages: Run script/misc/update-wiki-pages

14 years agoLocalisation updates from http://translatewiki.net
Siebrand Mazeland [Thu, 16 Sep 2010 23:24:10 +0000 (01:24 +0200)]
Localisation updates from http://translatewiki.net

14 years agoWork around change in handler behaviour in OpenLayers 2.10
Tom Hughes [Wed, 15 Sep 2010 09:52:04 +0000 (10:52 +0100)]
Work around change in handler behaviour in OpenLayers 2.10

We need to install the endDrag routine as the "done" handler after
creating the control otherwise the control will overwrite our handler
with one of it's own.

14 years agoRemove NearMap from Potlatch options
Richard Fairhurst [Wed, 15 Sep 2010 09:32:13 +0000 (10:32 +0100)]
Remove NearMap from Potlatch options

14 years agoEscape ampersands in URLs when exporting HTML for embedding
Tom Hughes [Fri, 10 Sep 2010 16:36:55 +0000 (17:36 +0100)]
Escape ampersands in URLs when exporting HTML for embedding

14 years agoMake locale data for help and wiki links a bit cleaner
Tom Hughes [Fri, 10 Sep 2010 10:43:13 +0000 (11:43 +0100)]
Make locale data for help and wiki links a bit cleaner

14 years agoOnly display the license notice if we don't already have a notice
Tom Hughes [Fri, 10 Sep 2010 10:23:01 +0000 (11:23 +0100)]
Only display the license notice if we don't already have a notice

14 years agoMention help.openstreetmap.org in the welcome message
Tom Hughes [Fri, 10 Sep 2010 10:20:00 +0000 (11:20 +0100)]
Mention help.openstreetmap.org in the welcome message

14 years agoLink to help.openstreetmap.org from the sidebar
Tom Hughes [Fri, 10 Sep 2010 10:14:00 +0000 (11:14 +0100)]
Link to help.openstreetmap.org from the sidebar

14 years agoRemove unused/non-functional tag searching methods
Tom Hughes [Thu, 9 Sep 2010 20:32:15 +0000 (21:32 +0100)]
Remove unused/non-functional tag searching methods

14 years agoUpdate to OpenLayers 2.10
Tom Hughes [Thu, 9 Sep 2010 15:27:50 +0000 (16:27 +0100)]
Update to OpenLayers 2.10

14 years agoFix typo
Tom Hughes [Thu, 9 Sep 2010 08:05:25 +0000 (09:05 +0100)]
Fix typo

14 years agoUse the keyid to identify the layer to using when exporting to an
Tom Hughes [Wed, 8 Sep 2010 16:13:54 +0000 (17:13 +0100)]
Use the keyid to identify the layer to using when exporting to an
embeddable map. Fixes #3221.

14 years agoSuppress deprecation warning from i18n
Tom Hughes [Thu, 2 Sep 2010 19:00:43 +0000 (20:00 +0100)]
Suppress deprecation warning from i18n

14 years agoRequire i18n version 0.4.1 and fix monkey patch to work with it
Tom Hughes [Thu, 2 Sep 2010 18:01:21 +0000 (19:01 +0100)]
Require i18n version 0.4.1 and fix monkey patch to work with it

Rails 3 pulls in i18n version 0.4.1 as a separate gem which then
breaks our code if it is running on a machine with rails 3 installed
as it tries to monkey patch i18n and fails, so this fix allows us
to run on a machine with rails 3 installed.

14 years agoRevert "We can cache the trace list for logged in users now"
Tom Hughes [Wed, 1 Sep 2010 12:47:06 +0000 (13:47 +0100)]
Revert "We can cache the trace list for logged in users now"

This reverts commit f30dcd1a629449c19bc75fb3e6baa2a58f57d3c5.

14 years agoLocalisation updates from http://transatewiki.net
Siebrand Mazeland [Mon, 30 Aug 2010 18:18:13 +0000 (20:18 +0200)]
Localisation updates from http://transatewiki.net