rails.git
8 years agoUpdate Potlatch 2 to 2.3-75-g0d119e0 build
Tom Hughes [Sat, 8 Oct 2011 11:50:23 +0000 (12:50 +0100)]
Update Potlatch 2 to 2.3-75-g0d119e0 build

8 years agoAdd an inner div for the plugin as swfobject will replace it
Grant Slater [Thu, 6 Oct 2011 00:53:13 +0000 (01:53 +0100)]
Add an inner div for the plugin as swfobject will replace it

8 years agoReplace swfobject 1.5 with swfobject 2
Grant Slater [Wed, 5 Oct 2011 23:05:46 +0000 (00:05 +0100)]
Replace swfobject 1.5 with swfobject 2

8 years agoUpdate Potlatch 2 to 2.3-29-gffe3474 build
Tom Hughes [Mon, 3 Oct 2011 17:19:49 +0000 (18:19 +0100)]
Update Potlatch 2 to 2.3-29-gffe3474 build

8 years agoUpdate Potlatch 2 to 2.3-27-gb6d4754 build
Tom Hughes [Mon, 3 Oct 2011 14:09:49 +0000 (15:09 +0100)]
Update Potlatch 2 to 2.3-27-gb6d4754 build

8 years agoUpdate Potlatch 2 to 2.3-22-g7ed0c35 build
Tom Hughes [Mon, 3 Oct 2011 13:06:44 +0000 (14:06 +0100)]
Update Potlatch 2 to 2.3-22-g7ed0c35 build

8 years agoUpdate Potlatch 2 to 2.3-19-gf15d9bc build
Tom Hughes [Mon, 3 Oct 2011 11:17:39 +0000 (12:17 +0100)]
Update Potlatch 2 to 2.3-19-gf15d9bc build

8 years agoUpdate Potlatch 2 to 2.3-17-ge235e7f build
Tom Hughes [Mon, 3 Oct 2011 07:42:27 +0000 (08:42 +0100)]
Update Potlatch 2 to 2.3-17-ge235e7f build

8 years agoUpdate Potlatch 2 to 2.3-15-gdbaf30f build
Tom Hughes [Sun, 2 Oct 2011 15:13:53 +0000 (16:13 +0100)]
Update Potlatch 2 to 2.3-15-gdbaf30f build

8 years agoUpdate Potlatch 2 to 2.3-11-gfd60020 build
Tom Hughes [Sat, 1 Oct 2011 09:59:16 +0000 (10:59 +0100)]
Update Potlatch 2 to 2.3-11-gfd60020 build

8 years agoFlash 10 is now required
Grant Slater [Sat, 1 Oct 2011 01:22:27 +0000 (03:22 +0200)]
Flash 10 is now required

8 years agoUpdate Potlatch 2 to 2.3-1-gfe8365a build
Tom Hughes [Fri, 30 Sep 2011 18:04:50 +0000 (19:04 +0100)]
Update Potlatch 2 to 2.3-1-gfe8365a build

8 years agoUpdate Potlatch 2 to 2.2-48-ga7cff2e build
Tom Hughes [Thu, 29 Sep 2011 08:49:18 +0000 (09:49 +0100)]
Update Potlatch 2 to 2.2-48-ga7cff2e build

8 years agoRemove old process management scripts
Tom Hughes [Wed, 28 Sep 2011 23:25:38 +0000 (00:25 +0100)]
Remove old process management scripts

8 years agoLocalisation updates from http://translatewiki.net.
Siebrand Mazeland [Wed, 28 Sep 2011 23:43:04 +0000 (16:43 -0700)]
Localisation updates from translatewiki.net.

8 years agoLocalisation updates from http://translatewiki.net.
Siebrand Mazeland [Wed, 28 Sep 2011 20:33:22 +0000 (13:33 -0700)]
Localisation updates from translatewiki.net.

8 years agoFix some substitution markers to use %{...} instead of {{...}}
Tom Hughes [Wed, 28 Sep 2011 08:03:05 +0000 (09:03 +0100)]
Fix some substitution markers to use %{...} instead of {{...}}

8 years agoLocalisation updates from http://translatewiki.net.
Siebrand Mazeland [Sun, 25 Sep 2011 22:03:10 +0000 (00:03 +0200)]
Localisation updates from translatewiki.net.

