]> git.openstreetmap.org Git - rails.git/log
rails.git
11 years agoMerge branch 'master' into openstreetbugs
Tom Hughes [Wed, 22 Jun 2011 21:36:43 +0000 (22:36 +0100)]
Merge branch 'master' into openstreetbugs

11 years agoMake the AMF API check that the CTs have been agreed
Tom Hughes [Mon, 20 Jun 2011 08:20:30 +0000 (09:20 +0100)]
Make the AMF API check that the CTs have been agreed

11 years agoImprove look of OpenID login on small screen devices
Tom Hughes [Sun, 19 Jun 2011 16:54:47 +0000 (17:54 +0100)]
Improve look of OpenID login on small screen devices

11 years agoUse smaller logos for OpenID logins
Tom Hughes [Sun, 19 Jun 2011 16:49:36 +0000 (17:49 +0100)]
Use smaller logos for OpenID logins

11 years agoUpdate Potlatch 2 to 2.2-6-gaa899ca build
Tom Hughes [Sun, 19 Jun 2011 11:13:12 +0000 (12:13 +0100)]
Update Potlatch 2 to 2.2-6-gaa899ca build

11 years agoUpdate Potlatch 2 to 2.2-1-gdec4a94 build
Tom Hughes [Sat, 18 Jun 2011 08:08:33 +0000 (09:08 +0100)]
Update Potlatch 2 to 2.2-1-gdec4a94 build

11 years agoUpdate Potlatch 2 to 2.2 build
Tom Hughes [Fri, 17 Jun 2011 22:21:59 +0000 (23:21 +0100)]
Update Potlatch 2 to 2.2 build

11 years agoMake sure the ID of OpenID URL fields is openid_url
Tom Hughes [Wed, 15 Jun 2011 13:26:58 +0000 (14:26 +0100)]
Make sure the ID of OpenID URL fields is openid_url

11 years agoExpire user pages when their image changes
Tom Hughes [Wed, 15 Jun 2011 08:51:56 +0000 (09:51 +0100)]
Expire user pages when their image changes

11 years agoDon't error if we fail to get SReg and/or AX data from OpenID
Tom Hughes [Tue, 14 Jun 2011 23:07:32 +0000 (00:07 +0100)]
Don't error if we fail to get SReg and/or AX data from OpenID

11 years agoFix some broken tests
Tom Hughes [Tue, 14 Jun 2011 21:39:33 +0000 (22:39 +0100)]
Fix some broken tests

11 years agoAdd an option to require the CTs to be agreed to edit
Tom Hughes [Tue, 14 Jun 2011 20:16:21 +0000 (21:16 +0100)]
Add an option to require the CTs to be agreed to edit

11 years agoMake password signups work
Tom Hughes [Fri, 10 Jun 2011 20:48:17 +0000 (21:48 +0100)]
Make password signups work

11 years agoFix field names so password logins work
Tom Hughes [Fri, 10 Jun 2011 20:32:57 +0000 (21:32 +0100)]
Fix field names so password logins work

11 years agoMerge branch 'master' into openid
Tom Hughes [Fri, 10 Jun 2011 18:11:08 +0000 (19:11 +0100)]
Merge branch 'master' into openid

11 years agoExpire diary pages which contain comments by a user when necessary
Tom Hughes [Thu, 9 Jun 2011 14:22:15 +0000 (15:22 +0100)]
Expire diary pages which contain comments by a user when necessary

11 years agoOnly check some user validations when the field has changed
Tom Hughes [Mon, 6 Jun 2011 23:22:23 +0000 (00:22 +0100)]
Only check some user validations when the field has changed

11 years agoAllow a parameter to set the default value for the username
Tom Hughes [Fri, 3 Jun 2011 14:04:05 +0000 (15:04 +0100)]
Allow a parameter to set the default value for the username

11 years agoWork round session expiry bug in rails 2.3.11
Tom Hughes [Thu, 2 Jun 2011 09:23:22 +0000 (10:23 +0100)]
Work round session expiry bug in rails 2.3.11

Rails uses :expire_after in the session options to specify when a
sesssion should expire, but when Rack sets the cookie it expects to
see :expires in the cookie options but Rails 2.3.11 fails to do the
conversion so doesn't set the cookie expiry.

To work around this, we set both options in the session options...

11 years agoUse session.delete to remove entries instead of assigning nil
Tom Hughes [Wed, 1 Jun 2011 09:17:54 +0000 (10:17 +0100)]
Use session.delete to remove entries instead of assigning nil

11 years agoForce a session to be created when doing a cookie test
Tom Hughes [Wed, 1 Jun 2011 09:16:11 +0000 (10:16 +0100)]
Force a session to be created when doing a cookie test

11 years agoAdd credit for Vienna data to copyright page
Tom Hughes [Tue, 31 May 2011 20:04:55 +0000 (21:04 +0100)]
Add credit for Vienna data to copyright page

11 years agoMerge branch 'master' into openstreetbugs
Tom Hughes [Tue, 31 May 2011 18:20:42 +0000 (19:20 +0100)]
Merge branch 'master' into openstreetbugs

11 years agoMerge branch 'master' into openid
Tom Hughes [Tue, 31 May 2011 18:10:31 +0000 (19:10 +0100)]
Merge branch 'master' into openid

Conflicts:
config/locales/en.yml

11 years agoUpdate rails translations
Tom Hughes [Sat, 28 May 2011 15:32:03 +0000 (16:32 +0100)]
Update rails translations

11 years agoUpdate to Rails 2.3.11
Tom Hughes [Sat, 28 May 2011 14:22:47 +0000 (15:22 +0100)]
Update to Rails 2.3.11

