]> git.openstreetmap.org Git - rails.git/log
rails.git
12 years agoAvoid double render error
Tom Hughes [Sun, 19 Feb 2012 11:04:59 +0000 (11:04 +0000)]
Avoid double render error

12 years agoDon't double up newlines in the log
Tom Hughes [Sun, 19 Feb 2012 10:52:54 +0000 (10:52 +0000)]
Don't double up newlines in the log

12 years agoCompressedMemCacheStore has been replaced by MemCacheStore
Tom Hughes [Sun, 19 Feb 2012 10:43:37 +0000 (10:43 +0000)]
CompressedMemCacheStore has been replaced by MemCacheStore

12 years agoExplicitly disable the layout for actions which don't want it
Tom Hughes [Wed, 15 Feb 2012 10:08:43 +0000 (10:08 +0000)]
Explicitly disable the layout for actions which don't want it

12 years agoRequire version 1.2.0 of deadlock retry for postgres support
Tom Hughes [Wed, 15 Feb 2012 08:35:05 +0000 (08:35 +0000)]
Require version 1.2.0 of deadlock retry for postgres support

12 years agoRemove ancient (and unused) composite_primary_keys gem
Tom Hughes [Mon, 13 Feb 2012 10:43:51 +0000 (10:43 +0000)]
Remove ancient (and unused) composite_primary_keys gem

12 years agoMake sure we don't inherit old tags when parsing XML for objects
Tom Hughes [Mon, 13 Feb 2012 10:29:03 +0000 (10:29 +0000)]
Make sure we don't inherit old tags when parsing XML for objects

12 years agoReplace deprecated methods with modern equivalents
Tom Hughes [Mon, 13 Feb 2012 09:32:10 +0000 (09:32 +0000)]
Replace deprecated methods with modern equivalents

12 years agoequire composite_primary_keys 5.0.0
Tom Hughes [Mon, 13 Feb 2012 08:43:50 +0000 (08:43 +0000)]
equire composite_primary_keys 5.0.0

12 years agoRemove backported code now we are using mail 2.4.1
Tom Hughes [Mon, 30 Jan 2012 22:53:40 +0000 (22:53 +0000)]
Remove backported code now we are using mail 2.4.1

12 years agoUpdate to rails 3.2.1
Tom Hughes [Sun, 29 Jan 2012 23:01:59 +0000 (23:01 +0000)]
Update to rails 3.2.1

12 years agoRemove remnants of old lower case relation member types
Tom Hughes [Tue, 24 Jan 2012 00:26:54 +0000 (00:26 +0000)]
Remove remnants of old lower case relation member types

12 years agoActionController::UnknownAction is now AbstractController::ActionNotFound
Tom Hughes [Mon, 23 Jan 2012 23:10:16 +0000 (23:10 +0000)]
ActionController::UnknownAction is now AbstractController::ActionNotFound

12 years agoRequire composite_primary_keys 5.0.0.rc1
Tom Hughes [Mon, 23 Jan 2012 18:27:47 +0000 (18:27 +0000)]
Require composite_primary_keys 5.0.0.rc1

12 years agoTurn session-persistence plugin into a library
Tom Hughes [Sat, 21 Jan 2012 15:11:35 +0000 (15:11 +0000)]
Turn session-persistence plugin into a library

12 years agoSwitch to using deadlock_retry as a gem
Tom Hughes [Sat, 21 Jan 2012 15:00:56 +0000 (15:00 +0000)]
Switch to using deadlock_retry as a gem

12 years agoReplace the file_column plugin with paperclip
Tom Hughes [Sat, 21 Jan 2012 13:23:27 +0000 (13:23 +0000)]
Replace the file_column plugin with paperclip

12 years agoTurn output_compression plugin into a library
Tom Hughes [Sat, 21 Jan 2012 11:53:14 +0000 (11:53 +0000)]
Turn output_compression plugin into a library

12 years agoTurn classic_pagination plugin into a library
Tom Hughes [Sat, 21 Jan 2012 11:27:04 +0000 (11:27 +0000)]
Turn classic_pagination plugin into a library

12 years agoSwitch to using http_accept_language as a gem
Tom Hughes [Sat, 21 Jan 2012 11:20:39 +0000 (11:20 +0000)]
Switch to using http_accept_language as a gem

12 years agoIgnore db/structure.sql
Tom Hughes [Sat, 21 Jan 2012 11:15:42 +0000 (11:15 +0000)]
Ignore db/structure.sql

12 years agoUpdate to rails 3.2.0
Tom Hughes [Sat, 21 Jan 2012 00:40:09 +0000 (00:40 +0000)]
Update to rails 3.2.0