8 years agoCoerce the API version to a string
Tom Hughes [Sat, 24 Sep 2011 16:02:27 +0000 (17:02 +0100)]
Coerce the API version to a string

8 years agoAvoid using underscore in anchor names
Tom Hughes [Sat, 24 Sep 2011 15:03:15 +0000 (16:03 +0100)]
Avoid using underscore in anchor names

Perl's YAML parser (wrongly as far as I can see) rejects any anchor
name with an underscore in it.

8 years agoMark all users which have seen the terms as having accepted them
Tom Hughes [Sat, 24 Sep 2011 14:23:24 +0000 (15:23 +0100)]
Mark all users which have seen the terms as having accepted them

8 years agoAdd some tests for password logins
Tom Hughes [Sat, 24 Sep 2011 14:19:34 +0000 (15:19 +0100)]
Add some tests for password logins

8 years agoUpdate tests for changes to login form
Tom Hughes [Sat, 24 Sep 2011 14:13:40 +0000 (15:13 +0100)]
Update tests for changes to login form

8 years agoAdd support for manual tracking of a Piwik goal on signup
Tom Hughes [Tue, 20 Sep 2011 20:40:53 +0000 (21:40 +0100)]
Add support for manual tracking of a Piwik goal on signup

8 years agoRemove SOTM advert
Tom Hughes [Tue, 20 Sep 2011 20:31:11 +0000 (21:31 +0100)]
Remove SOTM advert

8 years agoAdd some more languages to the OpenLayers build
Tom Hughes [Sun, 18 Sep 2011 23:11:56 +0000 (00:11 +0100)]
Add some more languages to the OpenLayers build

8 years agoAdd support for Piwik analytics
Tom Hughes [Fri, 16 Sep 2011 23:11:53 +0000 (00:11 +0100)]
Add support for Piwik analytics

8 years agoMake sure asking a node for it's history returns an ordered list
Tom Hughes [Wed, 14 Sep 2011 09:16:44 +0000 (10:16 +0100)]
Make sure asking a node for it's history returns an ordered list

8 years agoAdd the PinchZoom control to the OpenLayers build
Tom Hughes [Mon, 12 Sep 2011 13:46:13 +0000 (14:46 +0100)]
Add the PinchZoom control to the OpenLayers build

8 years agoUpgrade to OpenLayers 2.11
Tom Hughes [Sun, 11 Sep 2011 16:45:54 +0000 (17:45 +0100)]
Upgrade to OpenLayers 2.11

8 years agoLocalisation updates from http://translatewiki.net.
Siebrand Mazeland [Sun, 11 Sep 2011 14:24:59 +0000 (16:24 +0200)]
Localisation updates from translatewiki.net.

8 years agoUse parent.tile.openstreetmap.org for the export URL
Tom Hughes [Thu, 8 Sep 2011 10:47:00 +0000 (11:47 +0100)]
Use parent.tile.openstreetmap.org for the export URL

8 years agoRemove link to ethnio script which was never used
Tom Hughes [Tue, 23 Aug 2011 10:12:29 +0000 (11:12 +0100)]
Remove link to ethnio script which was never used

8 years agoRemove :root qualifiers as they don't seem to work in rails 2.3.14
Tom Hughes [Mon, 22 Aug 2011 21:42:38 +0000 (22:42 +0100)]
Remove :root qualifiers as they don't seem to work in rails 2.3.14

8 years agoUpdate to rails 2.3.14
Tom Hughes [Mon, 22 Aug 2011 21:24:16 +0000 (22:24 +0100)]
Update to rails 2.3.14

8 years agoDisable the openid_url field when it isn't shown
Tom Hughes [Mon, 22 Aug 2011 10:40:08 +0000 (11:40 +0100)]
Disable the openid_url field when it isn't shown

8 years agoFix incorrect interpolation variable
Tom Hughes [Mon, 22 Aug 2011 10:16:41 +0000 (11:16 +0100)]
Fix incorrect interpolation variable

8 years agoDon't show the openid field if the URL is the empty string
Tom Hughes [Mon, 22 Aug 2011 10:00:42 +0000 (11:00 +0100)]
Don't show the openid field if the URL is the empty string

8 years agoHide and show the openid field on the signup page correctly
Tom Hughes [Mon, 22 Aug 2011 09:59:49 +0000 (10:59 +0100)]
Hide and show the openid field on the signup page correctly

