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

9 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

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

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

9 years agoUser an RJS template for the javascript response
Tom Hughes [Sun, 8 May 2011 23:30:06 +0000 (00:30 +0100)]
User an RJS template for the javascript response

9 years agoUse the right author name for bugs in RSS format
Tom Hughes [Sun, 8 May 2011 17:01:59 +0000 (18:01 +0100)]
Use the right author name for bugs in RSS format

9 years agoAdd methods to get a bug's author details from the first comment
Tom Hughes [Sun, 8 May 2011 16:59:41 +0000 (17:59 +0100)]
Add methods to get a bug's author details from the first comment

9 years agoRename some columns and indexes in the bug tables
Tom Hughes [Sun, 8 May 2011 16:39:27 +0000 (17:39 +0100)]
Rename some columns and indexes in the bug tables

9 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

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

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

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

9 years agoUse quad tiling to select bugs in an area
Tom Hughes [Sun, 8 May 2011 13:57:56 +0000 (14:57 +0100)]
Use quad tiling to select bugs in an area

Remove the _no_quadtile versiond of the selection routines and switch
to using the ordinary ones but with a (large) limit applied on the size
of the area to prevent us spending ages working out the list of tiles
to be selected.

9 years agoAdd a C implementation of QuadTile.iterate_tiles_for_area
Tom Hughes [Sun, 8 May 2011 11:34:53 +0000 (12:34 +0100)]
Add a C implementation of QuadTile.iterate_tiles_for_area

9 years agoDon't add a geographic condition when fetching an RSS feed with no bbox
Tom Hughes [Sun, 8 May 2011 09:50:25 +0000 (10:50 +0100)]
Don't add a geographic condition when fetching an RSS feed with no bbox

9 years agoRename association between map_bugs and map_bug_comment to comments
Tom Hughes [Sat, 7 May 2011 23:22:32 +0000 (00:22 +0100)]
Rename association between map_bugs and map_bug_comment to comments

9 years agoPlace legacy routes after their replacements
Tom Hughes [Sat, 7 May 2011 17:07:32 +0000 (18:07 +0100)]
Place legacy routes after their replacements

9 years agoAlways get the bug commenter name from the user if there is one
Tom Hughes [Sat, 7 May 2011 16:47:05 +0000 (17:47 +0100)]
Always get the bug commenter name from the user if there is one

9 years agoDetabify and tidy up some more of the bugs code
Tom Hughes [Sat, 7 May 2011 16:36:57 +0000 (17:36 +0100)]
Detabify and tidy up some more of the bugs code

9 years agoMerge the gpx_bugs action into the main get_bugs action
Tom Hughes [Sat, 7 May 2011 16:21:38 +0000 (17:21 +0100)]
Merge the gpx_bugs action into the main get_bugs action

9 years agoGet returning of bugs as GPX files working
Tom Hughes [Sat, 7 May 2011 13:53:30 +0000 (14:53 +0100)]
Get returning of bugs as GPX files working

9 years agoFactor out common code into partials
Tom Hughes [Sat, 7 May 2011 13:44:48 +0000 (14:44 +0100)]
Factor out common code into partials

9 years agoDetabify and tidy up some more of the bugs code
Tom Hughes [Sat, 7 May 2011 12:18:42 +0000 (13:18 +0100)]
Detabify and tidy up some more of the bugs code

9 years agoSwitch back to using the local OL build as it seems to work fine
Tom Hughes [Sat, 7 May 2011 11:57:37 +0000 (12:57 +0100)]
Switch back to using the local OL build as it seems to work fine

9 years agoTidy up some of the map bugs code
Tom Hughes [Sat, 7 May 2011 11:49:38 +0000 (12:49 +0100)]
Tidy up some of the map bugs code

9 years agoMerge branch 'master' into openstreetbugs
Tom Hughes [Fri, 6 May 2011 21:56:47 +0000 (22:56 +0100)]
Merge branch 'master' into openstreetbugs

9 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

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

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

9 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

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

9 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

9 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

9 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

9 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

9 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

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

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

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

9 years agoDon't require a second click to create an OpenStreetBug
Kai Krueger [Sat, 30 Apr 2011 05:15:57 +0000 (23:15 -0600)]
Don't require a second click to create an OpenStreetBug

9 years agoMerge branch 'master' of git://git.openstreetmap.org/rails into openstreetbugs2
Kai Krueger [Sat, 30 Apr 2011 02:52:59 +0000 (20:52 -0600)]
Merge branch 'master' of git://git.openstreetmap.org/rails into openstreetbugs2

9 years agoMerge branch 'openstreetbugs' of git://git.openstreetmap.org/rails into openstreetbugs2
Kai Krueger [Sat, 30 Apr 2011 02:49:38 +0000 (20:49 -0600)]
Merge branch 'openstreetbugs' of git://git.openstreetmap.org/rails into openstreetbugs2

