rails.git
10 years agoMerge branch 'openID' of git://git.openstreetmap.org/rails into openid
Tom Hughes [Sat, 21 May 2011 11:11:40 +0000 (12:11 +0100)]
Merge branch 'openID' of git://git.openstreetmap.org/rails into openid

10 years agoMerge branch 'master' into openid
Tom Hughes [Thu, 10 Feb 2011 14:10:19 +0000 (14:10 +0000)]
Merge branch 'master' into openid

Conflicts:
app/controllers/user_controller.rb
app/views/user/login.html.erb
public/stylesheets/common.css

10 years agoLocalisation updates from http://translatewiki.net.
Siebrand Mazeland [Thu, 3 Feb 2011 00:16:13 +0000 (01:16 +0100)]
Localisation updates from translatewiki.net.

10 years agoUpdate Potlatch 2 to r25217 build
Tom Hughes [Wed, 2 Feb 2011 19:47:53 +0000 (19:47 +0000)]
Update Potlatch 2 to r25217 build

10 years agoInterpolation variables should not be translated...
Tom Hughes [Mon, 31 Jan 2011 11:06:02 +0000 (11:06 +0000)]
Interpolation variables should not be translated...

10 years agoAlready got -> already have
Andy Allan [Thu, 13 Jan 2011 14:28:09 +0000 (14:28 +0000)]
Already got -> already have

10 years agoUpdate Potlatch 2 to r25177 build
Tom Hughes [Sat, 29 Jan 2011 12:19:37 +0000 (12:19 +0000)]
Update Potlatch 2 to r25177 build

10 years agoUpdate Potlatch 2 to r25171 build
Tom Hughes [Fri, 28 Jan 2011 14:50:17 +0000 (14:50 +0000)]
Update Potlatch 2 to r25171 build

10 years agoLocalisation updates from http://translatewiki.net.
Siebrand Mazeland [Sat, 22 Jan 2011 19:02:20 +0000 (20:02 +0100)]
Localisation updates from translatewiki.net.

10 years agoImprove the Osmarender key
Patrick Kilian [Mon, 17 Jan 2011 10:16:52 +0000 (10:16 +0000)]
Improve the Osmarender key

10 years agoUpdate Potlatch 2 to r25074 build
Tom Hughes [Sun, 16 Jan 2011 17:33:18 +0000 (17:33 +0000)]
Update Potlatch 2 to r25074 build

10 years agoEscape remote control failed message
Tom Hughes [Sun, 16 Jan 2011 17:12:47 +0000 (17:12 +0000)]
Escape remote control failed message

10 years agoUse the normal rails asset tagging mechanisms for the SWF files
Tom Hughes [Fri, 14 Jan 2011 22:51:02 +0000 (22:51 +0000)]
Use the normal rails asset tagging mechanisms for the SWF files

10 years agoUpdate Potlatch 2 to r25050 build
Tom Hughes [Fri, 14 Jan 2011 15:09:20 +0000 (15:09 +0000)]
Update Potlatch 2 to r25050 build

10 years agoLocalisation updates from http://translatewiki.net.
Siebrand Mazeland [Fri, 14 Jan 2011 10:52:29 +0000 (11:52 +0100)]
Localisation updates from translatewiki.net.

10 years agoAdd a client access policy for Silverlight applications
Tom Hughes [Mon, 10 Jan 2011 17:27:52 +0000 (17:27 +0000)]
Add a client access policy for Silverlight applications

10 years agoUpdate Potlatch 2 to r24969 build
Tom Hughes [Tue, 4 Jan 2011 15:35:49 +0000 (15:35 +0000)]
Update Potlatch 2 to r24969 build

10 years agoUpdate Potlatch 2 to r24923 build
Tom Hughes [Fri, 31 Dec 2010 13:34:32 +0000 (13:34 +0000)]
Update Potlatch 2 to r24923 build

10 years agoClose the editor menu as soon as a choice is made
Tom Hughes [Wed, 22 Dec 2010 18:29:50 +0000 (18:29 +0000)]
Close the editor menu as soon as a choice is made

10 years agoUpdate Potlatch 2 to r24834 build
Tom Hughes [Wed, 22 Dec 2010 08:38:25 +0000 (08:38 +0000)]
Update Potlatch 2 to r24834 build

10 years agoDon't look any further for a location if we are given a bounding box
Tom Hughes [Wed, 22 Dec 2010 00:39:12 +0000 (00:39 +0000)]
Don't look any further for a location if we are given a bounding box

10 years agoChange the home zoom level to 15
Andy Allan [Tue, 21 Dec 2010 11:37:18 +0000 (11:37 +0000)]
Change the home zoom level to 15

10 years agoRework the login page to explain better what to do if you're new
Andy Allan [Tue, 21 Dec 2010 10:55:51 +0000 (10:55 +0000)]
Rework the login page to explain better what to do if you're new

10 years agoRound corners on content-area notice boxes
Andy Allan [Mon, 20 Dec 2010 16:27:03 +0000 (16:27 +0000)]
Round corners on content-area notice boxes

10 years agoReduce left and right padding for the "Go" button
Jonas Krückel [Mon, 20 Dec 2010 20:08:51 +0000 (21:08 +0100)]
Reduce left and right padding for the "Go" button

Firefox keeps the text on a button centered if it overflows the content
area but Webkit keeps the left edge fixed and pushes all the overflow to
the right so reducing the padding improves the look in Webkit when the
text is too long.

10 years agoMake capitalisation of menu entries consistent
Tom Hughes [Mon, 20 Dec 2010 18:28:13 +0000 (18:28 +0000)]
Make capitalisation of menu entries consistent

