]> git.openstreetmap.org Git - rails.git/log
rails.git
13 years agoMake sure the maximum scale is set when export is opened
Tom Hughes [Thu, 24 Nov 2011 21:31:54 +0000 (21:31 +0000)]
Make sure the maximum scale is set when export is opened

13 years agoDon't escape the license link
Tom Hughes [Thu, 24 Nov 2011 21:21:17 +0000 (21:21 +0000)]
Don't escape the license link

13 years agoUpdate Potlatch 2 to 2.3-94-gad42530 build
Tom Hughes [Thu, 24 Nov 2011 19:23:12 +0000 (19:23 +0000)]
Update Potlatch 2 to 2.3-94-gad42530 build

13 years agoLog any session that is reset due to a username mismatch
Tom Hughes [Thu, 24 Nov 2011 09:42:04 +0000 (09:42 +0000)]
Log any session that is reset due to a username mismatch

13 years agoDon't escape the heading on a user block
Tom Hughes [Wed, 23 Nov 2011 00:11:51 +0000 (00:11 +0000)]
Don't escape the heading on a user block

13 years agoDon't escape HTML in the message shown to anonymous users
Tom Hughes [Tue, 22 Nov 2011 22:45:24 +0000 (22:45 +0000)]
Don't escape HTML in the message shown to anonymous users

13 years agoAdd feed action to relevant filters
Tom Hughes [Tue, 22 Nov 2011 12:19:41 +0000 (12:19 +0000)]
Add feed action to relevant filters

13 years agoLocalisation updates from http://translatewiki.net.
Siebrand Mazeland [Mon, 21 Nov 2011 21:02:37 +0000 (22:02 +0100)]
Localisation updates from http://translatewiki.net.

13 years agoReplace HTML entities with normal character equivalents
Tom Hughes [Mon, 21 Nov 2011 09:57:58 +0000 (09:57 +0000)]
Replace HTML entities with normal character equivalents

13 years agoUpdate to rails 3.1.3
Tom Hughes [Mon, 21 Nov 2011 09:19:04 +0000 (09:19 +0000)]
Update to rails 3.1.3

13 years agoAdd some OAuth tests
Tom Hughes [Sat, 19 Nov 2011 17:12:40 +0000 (17:12 +0000)]
Add some OAuth tests

13 years agoAdd the OAuth verifier to 1.0a callbacks correctly
Tom Hughes [Sat, 19 Nov 2011 17:11:54 +0000 (17:11 +0000)]
Add the OAuth verifier to 1.0a callbacks correctly

13 years agoGenerate correct URLs for changeset feeds
Tom Hughes [Sat, 19 Nov 2011 12:29:43 +0000 (12:29 +0000)]
Generate correct URLs for changeset feeds

13 years agoOverride oauth1_authorize pending a fixed version of oauth-plugin
Tom Hughes [Sat, 19 Nov 2011 00:25:17 +0000 (00:25 +0000)]
Override oauth1_authorize pending a fixed version of oauth-plugin

13 years agoUpdate Potlatch 2 to 2.3-92-g0b8633d build
Tom Hughes [Fri, 18 Nov 2011 17:14:05 +0000 (17:14 +0000)]
Update Potlatch 2 to 2.3-92-g0b8633d build

13 years agoPass sql_for_area a BoundingBox object
Tom Hughes [Fri, 18 Nov 2011 16:50:54 +0000 (16:50 +0000)]
Pass sql_for_area a BoundingBox object

13 years agoMonkey patch CPK to fix problems with polymorphic has_many
Tom Hughes [Fri, 18 Nov 2011 10:21:37 +0000 (10:21 +0000)]
Monkey patch CPK to fix problems with polymorphic has_many

13 years agoUpdate to rails 3.1.2
Tom Hughes [Fri, 18 Nov 2011 09:23:40 +0000 (09:23 +0000)]
Update to rails 3.1.2

13 years agoSpell way_id correctly
Tom Hughes [Thu, 17 Nov 2011 11:33:48 +0000 (11:33 +0000)]
Spell way_id correctly

13 years agoFixed escaping in title
Tom Hughes [Thu, 17 Nov 2011 11:03:27 +0000 (11:03 +0000)]
Fixed escaping in title