12 years agoRestore borders to maps on various pages
Tom Hughes [Wed, 15 Feb 2012 17:47:42 +0000 (17:47 +0000)]
Restore borders to maps on various pages

12 years agoReduce the effect of the user description on the spam score
Tom Hughes [Wed, 15 Feb 2012 16:24:43 +0000 (16:24 +0000)]
Reduce the effect of the user description on the spam score

12 years agoRevert "Log locale selection"
Tom Hughes [Tue, 14 Feb 2012 15:47:21 +0000 (15:47 +0000)]
Revert "Log locale selection"

This reverts commit 101ee6ade2a24e8c468badb82d56c17b04e0df37.

12 years agoPrefer an exact language match over a prefix match
Tom Hughes [Tue, 14 Feb 2012 15:26:01 +0000 (15:26 +0000)]
Prefer an exact language match over a prefix match

12 years agoLog locale selection
Tom Hughes [Tue, 14 Feb 2012 14:57:29 +0000 (14:57 +0000)]
Log locale selection

12 years agoDon't remove the content area border on the copyright page
Tom Hughes [Tue, 14 Feb 2012 12:03:54 +0000 (12:03 +0000)]
Don't remove the content area border on the copyright page

12 years agoAllow the copyright page to be requested in any locale
Tom Hughes [Tue, 14 Feb 2012 11:54:22 +0000 (11:54 +0000)]
Allow the copyright page to be requested in any locale

12 years agoPut pretty route for /copyright/locale first
Tom Hughes [Tue, 14 Feb 2012 11:53:44 +0000 (11:53 +0000)]
Put pretty route for /copyright/locale first

12 years agoUse the same subhead style for search results as export
Tom Hughes [Sun, 12 Feb 2012 15:36:02 +0000 (15:36 +0000)]
Use the same subhead style for search results as export

12 years agoTidy up the stylesheets
Tom Hughes [Sun, 12 Feb 2012 10:49:45 +0000 (10:49 +0000)]
Tidy up the stylesheets

12 years agoImprove sidebar styling a little
Tom Hughes [Sun, 12 Feb 2012 10:45:17 +0000 (10:45 +0000)]
Improve sidebar styling a little

12 years agoFix sidebar border and padding, tweak styles to simplify borders
Tom MacWright [Sat, 11 Feb 2012 17:50:01 +0000 (12:50 -0500)]
Fix sidebar border and padding, tweak styles to simplify borders

Move font sizes and line heights up in the stylesheet structure
to make the left element more uniform. Make the padding of the
menu the same as the other elements.

12 years agoTidy up the stylesheets
Tom Hughes [Sat, 11 Feb 2012 13:11:52 +0000 (13:11 +0000)]
Tidy up the stylesheets

12 years agoRead the content area size before making any changes
Tom Hughes [Sat, 11 Feb 2012 11:32:08 +0000 (11:32 +0000)]
Read the content area size before making any changes

Adjusting the position of the map can impact the apparent size of
the content area, so make sure we read that before we start making
any changes to the position and size of the map.

12 years agoCleanup style
Tom MacWright [Thu, 9 Feb 2012 17:44:32 +0000 (12:44 -0500)]
Cleanup style

This is a mild restyling of OpenStreetMap. Changes include:

  * Remove margin from map, add more margin to text content
  * Rearrange permalink & link buttons and gives them a background
  * Pull OpenStreetMap text below logo along with subtitle
  * Simplify sidebar styling
  * Move towards a baseline, start to consolidate text size and line height

This is tested with LTR, RTL, and the compact mode, and looks good. Looks
more uniform in older browsers because it relies less on round corners.

12 years agoMake ACLs match when the address is equal
Tom Hughes [Sun, 12 Feb 2012 14:53:07 +0000 (14:53 +0000)]
Make ACLs match when the address is equal

12 years agoAdd convenience methods to make ACL use simpler
Tom Hughes [Wed, 8 Feb 2012 22:38:02 +0000 (22:38 +0000)]
Add convenience methods to make ACL use simpler

12 years agoDon't check the ACL unless we're creating a new user
Tom Hughes [Wed, 8 Feb 2012 22:35:13 +0000 (22:35 +0000)]
Don't check the ACL unless we're creating a new user

12 years agoDon't escape mailto link on blocked signup page
Tom Hughes [Wed, 8 Feb 2012 21:41:46 +0000 (21:41 +0000)]
Don't escape mailto link on blocked signup page

