]> git.openstreetmap.org Git - rails.git/log
rails.git
13 years agoDon't allow libxml 2.0.0 and later to be used
Tom Hughes [Wed, 11 May 2011 22:06:19 +0000 (23:06 +0100)]
Don't allow libxml 2.0.0 and later to be used

13 years agoSimplify URL scheme name matching in OAuth callback URLs a little
Tom Hughes [Wed, 11 May 2011 21:21:58 +0000 (22:21 +0100)]
Simplify URL scheme name matching in OAuth callback URLs a little

13 years agoAllow any valid (per RFC 3986) scheme name in OAuth callback URLs
Mendhak [Sat, 23 Apr 2011 09:29:49 +0000 (10:29 +0100)]
Allow any valid (per RFC 3986) scheme name in OAuth callback URLs

Changed the callback_url regex so that you can have custom schemes such
as myapp: or my-lovely-app: instead of just http and https. This should
help with mobile development where users can authorize with OSM in their
browser and are automatically redirected to the registered app.

13 years agoFix a few minor issues in the print stylesheet
Tom Hughes [Tue, 10 May 2011 11:24:16 +0000 (12:24 +0100)]
Fix a few minor issues in the print stylesheet

Stop the mobile header appearing, and set the size of the attribution.

13 years agoMake sure the ruby quadtile code give the same result as the C version
Tom Hughes [Sun, 8 May 2011 14:18:03 +0000 (15:18 +0100)]
Make sure the ruby quadtile code give the same result as the C version

13 years agoUpdate the rss feed logo, to use the new logo.
Shaun McDonald [Sat, 7 May 2011 22:42:13 +0000 (23:42 +0100)]
Update the rss feed logo, to use the new logo.

13 years agoAdd the .DS_Store file to the gitignore (often added by default).
Shaun McDonald [Sat, 7 May 2011 22:41:27 +0000 (23:41 +0100)]
Add the .DS_Store file to the gitignore (often added by default).

13 years agoMake the edit action default to z17
Tom Hughes [Fri, 6 May 2011 23:05:49 +0000 (00:05 +0100)]
Make the edit action default to z17

If an attempt is made to invoke an editor without specifying a zoom
level (as with the GPX edit links) then default to z17 instead of z14
to avoid trying to load too much data. Fixes #3728.

13 years agoSet a minimum height for the changeset list map
Tom Hughes [Fri, 6 May 2011 15:47:43 +0000 (16:47 +0100)]
Set a minimum height for the changeset list map

13 years agoFix unclosed list. Spotted by Mormegil.
Siebrand Mazeland [Fri, 6 May 2011 15:08:24 +0000 (17:08 +0200)]
Fix unclosed list. Spotted by Mormegil.

13 years agoLocalisation updates from http://translatewiki.net.
Siebrand Mazeland [Thu, 5 May 2011 21:22:14 +0000 (23:22 +0200)]
Localisation updates from http://translatewiki.net.

13 years agoUse "Deleted at/by" instead of "Edited at/by" for deletes
Tom Hughes [Thu, 5 May 2011 18:50:57 +0000 (19:50 +0100)]
Use "Deleted at/by" instead of "Edited at/by" for deletes

13 years agoRemove tags from deleted nodes
Tom Hughes [Thu, 5 May 2011 18:44:59 +0000 (19:44 +0100)]
Remove tags from deleted nodes

When ways or relations are deleted we remove their tags and there
is no reason why nodes should be different.

13 years agoDon't show the "Nodes" heading for a way with no nodes
Tom Hughes [Thu, 5 May 2011 18:42:18 +0000 (19:42 +0100)]
Don't show the "Nodes" heading for a way with no nodes

13 years agoDon't allow headings in the data browser to be split
Tom Hughes [Thu, 5 May 2011 18:29:46 +0000 (19:29 +0100)]
Don't allow headings in the data browser to be split

13 years agoImprove highlighting of changesets in the changeset list
Tom Hughes [Thu, 5 May 2011 17:58:05 +0000 (18:58 +0100)]
Improve highlighting of changesets in the changeset list

13 years agoRearrange changeset list page to put the map beside the list
Tom Hughes [Sun, 1 May 2011 23:53:37 +0000 (00:53 +0100)]
Rearrange changeset list page to put the map beside the list

13 years agoTidy up code for adding a map to the changeset list page
Tom Hughes [Sun, 1 May 2011 21:52:58 +0000 (22:52 +0100)]
Tidy up code for adding a map to the changeset list page

