]> git.openstreetmap.org Git - rails.git/log
rails.git
13 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

13 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

13 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

13 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

13 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

13 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

13 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

13 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

13 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

13 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

13 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

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

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

13 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

13 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

13 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

13 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

13 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

13 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

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

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

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

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

13 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

13 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

13 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

13 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

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

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

13 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

13 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

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

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

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

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

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

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.