10 years agoRemove unused language resources
Tom Hughes [Mon, 20 Dec 2010 18:24:53 +0000 (18:24 +0000)]
Remove unused language resources

10 years agoSplit the help and wiki into two links - help centre and documentation
Andy Allan [Mon, 20 Dec 2010 15:18:18 +0000 (15:18 +0000)]
Split the help and wiki into two links - help centre and documentation

10 years agolink to the foundation
Andy Allan [Mon, 20 Dec 2010 15:10:45 +0000 (15:10 +0000)]
link to the foundation

10 years agoRemove link to the shop - it's not a very big part of openstreetmap
Andy Allan [Mon, 20 Dec 2010 15:07:21 +0000 (15:07 +0000)]
Remove link to the shop - it's not a very big part of openstreetmap

10 years agoNews blog -> Community blogs
Andy Allan [Mon, 20 Dec 2010 15:05:47 +0000 (15:05 +0000)]
News blog -> Community blogs

I suspect the text came from pointing at opengeodata.org in a bygone era.

10 years agoUse a list for the main menu, rather than br-separated links
Andy Allan [Mon, 20 Dec 2010 14:50:15 +0000 (14:50 +0000)]
Use a list for the main menu, rather than br-separated links

10 years agoPadding / margin updates for the introduction sidebar panel
Andy Allan [Mon, 20 Dec 2010 14:47:31 +0000 (14:47 +0000)]
Padding / margin updates for the introduction sidebar panel

10 years agoOnly shut down the current process when the memory limit is reached
Tom Hughes [Sun, 19 Dec 2010 00:15:24 +0000 (00:15 +0000)]
Only shut down the current process when the memory limit is reached

Contrary to what the ruby documentation says, sending a signal
to PID 0 actually signals the whole process group, not just the
current process. So use Process.pid to make sure we only signal
the current process.

10 years agoAdded tabindex="1" for search input on the main side
Philipp Borgers [Sat, 18 Dec 2010 17:08:33 +0000 (18:08 +0100)]
Added tabindex="1" for search input on the main side

10 years agoRestore the transitionEffect on the OpenStreetMap layers
Tom Hughes [Sat, 18 Dec 2010 14:50:07 +0000 (14:50 +0000)]
Restore the transitionEffect on the OpenStreetMap layers

The OSM map layers used to have transitionEffect set but it was
accidentally lost during the OL 2.8 upgrade.

10 years agoUpdate Potlatch 2 to r24796 build
Tom Hughes [Sat, 18 Dec 2010 11:49:57 +0000 (11:49 +0000)]
Update Potlatch 2 to r24796 build

10 years agoRounded corners baby
Andy Allan [Fri, 17 Dec 2010 17:28:27 +0000 (17:28 +0000)]
Rounded corners baby

10 years agoMake the search box 17% longer, yay!
Andy Allan [Fri, 17 Dec 2010 17:27:56 +0000 (17:27 +0000)]
Make the search box 17% longer, yay!

10 years agoReduce the margins on the sidebar
Andy Allan [Fri, 17 Dec 2010 17:12:29 +0000 (17:12 +0000)]
Reduce the margins on the sidebar

10 years agoShow the latest changeset for each of the contacts on the user page
Andy Allan [Fri, 17 Dec 2010 13:36:53 +0000 (13:36 +0000)]
Show the latest changeset for each of the contacts on the user page

10 years agoUse configuration variables for limiting nearby users, and bump the number to 30
Andy Allan [Fri, 17 Dec 2010 13:18:26 +0000 (13:18 +0000)]
Use configuration variables for limiting nearby users, and bump the number to 30

10 years agoFix the popup image - was updated in OL 2.10 release with a new size
Andy Allan [Thu, 16 Dec 2010 19:09:11 +0000 (19:09 +0000)]
Fix the popup image - was updated in OL 2.10 release with a new size

10 years agoLocalisation updates from http://translatewiki.net.
Siebrand Mazeland [Thu, 16 Dec 2010 15:25:34 +0000 (16:25 +0100)]
Localisation updates from translatewiki.net.

10 years agoUpdate Potlatch 2 to r24750 build
Tom Hughes [Tue, 14 Dec 2010 21:21:42 +0000 (21:21 +0000)]
Update Potlatch 2 to r24750 build

10 years agoAdd support for the tileurl parameter to Potlatch 2
Tom Hughes [Tue, 14 Dec 2010 21:19:08 +0000 (21:19 +0000)]
Add support for the tileurl parameter to Potlatch 2

10 years agoRequire i18n 0.4.1 specifically as some later versions don't work
Tom Hughes [Tue, 14 Dec 2010 21:14:42 +0000 (21:14 +0000)]
Require i18n 0.4.1 specifically as some later versions don't work

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

10 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

10 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

10 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

10 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

10 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

10 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

10 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

10 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

10 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

11 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

11 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

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

11 years agoStart the rots server if it isn't already running
Kai Krueger [Mon, 6 Dec 2010 00:38:42 +0000 (00:38 +0000)]
Start the rots server if it isn't already running

11 years agoDisable logging when --silent is used
Kai Krueger [Sun, 5 Dec 2010 16:20:59 +0000 (16:20 +0000)]
Disable logging when --silent is used

11 years agoMerge branch 'master' into openid
Tom Hughes [Sun, 5 Dec 2010 15:15:55 +0000 (15:15 +0000)]
Merge branch 'master' into openid

Conflicts:
app/controllers/user_controller.rb

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

11 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

11 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

11 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

11 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

11 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

11 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

11 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

11 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

11 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

11 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

11 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

11 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

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

11 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

11 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

11 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

11 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

11 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

11 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

11 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

11 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

11 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

11 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

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

11 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

11 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

11 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

11 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

11 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

11 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

11 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

11 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

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

11 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

11 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

11 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