13 years agoAdd a map to the changeset list page
Mikel Maron [Sat, 30 Apr 2011 20:07:47 +0000 (15:07 -0500)]
Add a map to the changeset list page

Add a map to the changeset list page, with a bounding box for each
changeset and highighting when the mouse is placed over either a box
on the map or a row of the table.

13 years agoRemove unused style rule
Tom Hughes [Sun, 1 May 2011 21:53:47 +0000 (22:53 +0100)]
Remove unused style rule

13 years agoChange the test for whether the CTs have been seen to use the
Matt Amos [Sun, 1 May 2011 01:34:38 +0000 (02:34 +0100)]
Change the test for whether the CTs have been seen to use the
user preferences API call rather than user details, as that one
is no longer blocked.

13 years agoRemoved duplicate require_terms_seen definition
Tom Hughes [Fri, 29 Apr 2011 21:59:39 +0000 (22:59 +0100)]
Removed duplicate require_terms_seen definition

13 years agoRename SVG version of logo to match PNG logo name
Tom Hughes [Fri, 29 Apr 2011 20:28:48 +0000 (21:28 +0100)]
Rename SVG version of logo to match PNG logo name

13 years agoUpdate to softer logo
Steve Coast [Fri, 29 Apr 2011 19:28:47 +0000 (12:28 -0700)]
Update to softer logo

13 years agoAdd config file entry for memcache server list
Tom Hughes [Fri, 29 Apr 2011 20:23:58 +0000 (21:23 +0100)]
Add config file entry for memcache server list

13 years agoUpdate Potlatch 2 to 2.0-16-g106bbd1 build
Tom Hughes [Thu, 28 Apr 2011 22:05:11 +0000 (23:05 +0100)]
Update Potlatch 2 to 2.0-16-g106bbd1 build

13 years agoRename incorrectly named file.
Siebrand Mazeland [Tue, 26 Apr 2011 06:52:50 +0000 (08:52 +0200)]
Rename incorrectly named file.

13 years agoRemove incorrect language file.
Siebrand Mazeland [Tue, 26 Apr 2011 06:50:23 +0000 (08:50 +0200)]
Remove incorrect language file.

13 years agoAllow user details to be fetched without agreeing terms
Tom Hughes [Wed, 20 Apr 2011 19:57:01 +0000 (20:57 +0100)]
Allow user details to be fetched without agreeing terms

13 years agoLocalisation updates from http://translatewiki.net.
Siebrand Mazeland [Wed, 20 Apr 2011 07:58:59 +0000 (09:58 +0200)]
Localisation updates from http://translatewiki.net.

13 years agoAdd credit to Direction Générale des Impôts for French data
Tom Hughes [Mon, 18 Apr 2011 23:29:17 +0000 (00:29 +0100)]
Add credit to Direction Générale des Impôts for French data

13 years agoRevert "Allow user details to be fetched without agreeing terms"
Tom Hughes [Mon, 18 Apr 2011 22:04:42 +0000 (23:04 +0100)]
Revert "Allow user details to be fetched without agreeing terms"

This reverts commit ddd12b03e1e7e1a674350a1eb98d90a2155df26d.

13 years agoAllow user details to be fetched without agreeing terms
Tom Hughes [Mon, 18 Apr 2011 21:23:48 +0000 (22:23 +0100)]
Allow user details to be fetched without agreeing terms

13 years agoUpdate Potlatch 2 to 2.0-14-gc925264 build
Tom Hughes [Mon, 18 Apr 2011 11:49:36 +0000 (12:49 +0100)]
Update Potlatch 2 to 2.0-14-gc925264 build

13 years agoDon't require terms to be agreed when logging out
Tom Hughes [Mon, 18 Apr 2011 08:04:57 +0000 (09:04 +0100)]
Don't require terms to be agreed when logging out

13 years agoAdded flash notice for CTs decline
Matt Amos [Sun, 17 Apr 2011 23:03:39 +0000 (00:03 +0100)]
Added flash notice for CTs decline

Also ensured that CTs are either accepted or declined and cannot
be inadvertently bypassed.

13 years agoUse report_error so Potlatch can see the errors
Tom Hughes [Sun, 17 Apr 2011 20:45:04 +0000 (21:45 +0100)]
Use report_error so Potlatch can see the errors

