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

8 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

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

8 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

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

8 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

8 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

8 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

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

8 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

8 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

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

8 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

8 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

8 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

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

8 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

8 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

8 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

8 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

8 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

8 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

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

8 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

8 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

8 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 stateofthemap.org banner heading.

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

8 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

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

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

8 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

8 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

8 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

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

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

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

8 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

8 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 trac.openstreetmap.org/ticket/3645 . Can now pass in show_other_users and setting_location to the map partial

8 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

8 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

8 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

8 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

8 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

8 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

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

8 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

8 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

8 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

8 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

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

8 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

8 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

8 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

8 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

8 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

8 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

8 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

8 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

8 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

8 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

8 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

8 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

8 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

8 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

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

8 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

8 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

8 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

8 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

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

8 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

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

8 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

8 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

8 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

8 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

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

8 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

8 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

8 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

8 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

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

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

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

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

9 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

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

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

9 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

9 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

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

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

9 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

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

9 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

9 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

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

9 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

9 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

9 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