13 years agoRemoved bogus characters from form_for
Tom Hughes [Thu, 17 Nov 2011 11:02:42 +0000 (11:02 +0000)]
Removed bogus characters from form_for

13 years agoFix formatting of user list
Tom Hughes [Thu, 17 Nov 2011 10:00:47 +0000 (10:00 +0000)]
Fix formatting of user list

13 years agoFilter out the current way correctly
Tom Hughes [Thu, 17 Nov 2011 09:53:21 +0000 (09:53 +0000)]
Filter out the current way correctly

13 years agoMake OAuth work again
Tom Hughes [Wed, 16 Nov 2011 21:06:47 +0000 (21:06 +0000)]
Make OAuth work again

13 years agoMake the text direction style come before the screen size style
Tom Hughes [Wed, 16 Nov 2011 15:55:33 +0000 (15:55 +0000)]
Make the text direction style come before the screen size style

13 years agoUpdate message delivery script to work with rails 3
Tom Hughes [Wed, 16 Nov 2011 15:42:43 +0000 (15:42 +0000)]
Update message delivery script to work with rails 3

13 years agoAlways pass the session ID to the logout page
Tom Hughes [Wed, 16 Nov 2011 11:25:37 +0000 (11:25 +0000)]
Always pass the session ID to the logout page

The tricks we played before to only pass it via a POST while
keeping the visible URL clean don't work anymore.

13 years agoMake the username cookie permanent
Tom Hughes [Wed, 16 Nov 2011 10:05:39 +0000 (10:05 +0000)]
Make the username cookie permanent

13 years agoYet more raw markers
Tom Hughes [Wed, 16 Nov 2011 09:55:36 +0000 (09:55 +0000)]
Yet more raw markers

13 years agoExplicitly select the default locale if we have no better ideas
Tom Hughes [Wed, 16 Nov 2011 09:21:23 +0000 (09:21 +0000)]
Explicitly select the default locale if we have no better ideas

13 years agoAdd some logging to help diagnose changeset feed locale issue
Tom Hughes [Wed, 16 Nov 2011 08:56:35 +0000 (08:56 +0000)]
Add some logging to help diagnose changeset feed locale issue

13 years agoAdd some more raw markers
Tom Hughes [Wed, 16 Nov 2011 08:48:05 +0000 (08:48 +0000)]
Add some more raw markers

13 years agoRevert "Put changeset feeds before lists in the routes"
Tom Hughes [Tue, 15 Nov 2011 16:10:08 +0000 (16:10 +0000)]
Revert "Put changeset feeds before lists in the routes"

This reverts commit 76c1371dcf4783b38dd9235b63a3121e08e6e20e.

13 years agoLooks like @body is special somehow so use @text instead
Tom Hughes [Tue, 15 Nov 2011 14:49:38 +0000 (14:49 +0000)]
Looks like @body is special somehow so use @text instead

13 years agoPut changeset feeds before lists in the routes
Tom Hughes [Tue, 15 Nov 2011 12:56:38 +0000 (12:56 +0000)]
Put changeset feeds before lists in the routes

13 years agoUse asset_path to find the arrow icon
Tom Hughes [Tue, 15 Nov 2011 10:48:30 +0000 (10:48 +0000)]
Use asset_path to find the arrow icon

13 years agoRemove debugging code
Tom Hughes [Tue, 15 Nov 2011 09:58:30 +0000 (09:58 +0000)]
Remove debugging code

13 years agoMark sanitized text as HTML safe
Tom Hughes [Tue, 15 Nov 2011 09:58:10 +0000 (09:58 +0000)]
Mark sanitized text as HTML safe

13 years agoMake linkify preserve HTML safety
Tom Hughes [Tue, 15 Nov 2011 09:46:33 +0000 (09:46 +0000)]
Make linkify preserve HTML safety

13 years agoAdd a few missing raw markers
Tom Hughes [Tue, 15 Nov 2011 09:20:04 +0000 (09:20 +0000)]
Add a few missing raw markers

13 years agoOnly apply the hard memory limit when running under passenger
Tom Hughes [Tue, 15 Nov 2011 09:17:07 +0000 (09:17 +0000)]
Only apply the hard memory limit when running under passenger

13 years agoReinstate memory limits now we're not using rhino
Tom Hughes [Mon, 14 Nov 2011 19:06:11 +0000 (19:06 +0000)]
Reinstate memory limits now we're not using rhino