13 years agoMake sure "please read the terms" error is issued in the right language
Tom Hughes [Sun, 17 Apr 2011 19:33:49 +0000 (20:33 +0100)]
Make sure "please read the terms" error is issued in the right language

13 years agoAdd memcache support
Tom Hughes [Sun, 17 Apr 2011 17:56:50 +0000 (18:56 +0100)]
Add memcache support

13 years agoRenumbered sections to be more consistent with subsection numbering style
Matt Amos [Wed, 13 Apr 2011 08:29:55 +0000 (09:29 +0100)]
Renumbered sections to be more consistent with subsection numbering style

13 years agoReformatting contributor terms box based on suggestions by Tom
Matt Amos [Sun, 10 Apr 2011 23:31:01 +0000 (00:31 +0100)]
Reformatting contributor terms box based on suggestions by Tom

13 years agoUpdated French and UK terms to 1.2.4
Matt Amos [Sun, 10 Apr 2011 22:40:19 +0000 (23:40 +0100)]
Updated French and UK terms to 1.2.4

13 years agoLocalisation updates from http://translatewiki.net.
Siebrand Mazeland [Mon, 11 Apr 2011 12:49:51 +0000 (14:49 +0200)]
Localisation updates from http://translatewiki.net.

13 years agoUpdate Potlatch 2 to 2.0-10-g07a59e4 build
Tom Hughes [Fri, 8 Apr 2011 19:03:39 +0000 (20:03 +0100)]
Update Potlatch 2 to 2.0-10-g07a59e4 build

13 years agoLocalisation updates from http://translatewiki.net
Siebrand Mazeland [Thu, 7 Apr 2011 11:52:04 +0000 (13:52 +0200)]
Localisation updates from http://translatewiki.net

13 years agoDon't use the en_US locale for Potlatch 2 as it doesn't work
Tom Hughes [Thu, 7 Apr 2011 10:16:23 +0000 (11:16 +0100)]
Don't use the en_US locale for Potlatch 2 as it doesn't work

13 years agoMake Potlatch 2 default to the en locale if there is nothing better
Tom Hughes [Wed, 6 Apr 2011 20:42:03 +0000 (21:42 +0100)]
Make Potlatch 2 default to the en locale if there is nothing better

13 years agoUpdate Potlatch 2 to 2.0-6-g929356f build
Tom Hughes [Wed, 6 Apr 2011 20:26:18 +0000 (21:26 +0100)]
Update Potlatch 2 to 2.0-6-g929356f build

13 years agoTell Potlatch 2 which locale to use
Tom Hughes [Wed, 6 Apr 2011 20:22:47 +0000 (21:22 +0100)]
Tell Potlatch 2 which locale to use

13 years agoSwitch to i18n version 0.5.0 but keep old style interpolation
Tom Hughes [Wed, 6 Apr 2011 19:21:37 +0000 (20:21 +0100)]
Switch to i18n version 0.5.0 but keep old style interpolation

It's impossible to stop rails 2 loading a newer i18n gem if it is
installed, so go with the flow and use the latest one but override
the interpolation pattern for now.

13 years agoImprove recognition of OAuth referers for triggering of slim mode
Tom Hughes [Wed, 6 Apr 2011 12:24:08 +0000 (13:24 +0100)]
Improve recognition of OAuth referers for triggering of slim mode

13 years agoUpdate Potlatch 2 to 2.0-5-gabe766c build
Tom Hughes [Tue, 5 Apr 2011 09:12:23 +0000 (10:12 +0100)]
Update Potlatch 2 to 2.0-5-gabe766c build

13 years agoChanged button text to match http://stateofthemap.org banner heading.
Matt Amos [Mon, 4 Apr 2011 23:46:48 +0000 (00:46 +0100)]
Changed button text to match http://stateofthemap.org banner heading.

13 years agoTry and patch up poor browser language selections
Tom Hughes [Mon, 4 Apr 2011 21:44:43 +0000 (22:44 +0100)]
Try and patch up poor browser language selections

The HTTP RFC says that a language range specified by a browser only
matches a resource whose language tag is the same, or longer. This
means that a browser language range of de-DE will not match a resource
with a language tag of de.

Because of this browsers should always send the generic range, such
as de, as a secondary choice after a more specific range like de-DE.

Some browers don't this however, so if we don't get a language match
we try and patch up the list of language ranges by inserting the
more generic ranges.

