]> git.openstreetmap.org Git - rails.git/log
rails.git
13 years agoPreserve the referer at the end of account creation
Tom Hughes [Sun, 3 Apr 2011 10:22:39 +0000 (11:22 +0100)]
Preserve the referer at the end of account creation

13 years agoOnly show login/signup in slim mode when used from oauth
Tom Hughes [Sun, 3 Apr 2011 10:16:57 +0000 (11:16 +0100)]
Only show login/signup in slim mode when used from oauth

13 years agoMake CTs full width in slim mode
Tom Hughes [Sun, 3 Apr 2011 09:52:59 +0000 (10:52 +0100)]
Make CTs full width in slim mode

13 years agoFactor out comment code from layouts into partials
Tom Hughes [Sun, 3 Apr 2011 09:27:08 +0000 (10:27 +0100)]
Factor out comment code from layouts into partials

13 years agoTweaks to the contributor terms styling
Andy Allan [Mon, 21 Mar 2011 16:29:30 +0000 (16:29 +0000)]
Tweaks to the contributor terms styling

The 60% trick doesn't work now that the terms are what defines the height (rather than the sidebar). Also, add a margin to bring the floating buttons within range of the slim container.

13 years agoNo longer needed, and messes up the login page
Andy Allan [Mon, 21 Mar 2011 16:23:53 +0000 (16:23 +0000)]
No longer needed, and messes up the login page

13 years agoChange around how this works - the container adjusts to the right height, and it...
Andy Allan [Mon, 21 Mar 2011 16:21:55 +0000 (16:21 +0000)]
Change around how this works - the container adjusts to the right height, and it's the (fixed-size) header that's absolute positioned instead of the content

13 years agoUse slim layout for OAuth pages too
Andy Allan [Mon, 21 Mar 2011 16:18:17 +0000 (16:18 +0000)]
Use slim layout for OAuth pages too

13 years agoAdd a grey box around login dialog
Andy Allan [Wed, 16 Feb 2011 17:13:14 +0000 (17:13 +0000)]
Add a grey box around login dialog

13 years agoNew version of slim layout with grey background and centered, auto-adjusting page
Andy Allan [Wed, 16 Feb 2011 17:12:48 +0000 (17:12 +0000)]
New version of slim layout with grey background and centered, auto-adjusting page

13 years agoAnother approach, but this time without scattering stuff all over the methods
Andy Allan [Thu, 27 Jan 2011 17:55:36 +0000 (17:55 +0000)]
Another approach, but this time without scattering stuff all over the methods

13 years agoAh, that doesn't work due to 'bugs' in the way layouts work - only the last command...
Andy Allan [Thu, 27 Jan 2011 17:28:25 +0000 (17:28 +0000)]
Ah, that doesn't work due to 'bugs' in the way layouts work - only the last command has any effect

13 years agoUse the slim layout on the login page
Andy Allan [Thu, 27 Jan 2011 14:53:59 +0000 (14:53 +0000)]
Use the slim layout on the login page

13 years agoTry a different approach - grab the layout and stylesheet from slim1, and ditch the...
Andy Allan [Thu, 27 Jan 2011 14:53:39 +0000 (14:53 +0000)]
Try a different approach - grab the layout and stylesheet from slim1, and ditch the rest

13 years agoDon't display deleted marker for nodes
Tom Hughes [Sun, 3 Apr 2011 09:01:23 +0000 (10:01 +0100)]
Don't display deleted marker for nodes

13 years agoShow the position of a deleted node in browse mode
Frederik Ramm [Sat, 2 Apr 2011 14:58:44 +0000 (16:58 +0200)]
Show the position of a deleted node in browse mode

13 years agoMake sure the user is redirect correctly after seeing the terms
Tom Hughes [Sat, 2 Apr 2011 16:41:14 +0000 (17:41 +0100)]
Make sure the user is redirect correctly after seeing the terms

13 years agoDefault REQUIRE_TERMS_SEEN to false for now
Tom Hughes [Sat, 2 Apr 2011 15:40:51 +0000 (16:40 +0100)]
Default REQUIRE_TERMS_SEEN to false for now

13 years agoDon't run the user terms tests unless REQUIRE_TERMS_SEEN is set
Tom Hughes [Sat, 2 Apr 2011 15:35:20 +0000 (16:35 +0100)]
Don't run the user terms tests unless REQUIRE_TERMS_SEEN is set

13 years agoTidy up a few things
Tom Hughes [Sat, 2 Apr 2011 15:20:29 +0000 (16:20 +0100)]
Tidy up a few things

13 years agoMove SOTM advert above the optionals
Tom Hughes [Sat, 2 Apr 2011 15:00:32 +0000 (16:00 +0100)]
Move SOTM advert above the optionals

13 years agoPhase 2 CTs implementation and tests, with config parameter
Matt Amos [Tue, 22 Mar 2011 10:26:10 +0000 (10:26 +0000)]
Phase 2 CTs implementation and tests, with config parameter