8 years agoFix issues with variables.
Siebrand Mazeland [Mon, 15 Aug 2011 08:53:31 +0000 (10:53 +0200)]
Fix issues with variables.

8 years agoFix old variables.
Siebrand Mazeland [Mon, 15 Aug 2011 08:41:10 +0000 (10:41 +0200)]
Fix old variables.

8 years agoLocalisation updates from http://translatewiki.net.
Siebrand Mazeland [Mon, 15 Aug 2011 08:38:06 +0000 (10:38 +0200)]
Localisation updates from translatewiki.net.

8 years agoLocalisation updates from http://translatewiki.net.
Siebrand Mazeland [Mon, 15 Aug 2011 08:22:11 +0000 (10:22 +0200)]
Localisation updates from translatewiki.net.

8 years agoAllow the log location to be changed in production
Tom Hughes [Fri, 12 Aug 2011 21:27:15 +0000 (22:27 +0100)]
Allow the log location to be changed in production

8 years agoPass the right extent for a changeset to the remote control handler
Tom Hughes [Fri, 12 Aug 2011 18:26:12 +0000 (19:26 +0100)]
Pass the right extent for a changeset to the remote control handler

8 years agoAdd a small buffer to the extent before passing it to the remote control
Tom Hughes [Fri, 12 Aug 2011 18:18:15 +0000 (19:18 +0100)]
Add a small buffer to the extent before passing it to the remote control

8 years agoFix syntax error in Hebrew.
Siebrand Mazeland [Fri, 5 Aug 2011 14:08:05 +0000 (16:08 +0200)]
Fix syntax error in Hebrew.

8 years agoRemove trailing space.
Siebrand Mazeland [Fri, 5 Aug 2011 14:00:36 +0000 (16:00 +0200)]
Remove trailing space.

8 years agoFix for Hebrew directionality. Spotted by Aude.
Siebrand Mazeland [Fri, 5 Aug 2011 08:49:12 +0000 (10:49 +0200)]
Fix for Hebrew directionality. Spotted by Aude.

8 years agoShow the current location when editing a diary entry with a location
Tom Hughes [Mon, 1 Aug 2011 15:59:40 +0000 (16:59 +0100)]
Show the current location when editing a diary entry with a location

8 years agoStyle the map div correctly when editing an existing diary entry
Tom Hughes [Mon, 1 Aug 2011 15:54:33 +0000 (16:54 +0100)]
Style the map div correctly when editing an existing diary entry

8 years agoDon't create the map until after the div for it is made visible
Tom Hughes [Mon, 1 Aug 2011 08:09:24 +0000 (09:09 +0100)]
Don't create the map until after the div for it is made visible

8 years agoFix an accidental CSS match that broke user popups on maps
Tom Hughes [Sun, 31 Jul 2011 15:21:35 +0000 (16:21 +0100)]
Fix an accidental CSS match that broke user popups on maps

8 years agoUpdate Potlatch 2 to 2.2-41-gec89ae9 build
Tom Hughes [Tue, 19 Jul 2011 21:34:23 +0000 (22:34 +0100)]
Update Potlatch 2 to 2.2-41-gec89ae9 build

8 years agoAdd edit links to data browser pages
Tom Hughes [Tue, 19 Jul 2011 21:22:04 +0000 (22:22 +0100)]
Add edit links to data browser pages

8 years agoImplement a generic system for updating coordinates on links
Tom Hughes [Tue, 19 Jul 2011 10:05:06 +0000 (11:05 +0100)]
Implement a generic system for updating coordinates on links

8 years agoAdd style rules for the main page when invoked for an export
Tom Hughes [Tue, 19 Jul 2011 09:01:54 +0000 (10:01 +0100)]
Add style rules for the main page when invoked for an export

8 years agoDisable the edit tab until we have some coordinates to edit at
Tom Hughes [Tue, 19 Jul 2011 08:44:02 +0000 (09:44 +0100)]
Disable the edit tab until we have some coordinates to edit at

8 years agoUse num_changes to detect empty changesets instead of the bbox
Tom Hughes [Tue, 12 Jul 2011 14:55:17 +0000 (15:55 +0100)]
Use num_changes to detect empty changesets instead of the bbox