12 years agoAdd support for domain based ACLs
Tom Hughes [Wed, 8 Feb 2012 21:40:21 +0000 (21:40 +0000)]
Add support for domain based ACLs

12 years agoRemove one more netmask reference
Tom Hughes [Wed, 8 Feb 2012 16:09:32 +0000 (16:09 +0000)]
Remove one more netmask reference

12 years agoBlock any address with more than one suspended user
Tom Hughes [Wed, 8 Feb 2012 16:08:45 +0000 (16:08 +0000)]
Block any address with more than one suspended user

12 years agoUpdate for removal of netmask from ACLs
Tom Hughes [Wed, 8 Feb 2012 16:07:59 +0000 (16:07 +0000)]
Update for removal of netmask from ACLs

12 years agoCombine the address and netmask for an ACL in one column
Tom Hughes [Wed, 8 Feb 2012 14:09:50 +0000 (14:09 +0000)]
Combine the address and netmask for an ACL in one column

12 years agoStop pretending we support MySQL
Tom Hughes [Wed, 8 Feb 2012 14:08:49 +0000 (14:08 +0000)]
Stop pretending we support MySQL

12 years agoUpdate Potlatch 2 to 2.3-134-g8d7993f build
Tom Hughes [Mon, 6 Feb 2012 14:06:16 +0000 (14:06 +0000)]
Update Potlatch 2 to 2.3-134-g8d7993f build

12 years agoLeave https wikipedia URLs unmolested
Tom Hughes [Mon, 6 Feb 2012 08:54:10 +0000 (08:54 +0000)]
Leave https wikipedia URLs unmolested

12 years agoUpdate Potlatch 2 to 2.3-133-g5bcdfba build
Tom Hughes [Sun, 5 Feb 2012 22:21:33 +0000 (22:21 +0000)]
Update Potlatch 2 to 2.3-133-g5bcdfba build

12 years agoDon't eager load models when the database is offline
Tom Hughes [Sat, 4 Feb 2012 00:42:47 +0000 (00:42 +0000)]
Don't eager load models when the database is offline

12 years agoHandle character encodings in single part emails correctly
Tom Hughes [Fri, 3 Feb 2012 22:40:35 +0000 (22:40 +0000)]
Handle character encodings in single part emails correctly

12 years agoFixes and cleanups suggested by JSHint
Tom MacWright [Tue, 31 Jan 2012 22:50:31 +0000 (17:50 -0500)]
Fixes and cleanups suggested by JSHint

12 years agoCorrect mistakenly translated interpolation variable name
Tom Hughes [Mon, 30 Jan 2012 22:33:41 +0000 (22:33 +0000)]
Correct mistakenly translated interpolation variable name

12 years agoMonkey patch mail to handle character encodings on ruby 1.8
Tom Hughes [Mon, 30 Jan 2012 21:36:46 +0000 (21:36 +0000)]
Monkey patch mail to handle character encodings on ruby 1.8

12 years agoLocalisation updates from http://translatewiki.net.
Siebrand Mazeland [Mon, 30 Jan 2012 16:43:01 +0000 (17:43 +0100)]
Localisation updates from http://translatewiki.net.

12 years agoUse jQuery syntax instead of Prototype syntax
Tom Hughes [Mon, 23 Jan 2012 21:28:01 +0000 (21:28 +0000)]
Use jQuery syntax instead of Prototype syntax

12 years agoFix exception when a suspended user tries to login
Tom Hughes [Mon, 23 Jan 2012 14:31:06 +0000 (14:31 +0000)]
Fix exception when a suspended user tries to login

12 years agoInclude autogenerated links when calculating the spam score
Tom Hughes [Sat, 21 Jan 2012 15:59:27 +0000 (15:59 +0000)]
Include autogenerated links when calculating the spam score

12 years agoUpdate CPK to 4.1.2 and drop monkey patch
Tom Hughes [Sat, 21 Jan 2012 00:44:34 +0000 (00:44 +0000)]
Update CPK to 4.1.2 and drop monkey patch

12 years agoUpdate Potlatch 2 to 2.3-129-g04001aa build
Tom Hughes [Wed, 18 Jan 2012 12:19:37 +0000 (12:19 +0000)]
Update Potlatch 2 to 2.3-129-g04001aa build

12 years agoRegenerate bundle with latest bundler
Tom Hughes [Tue, 17 Jan 2012 22:55:15 +0000 (22:55 +0000)]
Regenerate bundle with latest bundler

12 years agoAdd an ACL check to allow trace downloads to be blocked
Tom Hughes [Tue, 17 Jan 2012 17:43:32 +0000 (17:43 +0000)]
Add an ACL check to allow trace downloads to be blocked

