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

13 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

13 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

13 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

13 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

13 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

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

13 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

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

13 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

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

13 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

13 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

13 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

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

13 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

13 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

13 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

13 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

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

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

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

13 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

13 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

13 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

13 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

13 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

13 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

13 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

13 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

13 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

13 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

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

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

13 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

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

13 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

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

13 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

13 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

13 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

13 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

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