13 years agoUpdate Potlatch 2 to 2.0-4-g7d1d145 build
Tom Hughes [Mon, 4 Apr 2011 11:52:53 +0000 (12:52 +0100)]
Update Potlatch 2 to 2.0-4-g7d1d145 build

13 years agoSpell adapter correctly
Tom Hughes [Sun, 3 Apr 2011 17:22:22 +0000 (18:22 +0100)]
Spell adapter correctly

13 years agoFixing the user settings page for mobile use
Dan Karran [Sun, 3 Apr 2011 16:50:31 +0000 (17:50 +0100)]
Fixing the user settings page for mobile use

Also add a quick workaround for the occasions when the top right
links overlap the logo and site name. We'll need a better fix for
this in the longer run.

13 years agoTrigger mobile mode at 640px instead of 480px for iPhone 4 support
Tom Hughes [Sun, 3 Apr 2011 17:02:27 +0000 (18:02 +0100)]
Trigger mobile mode at 640px instead of 480px for iPhone 4 support

13 years agoMonkey patch postgres adapter for postgres 9 support
Tom Hughes [Sun, 3 Apr 2011 16:39:06 +0000 (17:39 +0100)]
Monkey patch postgres adapter for postgres 9 support

13 years agoUpdate Potlatch 2 to 2.0-2-g954c74a build
Tom Hughes [Sun, 3 Apr 2011 16:13:24 +0000 (17:13 +0100)]
Update Potlatch 2 to 2.0-2-g954c74a build

13 years agoMake the changeset browser more mobile friendly
Dan Karran [Sun, 3 Apr 2011 15:45:42 +0000 (16:45 +0100)]
Make the changeset browser more mobile friendly

Floating some of the cells in the changeset browser onto the following
line should mean we don't need to scroll horizontally through that table.

13 years agoMaking more of the site smartphone friendly
Dan Karran [Sun, 3 Apr 2011 15:08:21 +0000 (16:08 +0100)]
Making more of the site smartphone friendly

For example limiting field widths to 100%, extending other elements
to full width, etc.

13 years agoLink from a diary entry to the relevant user's diary
Tom Hughes [Sun, 3 Apr 2011 15:11:20 +0000 (16:11 +0100)]
Link from a diary entry to the relevant user's diary

Fix #2956 by making the title on a diary entry a link back to the
diary list page for the author.

13 years agoFixup the user map code to match existing code style
Tom Hughes [Sun, 3 Apr 2011 15:00:06 +0000 (16:00 +0100)]
Fixup the user map code to match existing code style

13 years agofixes http://trac.openstreetmap.org/ticket/3645 . Can now pass in show_other_users...
Harry Wood [Sun, 3 Apr 2011 14:24:09 +0000 (15:24 +0100)]
fixes http://trac.openstreetmap.org/ticket/3645 . Can now pass in show_other_users and setting_location to the map partial

13 years agoReport a friendly(ish) error if no OAauth key is set for Potlatch 2
Tom Hughes [Sun, 3 Apr 2011 14:40:05 +0000 (15:40 +0100)]
Report a friendly(ish) error if no OAauth key is set for Potlatch 2

13 years agoAdd a smaller version of the site logo and title for small screens
Dan Karran [Sun, 3 Apr 2011 13:50:39 +0000 (14:50 +0100)]
Add a smaller version of the site logo and title for small screens

13 years agoTidy up the data browser javascript
Tom Hughes [Sun, 3 Apr 2011 13:59:43 +0000 (14:59 +0100)]
Tidy up the data browser javascript

13 years agoAdd 'hide areas' button to data view
Frederik Ramm [Sat, 1 May 2010 18:14:53 +0000 (20:14 +0200)]
Add 'hide areas' button to data view

13 years agoMake Potlatch 2 the default editor in the example configuration
Tom Hughes [Sun, 3 Apr 2011 13:40:51 +0000 (14:40 +0100)]
Make Potlatch 2 the default editor in the example configuration

13 years agoUpdate Potlatch 2 to 2.0 build
Tom Hughes [Sun, 3 Apr 2011 13:33:55 +0000 (14:33 +0100)]
Update Potlatch 2 to 2.0 build

13 years agoMake home location setting map default to the whole world
Harry Wood [Sat, 2 Apr 2011 17:53:37 +0000 (18:53 +0100)]
Make home location setting map default to the whole world

Defaulting to western europe doesn't seem very reasonable these
days as we have users all over the world now.

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