]> git.openstreetmap.org Git - rails.git/log
rails.git
13 years agoTidy up the note controller
Tom Hughes [Sun, 22 May 2011 16:02:48 +0000 (17:02 +0100)]
Tidy up the note controller

Go through most of the note controller, tidying things up, fixing
a few bugs, and making sure we have tests for everything.

13 years agoUpdate tests for change in name from "map_bug" to "note" etc
Tom Hughes [Sun, 22 May 2011 11:40:56 +0000 (12:40 +0100)]
Update tests for change in name from "map_bug" to "note" etc

13 years agoTidy up the note_comment model a bit
Tom Hughes [Sun, 22 May 2011 10:49:48 +0000 (11:49 +0100)]
Tidy up the note_comment model a bit

13 years agoTidy up the note model a bit
Tom Hughes [Sun, 22 May 2011 10:33:49 +0000 (11:33 +0100)]
Tidy up the note model a bit

13 years agoMass rename of "bugs" as "notes" for increased user friendliness
Tom Hughes [Sat, 21 May 2011 16:22:31 +0000 (17:22 +0100)]
Mass rename of "bugs" as "notes" for increased user friendliness

13 years agoMerge branch 'master' into openstreetbugs
Tom Hughes [Sat, 21 May 2011 10:21:01 +0000 (11:21 +0100)]
Merge branch 'master' into openstreetbugs

Conflicts:
config/environment.rb

13 years agoMoved up search box to make it more visible
Mikel Maron [Wed, 18 May 2011 19:03:25 +0000 (14:03 -0500)]
Moved up search box to make it more visible

13 years agoMake sure unused layers are hidden
Tom Hughes [Sat, 21 May 2011 09:44:52 +0000 (10:44 +0100)]
Make sure unused layers are hidden

When parsing an old style layer configuration string, make sure any
layer which isn't active is marked as invisible so that we don't
include it when generating permalinks. Fixes #3773.

13 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

13 years agoRename a number of methods in the map_bugs controller
Tom Hughes [Tue, 17 May 2011 23:23:39 +0000 (00:23 +0100)]
Rename a number of methods in the map_bugs controller

13 years agoHandle large bounding box changesets better
Tom Hughes [Fri, 13 May 2011 16:27:12 +0000 (17:27 +0100)]
Handle large bounding box changesets better

If the bounding box of a changeset is much larger than the map then
there seem to be problems with OL not rendering the feature correctly
so reduce the highlight to just be the extent of the map plus a small
margin in that case.

13 years agoMake "all traces" and "your traces" links more consistent
Tom Hughes [Fri, 13 May 2011 09:06:16 +0000 (10:06 +0100)]
Make "all traces" and "your traces" links more consistent

Make sure we always show the "all traces" and "your traces" links
in the same place and that they don't accidentally inherit parameter
values that we don't really want.

Based on work by Andrzej Zaborowski <balrog@zabor.org>.

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

13 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

13 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

13 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

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

13 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

13 years agoUse a pessimistic version constraint for libxml
Tom Hughes [Tue, 17 May 2011 20:35:59 +0000 (21:35 +0100)]
Use a pessimistic version constraint for libxml

It seems that rails doesn't handle gems wth multiple version
constraints right - it generates invalid install commands. So
we use a pessimistic constraint instead.

13 years agoHandle large bounding box changesets better
Tom Hughes [Fri, 13 May 2011 16:27:12 +0000 (17:27 +0100)]
Handle large bounding box changesets better

If the bounding box of a changeset is much larger than the map then
there seem to be problems with OL not rendering the feature correctly
so reduce the highlight to just be the extent of the map plus a small
margin in that case.

13 years agoMake "all traces" and "your traces" links more consistent
Tom Hughes [Fri, 13 May 2011 09:06:16 +0000 (10:06 +0100)]
Make "all traces" and "your traces" links more consistent

Make sure we always show the "all traces" and "your traces" links
in the same place and that they don't accidentally inherit parameter
values that we don't really want.

Based on work by Andrzej Zaborowski <balrog@zabor.org>.

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