9 years agoDon't enable OSB layer by default
Kai Krueger [Sat, 30 Apr 2011 02:42:26 +0000 (20:42 -0600)]
Don't enable OSB layer by default

9 years agoIncrease font-size of the "report a problem" link
Kai Krueger [Sat, 30 Apr 2011 02:38:32 +0000 (20:38 -0600)]
Increase font-size of the "report a problem" link

9 years agoMake the bug popups look a little nicer
Kai Krueger [Sat, 30 Apr 2011 02:37:51 +0000 (20:37 -0600)]
Make the bug popups look a little nicer

9 years agoOnly show "Report a problem" link at zoom level 12 and higher
Kai Krueger [Sat, 30 Apr 2011 01:55:29 +0000 (19:55 -0600)]
Only show "Report a problem" link at zoom level 12 and higher

9 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

9 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

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

9 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

9 years agoMerge remote-tracking branch 'apmon/openstreetbugs2' into openstreetbugs
Tom Hughes [Fri, 29 Apr 2011 16:06:10 +0000 (17:06 +0100)]
Merge remote-tracking branch 'apmon/openstreetbugs2' into openstreetbugs

9 years agoMerge branch 'master' into openstreetbugs
Tom Hughes [Fri, 29 Apr 2011 16:05:59 +0000 (17:05 +0100)]
Merge branch 'master' into openstreetbugs

9 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

9 years agoSend notification emails when someone comments on a map bug report
Kai Krueger [Wed, 27 Apr 2011 18:01:52 +0000 (12:01 -0600)]
Send notification emails when someone comments on a map bug report

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

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

9 years agoAdd a note that the OSB client side js library has been adapted from the original
Kai Krueger [Fri, 22 Apr 2011 17:20:10 +0000 (11:20 -0600)]
Add a note that the OSB client side js library has been adapted from the original

9 years agoUpdate OSB internationalisation to match the rails_port way
Kai Krueger [Fri, 22 Apr 2011 17:17:32 +0000 (11:17 -0600)]
Update OSB internationalisation to match the rails_port way

9 years agoDeactivate OSB controller immediately after clicking a new bug
Kai Krueger [Fri, 22 Apr 2011 16:07:36 +0000 (10:07 -0600)]
Deactivate OSB controller immediately after clicking a new bug

9 years agoForgott to copy over an image from openstreetbugs.schokokeks.org
Kai Krueger [Fri, 22 Apr 2011 16:06:33 +0000 (10:06 -0600)]
Forgott to copy over an image from openstreetbugs.schokokeks.org

9 years agoRemove references to old server location
Kai Krueger [Fri, 22 Apr 2011 15:47:25 +0000 (09:47 -0600)]
Remove references to old server location

9 years agoLink the openstreetbugs browse pages
Kai Krueger [Fri, 22 Apr 2011 15:41:10 +0000 (09:41 -0600)]
Link the openstreetbugs browse pages

9 years agoGrey out username text field for bugs when logged in.
Kai Krueger [Thu, 21 Apr 2011 15:05:44 +0000 (09:05 -0600)]
Grey out username text field for bugs when logged in.

9 years agoChange bug comment to a textarea to make it easier to input longer comments
Kai Krueger [Thu, 21 Apr 2011 14:16:53 +0000 (08:16 -0600)]
Change bug comment to a textarea to make it easier to input longer comments

9 years agoUse local files rather than remote ones for osb images
Kai Krueger [Thu, 21 Apr 2011 14:01:23 +0000 (08:01 -0600)]
Use local files rather than remote ones for osb images

9 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

9 years agoMerge remote-tracking branch 'apmon/openstreetbugs2' into openstreetbugs
Tom Hughes [Wed, 20 Apr 2011 18:24:54 +0000 (19:24 +0100)]
Merge remote-tracking branch 'apmon/openstreetbugs2' into openstreetbugs

9 years agoMerge branch 'master' into openstreetbugs
Tom Hughes [Wed, 20 Apr 2011 18:23:39 +0000 (19:23 +0100)]
Merge branch 'master' into openstreetbugs

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

9 years agousers.visible has changed to users.status
Kai Krueger [Wed, 20 Apr 2011 05:59:50 +0000 (23:59 -0600)]
users.visible has changed to users.status

9 years agoMinor fix to updated OpenLayers
Kai Krueger [Wed, 20 Apr 2011 04:49:10 +0000 (22:49 -0600)]
Minor fix to updated OpenLayers

9 years agoMerge branch 'master' into openstreetbugs2
Kai Krueger [Wed, 20 Apr 2011 04:00:30 +0000 (22:00 -0600)]
Merge branch 'master' into openstreetbugs2

9 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

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

9 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

9 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

9 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

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

9 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

9 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

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

9 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

9 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

9 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

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

9 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

9 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

9 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

9 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

9 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

9 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

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

9 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

9 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

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

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

9 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

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

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

9 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