8 years agoUpdate Potlatch 2 to 2.2-18-g514f0d2 build
Tom Hughes [Sun, 10 Jul 2011 13:56:30 +0000 (14:56 +0100)]
Update Potlatch 2 to 2.2-18-g514f0d2 build

8 years agoShow the Potlatch 2 help the first time a user starts it
Grant Slater [Fri, 8 Jul 2011 11:40:15 +0000 (12:40 +0100)]
Show the Potlatch 2 help the first time a user starts it

8 years agoWait for dom:loaded to fire before initialising the map
Tom Hughes [Thu, 7 Jul 2011 09:02:42 +0000 (10:02 +0100)]
Wait for dom:loaded to fire before initialising the map

Also very all our use of window.onload and switch to using dom:loaded
instead where we can - the main case where we can't is when using a
vector layer as IE will fail unless the page is completely loaded.

8 years agoDon't compare changeset bbox coordinates when they may be nil
Matt Amos [Wed, 6 Jul 2011 00:45:14 +0000 (01:45 +0100)]
Don't compare changeset bbox coordinates when they may be nil

The code assumed that the changeset bounding box would only be
updated with a valid bounding box, but this isn't the case when
dealing with certain corner cases, including when removing
deleted members from relations.

8 years agoAdd a secondary_link entry to the browse stylesheet
Tom Hughes [Tue, 5 Jul 2011 12:22:02 +0000 (13:22 +0100)]
Add a secondary_link entry to the browse stylesheet

8 years agoPut the permalink in the right place with LTR languages
Tom Hughes [Sat, 2 Jul 2011 17:33:00 +0000 (18:33 +0100)]
Put the permalink in the right place with LTR languages

8 years agoMore work on moving styles out of line and extending RTL support
Tom Hughes [Sat, 2 Jul 2011 16:10:56 +0000 (17:10 +0100)]
More work on moving styles out of line and extending RTL support

8 years agoFix resizing of the map area in RTL layouts
Tom Hughes [Sat, 2 Jul 2011 15:19:47 +0000 (16:19 +0100)]
Fix resizing of the map area in RTL layouts

8 years agoMove more styling into CSS and make it support RTL layout
Tom Hughes [Sat, 2 Jul 2011 10:22:19 +0000 (11:22 +0100)]
Move more styling into CSS and make it support RTL layout

8 years agoLots more work on making RTL layout work
Tom Hughes [Sat, 2 Jul 2011 00:00:51 +0000 (01:00 +0100)]
Lots more work on making RTL layout work

8 years agoCSS changes to improve RTL layout
Katie Filbert [Fri, 1 Jul 2011 03:32:39 +0000 (03:32 +0000)]
CSS changes to improve RTL layout

8 years agoShow the name of the logged in user during OAuth authorization
Tom Hughes [Fri, 1 Jul 2011 19:38:41 +0000 (20:38 +0100)]
Show the name of the logged in user during OAuth authorization

8 years agoLocalisation updates from http://translatewiki.net.
Siebrand Mazeland [Fri, 1 Jul 2011 10:55:30 +0000 (12:55 +0200)]
Localisation updates from translatewiki.net.

8 years agoApparentl IC like to be known as Imperical College London
Tom Hughes [Wed, 29 Jun 2011 08:26:16 +0000 (09:26 +0100)]
Apparentl IC like to be known as Imperical College London

8 years agoAdd a credit for IC on the front page
Tom Hughes [Tue, 28 Jun 2011 13:03:12 +0000 (14:03 +0100)]
Add a credit for IC on the front page

8 years agoUpdate Potlatch 2 to 2.2-11-g8f86250 build
Tom Hughes [Sun, 26 Jun 2011 23:11:20 +0000 (00:11 +0100)]
Update Potlatch 2 to 2.2-11-g8f86250 build

8 years agoDon't try and update the session when we have no database
Tom Hughes [Thu, 23 Jun 2011 13:15:55 +0000 (14:15 +0100)]
Don't try and update the session when we have no database

8 years agoFix problems with database offline mode
Tom Hughes [Thu, 23 Jun 2011 07:30:44 +0000 (08:30 +0100)]
Fix problems with database offline mode

8 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

8 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

8 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

8 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

8 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

8 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

8 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

8 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

8 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

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

8 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

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

8 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

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

8 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

8 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

8 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

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

8 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

8 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

8 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

8 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

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