]>
git.openstreetmap.org Git - rails.git/log
Tom Hughes [Sun, 29 Jan 2012 23:01:59 +0000 (23:01 +0000)]
Update to rails 3.2.1
Tom Hughes [Tue, 24 Jan 2012 00:26:54 +0000 (00:26 +0000)]
Remove remnants of old lower case relation member types
Tom Hughes [Mon, 23 Jan 2012 23:10:16 +0000 (23:10 +0000)]
ActionController::UnknownAction is now AbstractController::ActionNotFound
Tom Hughes [Mon, 23 Jan 2012 18:27:47 +0000 (18:27 +0000)]
Require composite_primary_keys 5.0.0.rc1
Tom Hughes [Sat, 21 Jan 2012 15:11:35 +0000 (15:11 +0000)]
Turn session-persistence plugin into a library
Tom Hughes [Sat, 21 Jan 2012 15:00:56 +0000 (15:00 +0000)]
Switch to using deadlock_retry as a gem
Tom Hughes [Sat, 21 Jan 2012 13:23:27 +0000 (13:23 +0000)]
Replace the file_column plugin with paperclip
Tom Hughes [Sat, 21 Jan 2012 11:53:14 +0000 (11:53 +0000)]
Turn output_compression plugin into a library
Tom Hughes [Sat, 21 Jan 2012 11:27:04 +0000 (11:27 +0000)]
Turn classic_pagination plugin into a library
Tom Hughes [Sat, 21 Jan 2012 11:20:39 +0000 (11:20 +0000)]
Switch to using http_accept_language as a gem
Tom Hughes [Sat, 21 Jan 2012 11:15:42 +0000 (11:15 +0000)]
Ignore db/structure.sql
Tom Hughes [Sat, 21 Jan 2012 00:40:09 +0000 (00:40 +0000)]
Update to rails 3.2.0
Tom Hughes [Wed, 15 Feb 2012 17:47:42 +0000 (17:47 +0000)]
Restore borders to maps on various pages
Tom Hughes [Wed, 15 Feb 2012 16:24:43 +0000 (16:24 +0000)]
Reduce the effect of the user description on the spam score
Tom Hughes [Tue, 14 Feb 2012 15:47:21 +0000 (15:47 +0000)]
Revert "Log locale selection"
This reverts commit
101ee6ade2a24e8c468badb82d56c17b04e0df37 .
Tom Hughes [Tue, 14 Feb 2012 15:26:01 +0000 (15:26 +0000)]
Prefer an exact language match over a prefix match
Tom Hughes [Tue, 14 Feb 2012 14:57:29 +0000 (14:57 +0000)]
Log locale selection
Tom Hughes [Tue, 14 Feb 2012 12:03:54 +0000 (12:03 +0000)]
Don't remove the content area border on the copyright page
Tom Hughes [Tue, 14 Feb 2012 11:54:22 +0000 (11:54 +0000)]
Allow the copyright page to be requested in any locale
Tom Hughes [Tue, 14 Feb 2012 11:53:44 +0000 (11:53 +0000)]
Put pretty route for /copyright/locale first
Tom Hughes [Sun, 12 Feb 2012 15:36:02 +0000 (15:36 +0000)]
Use the same subhead style for search results as export
Tom Hughes [Sun, 12 Feb 2012 10:49:45 +0000 (10:49 +0000)]
Tidy up the stylesheets
Tom Hughes [Sun, 12 Feb 2012 10:45:17 +0000 (10:45 +0000)]
Improve sidebar styling a little
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.
Tom Hughes [Sat, 11 Feb 2012 13:11:52 +0000 (13:11 +0000)]
Tidy up the stylesheets
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.
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.
Tom Hughes [Sun, 12 Feb 2012 14:53:07 +0000 (14:53 +0000)]
Make ACLs match when the address is equal
Tom Hughes [Wed, 8 Feb 2012 22:38:02 +0000 (22:38 +0000)]
Add convenience methods to make ACL use simpler
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
Tom Hughes [Wed, 8 Feb 2012 21:41:46 +0000 (21:41 +0000)]
Don't escape mailto link on blocked signup page
Tom Hughes [Wed, 8 Feb 2012 21:40:21 +0000 (21:40 +0000)]
Add support for domain based ACLs
Tom Hughes [Wed, 8 Feb 2012 16:09:32 +0000 (16:09 +0000)]
Remove one more netmask reference
Tom Hughes [Wed, 8 Feb 2012 16:08:45 +0000 (16:08 +0000)]
Block any address with more than one suspended user
Tom Hughes [Wed, 8 Feb 2012 16:07:59 +0000 (16:07 +0000)]
Update for removal of netmask from ACLs
Tom Hughes [Wed, 8 Feb 2012 14:09:50 +0000 (14:09 +0000)]
Combine the address and netmask for an ACL in one column
Tom Hughes [Wed, 8 Feb 2012 14:08:49 +0000 (14:08 +0000)]
Stop pretending we support MySQL
Tom Hughes [Mon, 6 Feb 2012 14:06:16 +0000 (14:06 +0000)]
Update Potlatch 2 to
2.3-134-g8d7993f build
Tom Hughes [Mon, 6 Feb 2012 08:54:10 +0000 (08:54 +0000)]
Leave https wikipedia URLs unmolested
Tom Hughes [Sun, 5 Feb 2012 22:21:33 +0000 (22:21 +0000)]
Update Potlatch 2 to
2.3-133-g5bcdfba build
Tom Hughes [Sat, 4 Feb 2012 00:42:47 +0000 (00:42 +0000)]
Don't eager load models when the database is offline
Tom Hughes [Fri, 3 Feb 2012 22:40:35 +0000 (22:40 +0000)]
Handle character encodings in single part emails correctly
Tom MacWright [Tue, 31 Jan 2012 22:50:31 +0000 (17:50 -0500)]
Fixes and cleanups suggested by JSHint
Tom Hughes [Mon, 30 Jan 2012 22:33:41 +0000 (22:33 +0000)]
Correct mistakenly translated interpolation variable name
Tom Hughes [Mon, 30 Jan 2012 21:36:46 +0000 (21:36 +0000)]
Monkey patch mail to handle character encodings on ruby 1.8
Siebrand Mazeland [Mon, 30 Jan 2012 16:43:01 +0000 (17:43 +0100)]
Localisation updates from http://translatewiki.net.
Tom Hughes [Mon, 23 Jan 2012 21:28:01 +0000 (21:28 +0000)]
Use jQuery syntax instead of Prototype syntax
Tom Hughes [Mon, 23 Jan 2012 14:31:06 +0000 (14:31 +0000)]
Fix exception when a suspended user tries to login
Tom Hughes [Sat, 21 Jan 2012 15:59:27 +0000 (15:59 +0000)]
Include autogenerated links when calculating the spam score
Tom Hughes [Sat, 21 Jan 2012 00:44:34 +0000 (00:44 +0000)]
Update CPK to 4.1.2 and drop monkey patch
Tom Hughes [Wed, 18 Jan 2012 12:19:37 +0000 (12:19 +0000)]
Update Potlatch 2 to
2.3-129-g04001aa build
Tom Hughes [Tue, 17 Jan 2012 22:55:15 +0000 (22:55 +0000)]
Regenerate bundle with latest bundler
Tom Hughes [Tue, 17 Jan 2012 17:43:32 +0000 (17:43 +0000)]
Add an ACL check to allow trace downloads to be blocked
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.
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 .
Tom Hughes [Sat, 14 Jan 2012 13:36:49 +0000 (13:36 +0000)]
Increase the size of the diary RSS feed temporarily
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.
Tom Hughes [Sat, 14 Jan 2012 13:27:23 +0000 (13:27 +0000)]
Explicitly specify the format when expiring RSS feeds
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.
Tom Hughes [Sat, 14 Jan 2012 12:19:40 +0000 (12:19 +0000)]
Pluralize message counts properly
Tom Hughes [Tue, 10 Jan 2012 00:16:59 +0000 (00:16 +0000)]
Use the correct logo URL on error pages
Tom Hughes [Sat, 7 Jan 2012 15:43:27 +0000 (15:43 +0000)]
Don't cache user specific diary entry lists
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.
Tom Hughes [Sat, 7 Jan 2012 14:16:39 +0000 (14:16 +0000)]
Recognise wrapped timeout exceptions properly
Tom Hughes [Sat, 7 Jan 2012 12:48:09 +0000 (12:48 +0000)]
Don't show feed icons for friend and nearby user lists
Tom Hughes [Sat, 7 Jan 2012 11:51:59 +0000 (11:51 +0000)]
No need to restrict friend's diary entries to public users
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.
Tom Hughes [Fri, 6 Jan 2012 09:23:01 +0000 (09:23 +0000)]
Update Potlatch 2 to
2.3-128-g9aaa1de build
Tom Hughes [Fri, 6 Jan 2012 09:13:52 +0000 (09:13 +0000)]
Use OSM::Timer (and hence SystemTimer) consistently
Tom Hughes [Fri, 6 Jan 2012 09:11:23 +0000 (09:11 +0000)]
Use Timeout if SystemTimer isn't loaded
Tom Hughes [Thu, 5 Jan 2012 20:33:19 +0000 (20:33 +0000)]
Remove lib prefix from includes for ruby 1.9 compatibility
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
Jason Meinzer [Mon, 2 Jan 2012 23:24:47 +0000 (15:24 -0800)]
Qualify ActiveRecord::IrreversibleMigration
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
Tom Hughes [Wed, 4 Jan 2012 21:27:38 +0000 (21:27 +0000)]
Remove compatibility code for old versions of rails
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.
Tom Hughes [Wed, 4 Jan 2012 18:26:22 +0000 (18:26 +0000)]
Fix 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
Tom Hughes [Wed, 4 Jan 2012 00:02:34 +0000 (00:02 +0000)]
User getImageLocation to get the URLs for markers
Tom Hughes [Mon, 2 Jan 2012 17:13:15 +0000 (17:13 +0000)]
Remove unused code that triggered a javascript error
Tom Hughes [Mon, 2 Jan 2012 17:10:06 +0000 (17:10 +0000)]
Tell OpenLayers when we have resized the map
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.
Tom Hughes [Sat, 31 Dec 2011 00:25:04 +0000 (00:25 +0000)]
Allow OpenStreetMap.js to work with an unpatched OpenLayers
Tom Hughes [Fri, 30 Dec 2011 22:37:11 +0000 (22:37 +0000)]
Serve OpenSearch definition though the assets pipeline
Tom Hughes [Fri, 30 Dec 2011 22:32:55 +0000 (22:32 +0000)]
Serve the favicon through the assets pipeline
Tom Hughes [Fri, 30 Dec 2011 22:19:45 +0000 (22:19 +0000)]
Load the 404 tile through the URL rewriter
Tom Hughes [Fri, 30 Dec 2011 19:05:40 +0000 (19:05 +0000)]
Fix OpenLayers image URL rewriting
Tom Hughes [Fri, 30 Dec 2011 18:40:27 +0000 (18:40 +0000)]
Fetch OpenLayers from the same server as the embed page
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.
Tom Hughes [Fri, 30 Dec 2011 11:12:23 +0000 (11:12 +0000)]
Disable the donation drive message
Tom Hughes [Thu, 29 Dec 2011 15:23:21 +0000 (15:23 +0000)]
Update rails translations
Tom Hughes [Thu, 29 Dec 2011 15:07:31 +0000 (15:07 +0000)]
Update Potlatch 2 to
2.3-127-gbce938f build
Tom Hughes [Thu, 29 Dec 2011 15:06:14 +0000 (15:06 +0000)]
Remove fallback from nb to no
Now that we are using nb for our translations we can drop the fallback
from nb to no and just have one the other way. This also allows us to
drop the monkey patch to support mutually recursive fallbacks.
Tom Hughes [Thu, 29 Dec 2011 15:04:56 +0000 (15:04 +0000)]
Fix top level key in nb translation
Siebrand Mazeland [Sun, 25 Dec 2011 10:14:38 +0000 (11:14 +0100)]
Add dummy for 'no'.
Siebrand Mazeland [Sun, 25 Dec 2011 10:12:00 +0000 (11:12 +0100)]
Rename no to nb.
Siebrand Mazeland [Sun, 25 Dec 2011 10:11:18 +0000 (11:11 +0100)]
Remove config/locales/nb.yml pending rename from no to nb.
Andrzej Zaborowski [Fri, 23 Dec 2011 00:59:32 +0000 (01:59 +0100)]
Fix a nil check in Contributor Terms display
Siebrand Mazeland [Tue, 20 Dec 2011 18:10:33 +0000 (19:10 +0100)]
ssl -> SSL
Tom Hughes [Tue, 20 Dec 2011 00:07:07 +0000 (00:07 +0000)]
Allow a special ODBL message to be displayed at login