Update the site to use Rails 2.3.11 which also required switching to
the new syntax for interpolated variables in translation strings.

11 years agoLocalisation updates from http://translatewiki.net.
Siebrand Mazeland [Tue, 31 May 2011 17:04:05 +0000 (19:04 +0200)]
Localisation updates from http://translatewiki.net.

11 years agoImprove the look of the OpenID enabled login form on mobile devices
Tom Hughes [Sun, 29 May 2011 09:17:30 +0000 (10:17 +0100)]
Improve the look of the OpenID enabled login form on mobile devices

11 years agoReplace MySpace with AOL in the OpenID login buttons
Tom Hughes [Fri, 27 May 2011 23:17:52 +0000 (00:17 +0100)]
Replace MySpace with AOL in the OpenID login buttons

11 years agoMake titles on OpenID icons a bit more friendly
Tom Hughes [Fri, 27 May 2011 19:41:37 +0000 (20:41 +0100)]
Make titles on OpenID icons a bit more friendly

11 years agoUpdate Potlatch 2 to 2.1-21-g5f128f5 build
Tom Hughes [Fri, 27 May 2011 17:56:14 +0000 (18:56 +0100)]
Update Potlatch 2 to 2.1-21-g5f128f5 build

11 years agoMerge branch 'master' into openid
Tom Hughes [Sun, 22 May 2011 17:01:15 +0000 (18:01 +0100)]
Merge branch 'master' into openid

Conflicts:
app/views/user/login.html.erb

11 years agoMerge branch 'master' into openstreetbugs
Tom Hughes [Sun, 22 May 2011 16:59:35 +0000 (17:59 +0100)]
Merge branch 'master' into openstreetbugs

11 years agoUpdate OSM logos to perspective tweaked version
Grant Slater [Sun, 22 May 2011 16:45:42 +0000 (17:45 +0100)]
Update OSM logos to perspective tweaked version

11 years agoUpdate Potlatch 2 to 2.1-12-g870b72b build
Tom Hughes [Sun, 22 May 2011 16:49:07 +0000 (17:49 +0100)]
Update Potlatch 2 to 2.1-12-g870b72b build

11 years agoImprove presentation of supporting links on the terms page
Tom Hughes [Sun, 22 May 2011 16:47:04 +0000 (17:47 +0100)]
Improve presentation of supporting links on the terms page

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

11 years agoCorrect some minor html validation errors
Grant Slater [Sun, 22 May 2011 15:16:44 +0000 (16:16 +0100)]
Correct some minor html validation errors

11 years agoAdd summary + informal translations links to terms page
Grant Slater [Sun, 22 May 2011 14:10:30 +0000 (15:10 +0100)]
Add summary + informal translations links to terms page

11 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

11 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

11 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

11 years agoOnly add bbox data to the search form while we submit it
Tom Hughes [Sun, 22 May 2011 10:08:17 +0000 (11:08 +0100)]
Only add bbox data to the search form while we submit it

Having the bbox attributes on the search form all the time means
that Firefox will incude them in the arguments if you bookmark the
search using "Add a keyword for this search" on the context menu.

11 years agoUpdated to libxml-ruby 2.0.5 and fixed code accordingly.
Matt Amos [Sat, 21 May 2011 14:15:49 +0000 (15:15 +0100)]
Updated to libxml-ruby 2.0.5 and fixed code accordingly.

I've tested this through the unit tests and by hitting it with
bulk_upload.py and neither fail or cause the server to crash or
go into an infinite loop. Both of these things happened randomly
with 1.1.3/4 due to an apparent early deregistration of the
expanded nodes.

11 years agoUpdate Potlatch 2 to 2.1 build
Tom Hughes [Sat, 21 May 2011 16:25:36 +0000 (17:25 +0100)]
Update Potlatch 2 to 2.1 build

11 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

11 years agoImprove layout of OpenID buttons
Tom Hughes [Sat, 21 May 2011 13:54:15 +0000 (14:54 +0100)]
Improve layout of OpenID buttons

11 years agoGive OpenID logo images a transparent background
Tom Hughes [Sat, 21 May 2011 13:47:54 +0000 (14:47 +0100)]
Give OpenID logo images a transparent background

11 years agoCleanup merge breakage
Tom Hughes [Sat, 21 May 2011 13:05:55 +0000 (14:05 +0100)]
Cleanup merge breakage

11 years agoStart ROTS for user login tests as well as creation tests
Tom Hughes [Sat, 21 May 2011 12:35:15 +0000 (13:35 +0100)]
Start ROTS for user login tests as well as creation tests

11 years agoIf we start a ROTS instance then kill it when we're done
Tom Hughes [Sat, 21 May 2011 11:31:56 +0000 (12:31 +0100)]
If we start a ROTS instance then kill it when we're done

11 years agoMerge branch 'master' into openid
Tom Hughes [Sat, 21 May 2011 11:14:56 +0000 (12:14 +0100)]
Merge branch 'master' into openid

Conflicts:
app/controllers/user_controller.rb
app/views/user/terms.html.erb
test/fixtures/users.yml

11 years agoMerge branch 'openID' of git://git.openstreetmap.org/rails into openid
Tom Hughes [Sat, 21 May 2011 11:11:40 +0000 (12:11 +0100)]
Merge branch 'openID' of git://git.openstreetmap.org/rails into openid

11 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

11 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

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

11 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

11 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

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

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

11 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

11 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

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

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

11 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

11 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

11 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

11 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

11 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

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

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

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

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

11 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

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

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

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

11 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

11 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

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

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

11 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

11 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

11 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

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

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

11 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

11 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

11 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

11 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

11 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

11 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

11 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

11 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

11 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

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

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

11 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

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

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