12 years agoRailsify the box link on the browse changeset page
Shaun McDonald [Sun, 15 Jan 2012 00:59:26 +0000 (00:59 +0000)]
Railsify the box link on the browse changeset page

This removes the whitespace in the url, and makes the root path a
named route so that it can be nicely referenced.

12 years agoRevert "Increase the size of the diary RSS feed temporarily"
Tom Hughes [Mon, 16 Jan 2012 17:50:23 +0000 (17:50 +0000)]
Revert "Increase the size of the diary RSS feed temporarily"

This reverts commit ccd7882bcfdda436e1b89422a96026ce328c261b.

12 years agoIncrease the size of the diary RSS feed temporarily
Tom Hughes [Sat, 14 Jan 2012 13:36:49 +0000 (13:36 +0000)]
Increase the size of the diary RSS feed temporarily

12 years agoSort node ids in test_ways_for_node
Tom Hughes [Sat, 14 Jan 2012 13:35:30 +0000 (13:35 +0000)]
Sort node ids in test_ways_for_node

The ways_for_node method on the way controller does not guarantee
to return nodes in any particular order so we shouldn't rely on it
doing so in our tests.

12 years agoExplicitly specify the format when expiring RSS feeds
Tom Hughes [Sat, 14 Jan 2012 13:27:23 +0000 (13:27 +0000)]
Explicitly specify the format when expiring RSS feeds

12 years agoMonkey patch ActionCachePath to fix a bug
Tom Hughes [Sat, 14 Jan 2012 13:26:01 +0000 (13:26 +0000)]
Monkey patch ActionCachePath to fix a bug

When infer_extension is not set ActionCachePath does not set the
extension from any explicitly specified format, and hence expiry
produces cache keys which don't have any extension and don't match
the keys generated when the cache entry was created.

12 years agoPluralize message counts properly
Tom Hughes [Sat, 14 Jan 2012 12:19:40 +0000 (12:19 +0000)]
Pluralize message counts properly

12 years agoUse the correct logo URL on error pages
Tom Hughes [Tue, 10 Jan 2012 00:16:59 +0000 (00:16 +0000)]
Use the correct logo URL on error pages

12 years agoDon't cache user specific diary entry lists
Tom Hughes [Sat, 7 Jan 2012 15:43:27 +0000 (15:43 +0000)]
Don't cache user specific diary entry lists

12 years agoTry really hard to find out if the real exception was a timeout
Tom Hughes [Sat, 7 Jan 2012 15:03:25 +0000 (15:03 +0000)]
Try really hard to find out if the real exception was a timeout

Helpfully rails manages to wrap the actual exception that occurred
in at least one, and sometimes two further levels of exception, one
of which does preserve the original exception except as text.

12 years agoRecognise wrapped timeout exceptions properly
Tom Hughes [Sat, 7 Jan 2012 14:16:39 +0000 (14:16 +0000)]
Recognise wrapped timeout exceptions properly

12 years agoDon't show feed icons for friend and nearby user lists
Tom Hughes [Sat, 7 Jan 2012 12:48:09 +0000 (12:48 +0000)]
Don't show feed icons for friend and nearby user lists

12 years agoNo need to restrict friend's diary entries to public users
Tom Hughes [Sat, 7 Jan 2012 11:51:59 +0000 (11:51 +0000)]
No need to restrict friend's diary entries to public users

12 years agoAdd some more social features
Mikel Maron [Fri, 6 Jan 2012 21:25:09 +0000 (16:25 -0500)]
Add some more social features

Add a view showing changesets by nearby users, and views showing
diary entries by friends and nearby users.

12 years agoUpdate Potlatch 2 to 2.3-128-g9aaa1de build
Tom Hughes [Fri, 6 Jan 2012 09:23:01 +0000 (09:23 +0000)]
Update Potlatch 2 to 2.3-128-g9aaa1de build

12 years agoUse OSM::Timer (and hence SystemTimer) consistently
Tom Hughes [Fri, 6 Jan 2012 09:13:52 +0000 (09:13 +0000)]
Use OSM::Timer (and hence SystemTimer) consistently

12 years agoUse Timeout if SystemTimer isn't loaded
Tom Hughes [Fri, 6 Jan 2012 09:11:23 +0000 (09:11 +0000)]
Use Timeout if SystemTimer isn't loaded

12 years agoRemove lib prefix from includes for ruby 1.9 compatibility
Tom Hughes [Thu, 5 Jan 2012 20:33:19 +0000 (20:33 +0000)]
Remove lib prefix from includes for ruby 1.9 compatibility