13 years agoRequire therubyracer during asset compilation
Tom Hughes [Mon, 14 Nov 2011 10:09:21 +0000 (10:09 +0000)]
Require therubyracer during asset compilation

13 years agoUpdate tests to set the username cookie as necessary
Tom Hughes [Mon, 7 Nov 2011 21:41:49 +0000 (21:41 +0000)]
Update tests to set the username cookie as necessary

13 years agoDon't reset the session when the token refers to an invalid user
Tom Hughes [Mon, 7 Nov 2011 21:40:42 +0000 (21:40 +0000)]
Don't reset the session when the token refers to an invalid user

During account creation it is quite normal for the token in the
session to refer to a user that is not active yet.

13 years agoStore the username in a cookie and use it to validate the session
Tom Hughes [Mon, 7 Nov 2011 17:46:15 +0000 (17:46 +0000)]
Store the username in a cookie and use it to validate the session

13 years agoMake /user/new handle already logged in users better
Tom Hughes [Mon, 7 Nov 2011 17:38:11 +0000 (17:38 +0000)]
Make /user/new handle already logged in users better

13 years agoDisable rack caching in production
Tom Hughes [Mon, 7 Nov 2011 10:57:38 +0000 (10:57 +0000)]
Disable rack caching in production

13 years agoFix object_id warning
Tom Hughes [Mon, 7 Nov 2011 10:56:05 +0000 (10:56 +0000)]
Fix object_id warning

13 years agoFix production log configuration
Tom Hughes [Sun, 6 Nov 2011 11:39:13 +0000 (11:39 +0000)]
Fix production log configuration

13 years agoDisable hard memory limits
Tom Hughes [Sun, 6 Nov 2011 11:17:42 +0000 (11:17 +0000)]
Disable hard memory limits

13 years agoAdd memcache-client for live site
Tom Hughes [Sun, 6 Nov 2011 11:14:38 +0000 (11:14 +0000)]
Add memcache-client for live site

13 years agoRequire composite_primary_keys 4.1.1 for rails 3.1.1 support
Tom Hughes [Fri, 4 Nov 2011 09:36:11 +0000 (09:36 +0000)]
Require composite_primary_keys 4.1.1 for rails 3.1.1 support

13 years agoStop the API changeset query accepting min_lon etc
Tom Hughes [Thu, 27 Oct 2011 20:36:16 +0000 (21:36 +0100)]
Stop the API changeset query accepting min_lon etc

13 years agoRefactor bounding box code
Peter Gray [Mon, 24 Oct 2011 09:45:56 +0000 (10:45 +0100)]
Refactor bounding box code

Moved duplicated code into the BoundingBox class, and pass around
BoundingBox objects instead of lists of bounds.

13 years agoUse HTML5 email and url field types where appropriate
Tom Hughes [Fri, 21 Oct 2011 10:53:53 +0000 (11:53 +0100)]
Use HTML5 email and url field types where appropriate

13 years agoMark terms as raw to avoid escaping HTML in them
Tom Hughes [Wed, 19 Oct 2011 23:10:08 +0000 (00:10 +0100)]
Mark terms as raw to avoid escaping HTML in them

13 years agoForce an I18n reload to work around ordering problem
Tom Hughes [Wed, 19 Oct 2011 20:59:03 +0000 (21:59 +0100)]
Force an I18n reload to work around ordering problem

Unfortunately the rails-i18n-updater plugin adds the rails translations
to the load path after rails has already loaded the translations, so we
have to force a reload to get the translated versions.

13 years agoForce openid callbacks to use GET to avoid CSRF validation issues
Tom Hughes [Wed, 19 Oct 2011 19:34:06 +0000 (20:34 +0100)]
Force openid callbacks to use GET to avoid CSRF validation issues

13 years agoPreserve field values if the signup form fails validation
Tom Hughes [Wed, 19 Oct 2011 17:24:25 +0000 (18:24 +0100)]
Preserve field values if the signup form fails validation

13 years agoMark openid prompt as raw so the image is not escaped
Tom Hughes [Wed, 19 Oct 2011 16:59:25 +0000 (17:59 +0100)]
Mark openid prompt as raw so the image is not escaped