13 years agoAdded SOTM 2011 banner to the side bar
Matt Amos [Fri, 1 Apr 2011 09:03:00 +0000 (10:03 +0100)]
Added SOTM 2011 banner to the side bar

13 years agoMake diary locations into a link and drop the separate view link
Tom Hughes [Sat, 2 Apr 2011 14:48:56 +0000 (15:48 +0100)]
Make diary locations into a link and drop the separate view link

13 years agoRemove edit links from geo-located diary entries
Harry Wood [Sat, 2 Apr 2011 14:26:37 +0000 (15:26 +0100)]
Remove edit links from geo-located diary entries

Jumping straight into the editor from a diary entry is not a
particularly useful thing to do. Fixes trac ticket #3626.

13 years agoAdd a marker to the edit tab to indicate that it has a menu
Tom Hughes [Sat, 2 Apr 2011 14:40:12 +0000 (15:40 +0100)]
Add a marker to the edit tab to indicate that it has a menu

13 years agoRebuild OpenLayers with patch for OpenLayers ticket #2848
Tom Hughes [Fri, 1 Apr 2011 07:50:31 +0000 (08:50 +0100)]
Rebuild OpenLayers with patch for OpenLayers ticket #2848

OpenStreetMap ticket #3399 reports than the transition effects are
not working properly on the map - brining in this upstream patch is
an attempt to fix that.

13 years agoUpdate Potlatch 2 to 0.5-295-g3fdb3c2 build
Tom Hughes [Tue, 29 Mar 2011 14:11:28 +0000 (15:11 +0100)]
Update Potlatch 2 to 0.5-295-g3fdb3c2 build

13 years agoUpdate Potlatch 2 to 0.5-294-g58c9d2c build
Tom Hughes [Tue, 29 Mar 2011 10:56:02 +0000 (11:56 +0100)]
Update Potlatch 2 to 0.5-294-g58c9d2c build

13 years agoHandle changesets with an empty string as the comment
Tom Hughes [Fri, 25 Mar 2011 22:51:39 +0000 (22:51 +0000)]
Handle changesets with an empty string as the comment

13 years agoUpdate Potlatch 2 to 0.5-293-g6780e5b build
Tom Hughes [Tue, 15 Mar 2011 14:38:22 +0000 (14:38 +0000)]
Update Potlatch 2 to 0.5-293-g6780e5b build

13 years agoFixed bug in changeset queries
Matt Amos [Tue, 15 Mar 2011 02:00:50 +0000 (02:00 +0000)]
Fixed bug in changeset queries

The 'or' condition needed to be bracketed within larger 'and' expression.

13 years agoUpdate Potlatch 2 to 0.5-291-g0c68ba6 build
Tom Hughes [Wed, 9 Mar 2011 14:52:51 +0000 (14:52 +0000)]
Update Potlatch 2 to 0.5-291-g0c68ba6 build

13 years agoUpdate Potlatch 2 to 0.5-289-g1aefc1d build
Tom Hughes [Wed, 9 Mar 2011 12:45:43 +0000 (12:45 +0000)]
Update Potlatch 2 to 0.5-289-g1aefc1d build

13 years agoUpdate Potlatch 2 to 0.5-288-ge6767fa build
Tom Hughes [Wed, 9 Mar 2011 11:34:17 +0000 (11:34 +0000)]
Update Potlatch 2 to 0.5-288-ge6767fa build

13 years agoUpdate Potlatch 2 to 0.5-288-g9cbfeb6 build
Tom Hughes [Tue, 8 Mar 2011 20:26:25 +0000 (20:26 +0000)]
Update Potlatch 2 to 0.5-288-g9cbfeb6 build

13 years agoLocalisation updates from http://translatewiki.net.
Siebrand Mazeland [Sun, 6 Mar 2011 12:15:58 +0000 (13:15 +0100)]
Localisation updates from http://translatewiki.net.

13 years agoLocalisation updates from http://translatewiki.net.
Siebrand Mazeland [Thu, 24 Feb 2011 11:28:42 +0000 (12:28 +0100)]
Localisation updates from http://translatewiki.net.

13 years agoLocalisation updates from http://translatewiki.net.
Siebrand Mazeland [Mon, 14 Feb 2011 18:35:23 +0000 (19:35 +0100)]
Localisation updates from http://translatewiki.net.

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

13 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

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

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

13 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

13 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

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

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

13 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

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

13 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

13 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

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

13 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

13 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

13 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

13 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

13 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

13 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

13 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

13 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

13 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

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

13 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

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

13 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

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

13 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

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

13 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

13 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

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

13 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

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

13 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

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

13 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!

13 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

13 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

13 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

13 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

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

13 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

13 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

13 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

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

13 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

13 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

13 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

13 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

13 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

13 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

13 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

13 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

13 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

13 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

13 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

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

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

13 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

13 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