12 years agoDon't try and monkey patch database drivers that aren't loaded
Tom Hughes [Thu, 5 Jan 2012 18:18:22 +0000 (18:18 +0000)]
Don't try and monkey patch database drivers that aren't loaded

12 years agoQualify ActiveRecord::IrreversibleMigration
Jason Meinzer [Mon, 2 Jan 2012 23:24:47 +0000 (15:24 -0800)]
Qualify ActiveRecord::IrreversibleMigration

12 years agoFix ruby 1.9 syntax error caused by space before parens on method call
Jason Meinzer [Mon, 2 Jan 2012 23:25:39 +0000 (15:25 -0800)]
Fix ruby 1.9 syntax error caused by space before parens on method call

12 years agoRemove compatibility code for old versions of rails
Tom Hughes [Wed, 4 Jan 2012 21:27:38 +0000 (21:27 +0000)]
Remove compatibility code for old versions of rails

12 years agoOnly use SystemTimer on MRI 1.8 as it is superfluous elsewhere
Jason Meinzer [Mon, 2 Jan 2012 21:31:10 +0000 (13:31 -0800)]
Only use SystemTimer on MRI 1.8 as it is superfluous elsewhere

See http://ph7spot.com/musings/system-timer for why SystemTimer is
needed on MRI 1.8 and not anywhere else.

12 years agoFix up case statement syntax for ruby 1.9 compatibility
Tom Hughes [Wed, 4 Jan 2012 18:26:22 +0000 (18:26 +0000)]
Fix up case statement syntax for ruby 1.9 compatibility

12 years agoFix up case statement syntax for ruby 1.9 compatibility
Jason Meinzer [Mon, 2 Jan 2012 21:11:44 +0000 (13:11 -0800)]
Fix up case statement syntax for ruby 1.9 compatibility

12 years agoUser getImageLocation to get the URLs for markers
Tom Hughes [Wed, 4 Jan 2012 00:02:34 +0000 (00:02 +0000)]
User getImageLocation to get the URLs for markers

12 years agoRemove unused code that triggered a javascript error
Tom Hughes [Mon, 2 Jan 2012 17:13:15 +0000 (17:13 +0000)]
Remove unused code that triggered a javascript error

12 years agoTell OpenLayers when we have resized the map
Tom Hughes [Mon, 2 Jan 2012 17:10:06 +0000 (17:10 +0000)]
Tell OpenLayers when we have resized the map

12 years agoAllow the export box to be moved and resized
Tom Hughes [Fri, 23 Apr 2010 15:57:40 +0000 (16:57 +0100)]
Allow the export box to be moved and resized

Use the new OpenLayers TransformFeature control to allow any box
drawn by the user to select an export area to be moved or resized
after it is drawn.

12 years agoAllow OpenStreetMap.js to work with an unpatched OpenLayers
Tom Hughes [Sat, 31 Dec 2011 00:25:04 +0000 (00:25 +0000)]
Allow OpenStreetMap.js to work with an unpatched OpenLayers

12 years agoServe OpenSearch definition though the assets pipeline
Tom Hughes [Fri, 30 Dec 2011 22:37:11 +0000 (22:37 +0000)]
Serve OpenSearch definition though the assets pipeline

12 years agoServe the favicon through the assets pipeline
Tom Hughes [Fri, 30 Dec 2011 22:32:55 +0000 (22:32 +0000)]
Serve the favicon through the assets pipeline

12 years agoLoad the 404 tile through the URL rewriter
Tom Hughes [Fri, 30 Dec 2011 22:19:45 +0000 (22:19 +0000)]
Load the 404 tile through the URL rewriter

12 years agoFix OpenLayers image URL rewriting
Tom Hughes [Fri, 30 Dec 2011 19:05:40 +0000 (19:05 +0000)]
Fix OpenLayers image URL rewriting

12 years agoFetch OpenLayers from the same server as the embed page
Tom Hughes [Fri, 30 Dec 2011 18:40:27 +0000 (18:40 +0000)]
Fetch OpenLayers from the same server as the embed page

12 years agoPatch OpenLayers to make URL rewriting easier
Tom Hughes [Fri, 30 Dec 2011 18:32:53 +0000 (18:32 +0000)]
Patch OpenLayers to make URL rewriting easier

This provides a single routine that can be overridden to rewrite
all image URLs to use the asset pipeine.

12 years agoDisable the donation drive message
Tom Hughes [Fri, 30 Dec 2011 11:12:23 +0000 (11:12 +0000)]
Disable the donation drive message