13 years agoUpdate to rails 3.1.1
Tom Hughes [Fri, 7 Oct 2011 18:46:19 +0000 (19:46 +0100)]
Update to rails 3.1.1

13 years agoServe swfobject via the assets pipeline
Tom Hughes [Fri, 7 Oct 2011 18:31:30 +0000 (19:31 +0100)]
Serve swfobject via the assets pipeline

13 years agoLoad memcached in case we are using it
Tom Hughes [Sun, 2 Oct 2011 16:10:37 +0000 (17:10 +0100)]
Load memcached in case we are using it

13 years agoMake database offline mode work
Tom Hughes [Sun, 2 Oct 2011 16:08:23 +0000 (17:08 +0100)]
Make database offline mode work

13 years agoTidy up the Gemfile a bit and document things
Tom Hughes [Sun, 2 Oct 2011 15:33:43 +0000 (16:33 +0100)]
Tidy up the Gemfile a bit and document things

13 years agoFixup some string escaping issues in the data browser
Tom Hughes [Fri, 30 Sep 2011 13:30:59 +0000 (14:30 +0100)]
Fixup some string escaping issues in the data browser

13 years agoMark the generated list of page links as raw
Tom Hughes [Fri, 30 Sep 2011 13:09:58 +0000 (14:09 +0100)]
Mark the generated list of page links as raw

13 years agoRemoved unused link_to_page from the trace helpers
Tom Hughes [Fri, 30 Sep 2011 13:08:22 +0000 (14:08 +0100)]
Removed unused link_to_page from the trace helpers

It was unused, and clashed link_to_page in the browser helpers as
apparently all helpers are loaded into all views...

13 years agoGet OAuth working, including a hack for Potlatch
Tom Hughes [Fri, 30 Sep 2011 11:02:15 +0000 (12:02 +0100)]
Get OAuth working, including a hack for Potlatch

13 years agoDisable CSRF token verification for API methods
Tom Hughes [Fri, 30 Sep 2011 08:57:59 +0000 (09:57 +0100)]
Disable CSRF token verification for API methods

13 years agoDrop the sql_session_store plugin
Tom Hughes [Fri, 30 Sep 2011 00:02:09 +0000 (01:02 +0100)]
Drop the sql_session_store plugin

The sql_session_store plugin doesn't work with rails 3 and doesn't
seem to be supported anymore, so drop it in favour of the builtin
database backed session storage.

13 years agoUpdate bundle
Tom Hughes [Thu, 29 Sep 2011 23:20:57 +0000 (00:20 +0100)]
Update bundle

13 years agoIgnore the compiled asset directory
Tom Hughes [Thu, 29 Sep 2011 21:46:01 +0000 (22:46 +0100)]
Ignore the compiled asset directory

13 years agoEnable asset compilation in product so precompile works
Tom Hughes [Thu, 29 Sep 2011 21:44:21 +0000 (22:44 +0100)]
Enable asset compilation in product so precompile works

Rails 3.1.0 has a bug where the assets:precompile rake task doesn't
turn on demand compilation, so referenced assets are not handled.

13 years agoUse the dynamic_form plugin as a gem
Tom Hughes [Wed, 28 Sep 2011 23:45:46 +0000 (00:45 +0100)]
Use the dynamic_form plugin as a gem

13 years agoUpdate rails translations
Tom Hughes [Wed, 28 Sep 2011 23:15:51 +0000 (00:15 +0100)]
Update rails translations

13 years agoAvoid noise on console when running tests
Tom Hughes [Wed, 28 Sep 2011 21:43:54 +0000 (22:43 +0100)]
Avoid noise on console when running tests

13 years agoRefactor AMF respone streaming
Tom Hughes [Wed, 28 Sep 2011 20:35:58 +0000 (21:35 +0100)]
Refactor AMF respone streaming

Using a Proc object for the response body is deprecated, so switch
to using an object with an each method that yields each response.

13 years agoCreate new diary entry records instead of cloning the fixture
Tom Hughes [Wed, 28 Sep 2011 17:25:27 +0000 (18:25 +0100)]
Create new diary entry records instead of cloning the fixture

Cloning fixtures doesn't seem to do a deep copy in rails 3.1 so the
attribute changes persist into other future cloned copies of the same
fixture. The fix is to create completely new records for each test.

13 years agoUse SecureRandom instead of the deprecated ActiveSupport::SecureRandom
Tom Hughes [Wed, 28 Sep 2011 11:56:12 +0000 (12:56 +0100)]
Use SecureRandom instead of the deprecated ActiveSupport::SecureRandom

13 years agoRename all ID columns that aren't unique
Tom Hughes [Sun, 25 Sep 2011 13:42:33 +0000 (14:42 +0100)]
Rename all ID columns that aren't unique

Having a table with a column called ID that is only part of the
primary key really doesn't work as rails likes to treat ID as a
special name so it becomes impossible to assign to it or read it.

13 years agoMark some locale lookups as raw
Tom Hughes [Mon, 26 Sep 2011 20:18:45 +0000 (21:18 +0100)]
Mark some locale lookups as raw

13 years agoFix form_for arguments
Tom Hughes [Sun, 25 Sep 2011 11:05:49 +0000 (12:05 +0100)]
Fix form_for arguments

13 years agoAdd rinku to get auto_link support back
Tom Hughes [Sun, 25 Sep 2011 10:51:17 +0000 (11:51 +0100)]
Add rinku to get auto_link support back

13 years agoRemoved some redundant files
Tom Hughes [Sun, 25 Sep 2011 10:41:18 +0000 (11:41 +0100)]
Removed some redundant files

13 years agoMake hack for file streaming work with rails 3.1.0
Tom Hughes [Sat, 24 Sep 2011 17:21:56 +0000 (18:21 +0100)]
Make hack for file streaming work with rails 3.1.0

13 years agoMake http_accept_language work with rails 3.1.0
Tom Hughes [Sat, 24 Sep 2011 17:06:23 +0000 (18:06 +0100)]
Make http_accept_language work with rails 3.1.0

13 years agoUpgrade to rails 3.1.0
Tom Hughes [Sat, 24 Sep 2011 17:06:10 +0000 (18:06 +0100)]
Upgrade to rails 3.1.0

13 years agoMake more use of named scopes
Tom Hughes [Thu, 22 Sep 2011 23:35:25 +0000 (00:35 +0100)]
Make more use of named scopes

13 years agoUpdate some more queries to use AREL in place of deprecated methods
Tom Hughes [Tue, 20 Sep 2011 22:22:11 +0000 (23:22 +0100)]
Update some more queries to use AREL in place of deprecated methods

13 years agoRequire version 1.1.0 or later of open_id_authentication
Tom Hughes [Sun, 18 Sep 2011 18:32:52 +0000 (19:32 +0100)]
Require version 1.1.0 or later of open_id_authentication

13 years agoRequire at least version 1.5.1 of validates_email_of as 1.5.0 is broken
Tom Hughes [Thu, 15 Sep 2011 22:04:03 +0000 (23:04 +0100)]
Require at least version 1.5.1 of validates_email_of as 1.5.0 is broken

13 years agoAdd generated bundle to repository
Tom Hughes [Thu, 15 Sep 2011 21:36:13 +0000 (22:36 +0100)]
Add generated bundle to repository

13 years agoFix escaping of unicode character in edit menu name
Tom Hughes [Thu, 15 Sep 2011 17:50:22 +0000 (18:50 +0100)]
Fix escaping of unicode character in edit menu name

13 years agoUpdate to rails 3.0.10 and composite_primary_key 3.1.10
Tom Hughes [Wed, 14 Sep 2011 10:02:05 +0000 (11:02 +0100)]
Update to rails 3.0.10 and composite_primary_key 3.1.10

13 years agoReplace deprecated response.redirected_to with response.redirect_url
Tom Hughes [Tue, 13 Sep 2011 23:29:11 +0000 (00:29 +0100)]
Replace deprecated response.redirected_to with response.redirect_url

13 years agoSwitch to using the gem version of open_id_authentication
Tom Hughes [Tue, 13 Sep 2011 23:25:13 +0000 (00:25 +0100)]
Switch to using the gem version of open_id_authentication

13 years agoRemove monkey patch added for rails 2
Tom Hughes [Tue, 13 Sep 2011 23:20:29 +0000 (00:20 +0100)]
Remove monkey patch added for rails 2

13 years agoUpdate to rails 3.0.9
Tom Hughes [Mon, 12 Sep 2011 21:17:41 +0000 (22:17 +0100)]
Update to rails 3.0.9