]>
git.openstreetmap.org Git - rails.git/log
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
Tom Hughes [Mon, 19 Dec 2011 17:54:46 +0000 (17:54 +0000)]
Fix loading of blank tiles on some browsers to use the asset pipeline
Siebrand Mazeland [Mon, 19 Dec 2011 00:37:54 +0000 (01:37 +0100)]
Localisation updates from http://translatewiki.net.
Tom Hughes [Sun, 18 Dec 2011 17:46:21 +0000 (17:46 +0000)]
Replace @body with @text again...
Tom Hughes [Sun, 18 Dec 2011 17:06:04 +0000 (17:06 +0000)]
Add stub files to allow various country specific rails locales to load
Tom Hughes [Sun, 18 Dec 2011 16:55:34 +0000 (16:55 +0000)]
Add a dummy sv-SE locale so the corresponding rails locale is loaded
Tom Hughes [Sun, 18 Dec 2011 16:51:14 +0000 (16:51 +0000)]
Use normal fallbacks to handle the no/nb confusion
This requires (for now) a monkey patch to the i18n fallback code, which
has been offered upstream as https://github.com/svenfuchs/i18n/pull/130.
Tom Hughes [Sun, 18 Dec 2011 15:51:03 +0000 (15:51 +0000)]
Monkey patch in an upstream fix for I18n::Backend::Fallbacks
This can be removed when a new i18n gem release happens. It also allows
us to remvoe an old monkey patch that worked around the problem for one
specific translation key.
Tom Hughes [Sun, 18 Dec 2011 15:49:21 +0000 (15:49 +0000)]
Use I18n::Backend::Simple.include directly
Tom Hughes [Sun, 18 Dec 2011 13:08:00 +0000 (13:08 +0000)]
Update rails translations
Tom Hughes [Fri, 16 Dec 2011 08:29:19 +0000 (08:29 +0000)]
Display the right title for friends' changesets
Tom Hughes [Fri, 16 Dec 2011 08:27:57 +0000 (08:27 +0000)]
Force a login to see your friends' changesets
Tom Hughes [Fri, 16 Dec 2011 08:25:59 +0000 (08:25 +0000)]
Fix double render error
Tom Hughes [Thu, 15 Dec 2011 21:47:43 +0000 (21:47 +0000)]
Convert friend changeset selection to use Arel queries
Tom Hughes [Thu, 15 Dec 2011 21:26:51 +0000 (21:26 +0000)]
Detabify
Mikel Maron [Thu, 15 Dec 2011 02:43:38 +0000 (21:43 -0500)]
Add support for viewing a list of your friends' changesets
Tom Hughes [Tue, 13 Dec 2011 21:49:25 +0000 (21:49 +0000)]
Add extra login tests for case insensitive usernames
Tom Hughes [Tue, 13 Dec 2011 21:25:37 +0000 (21:25 +0000)]
Look up names and emails case insensitively for authentication
If the name entered is not found then try a case insensitive lookup
and if that finds a single result then use it.
Tom Hughes [Tue, 13 Dec 2011 19:13:34 +0000 (19:13 +0000)]
Add some password recovery tests
Tom Hughes [Tue, 13 Dec 2011 17:42:42 +0000 (17:42 +0000)]
Look up email addresses case insensitively for password resets
If the email address entered is not found then try a case insensitive
lookup, and if that finds a single result then use it.
Tom Hughes [Tue, 13 Dec 2011 10:45:40 +0000 (10:45 +0000)]
Allow generic URIs to use the registry format
This should stop OAuth complaining when it tries to parse a mapzen
callback URI of the form mapzen://osm_callback
Tom Hughes [Tue, 13 Dec 2011 10:36:05 +0000 (10:36 +0000)]
Update Potlatch 2 to
2.3-121-geaece4c build
Tom Hughes [Tue, 13 Dec 2011 10:26:46 +0000 (10:26 +0000)]
Add some tests for updating users
Tom Hughes [Tue, 13 Dec 2011 10:26:30 +0000 (10:26 +0000)]
Cope with no openid_url being supplied
Tom Hughes [Tue, 13 Dec 2011 09:49:13 +0000 (09:49 +0000)]
Validate email addresses before confirming them
Tom Hughes [Mon, 12 Dec 2011 19:11:06 +0000 (19:11 +0000)]
Require user names and emails to be case insensitively unique
Any existing clashes are allowed to remain for now, byt any new
accounts, or changes to names on existing accounts, must be unique
without regard to case.
Tom Hughes [Sat, 10 Dec 2011 16:24:57 +0000 (16:24 +0000)]
Removed bogus attempt to look up the previous version
This lookup wasn't actually doing what the comment said it was doing
and I don't see any reason to output the previous details of the object
for a delete action.
Tom Hughes [Fri, 9 Dec 2011 09:34:29 +0000 (09:34 +0000)]
Display CT status on the user page
Tom Hughes [Fri, 9 Dec 2011 09:21:37 +0000 (09:21 +0000)]
Don't try and show the IP address when there isn't one
Tom Hughes [Thu, 8 Dec 2011 00:28:08 +0000 (00:28 +0000)]
Get the print stylesheet working again
Tom Hughes [Sun, 4 Dec 2011 17:35:01 +0000 (17:35 +0000)]
Wire up the en_US locale for Potlatch 2
Tom Hughes [Sun, 4 Dec 2011 17:33:15 +0000 (17:33 +0000)]
Update Potlatch 2 to
2.3-114-g3b2755d build
Tom Hughes [Sat, 3 Dec 2011 17:58:21 +0000 (17:58 +0000)]
Don't escape anything in text/plain message notifications
Tom Hughes [Fri, 2 Dec 2011 16:59:30 +0000 (16:59 +0000)]
Fix HTML escaping issues on the copyright page
Tom Hughes [Fri, 2 Dec 2011 11:05:43 +0000 (11:05 +0000)]
Enable the donation drive message
Tom Hughes [Fri, 2 Dec 2011 11:03:19 +0000 (11:03 +0000)]
Use jQuery syntax for the history request
Tom Hughes [Fri, 2 Dec 2011 08:36:08 +0000 (08:36 +0000)]
Handle non-multipart email
Tom Hughes [Thu, 1 Dec 2011 19:54:02 +0000 (19:54 +0000)]
Use either the HTML or the text part of an email, not both
Tom Hughes [Thu, 1 Dec 2011 19:17:16 +0000 (19:17 +0000)]
Add an HTML version of the message notification email
Tom Hughes [Thu, 1 Dec 2011 19:03:30 +0000 (19:03 +0000)]
Don't escape HTML in text/plain message notification emails
Andrzej Zaborowski [Tue, 29 Nov 2011 03:19:46 +0000 (04:19 +0100)]
Fix user traces link's :action parameter
Tom Hughes [Mon, 28 Nov 2011 21:52:16 +0000 (21:52 +0000)]
Add Japanese and Polish to supported Potlatch 2 languages
Tom Hughes [Mon, 28 Nov 2011 21:51:57 +0000 (21:51 +0000)]
Update Potlatch 2 to
2.3-112-ga132b0c build
Tom Hughes [Mon, 28 Nov 2011 21:47:34 +0000 (21:47 +0000)]
Update Potlatch 2 to
2.3-94-gad42530 build
Tom Hughes [Mon, 28 Nov 2011 09:56:44 +0000 (09:56 +0000)]
Convert prototype code to jQuery on user list page
Tom Hughes [Sun, 27 Nov 2011 17:40:23 +0000 (17:40 +0000)]
Make search work again
Tom Hughes [Sat, 26 Nov 2011 18:12:58 +0000 (18:12 +0000)]
Avoid having to condition on mobile mode
Dan Karran [Sat, 26 Nov 2011 17:24:19 +0000 (17:24 +0000)]
Mobile layout improvements
Make the map fill the available space on smaller screens, and
style the search results sidebar a bit better when ?query= is
added to the URL to trigger the search.
Tom Hughes [Sat, 26 Nov 2011 16:39:52 +0000 (16:39 +0000)]
When asked to edit an object centre on the correct location
Tom Hughes [Sat, 26 Nov 2011 16:20:41 +0000 (16:20 +0000)]
Trigger remote editor correctly
When the "edit object" link was used and the preferred editor was
set to remote the remote editor wwas not being triggered.
Tom Hughes [Sat, 26 Nov 2011 16:06:41 +0000 (16:06 +0000)]
Remove old unused monkey patch
Tom Hughes [Sat, 26 Nov 2011 16:01:57 +0000 (16:01 +0000)]
Make query cache disabling work again
Tom Hughes [Sat, 26 Nov 2011 14:41:40 +0000 (14:41 +0000)]
Update rails translations
Tom Hughes [Mon, 21 Nov 2011 09:15:41 +0000 (09:15 +0000)]
Switch from Prototype to jQuery
Tom Hughes [Sat, 26 Nov 2011 00:15:12 +0000 (00:15 +0000)]
Wrap the OpenLayers.Util.createDiv routine
Tom Hughes [Sat, 26 Nov 2011 00:07:45 +0000 (00:07 +0000)]
Wrap another OpenLayers image creation routine
Tom Hughes [Fri, 25 Nov 2011 23:05:44 +0000 (23:05 +0000)]
Handle openlayers.js as a template
Tom Hughes [Fri, 25 Nov 2011 22:32:16 +0000 (22:32 +0000)]
Force all OpenLayers resources to load through the asset pipeline
Tom Hughes [Fri, 25 Nov 2011 20:39:25 +0000 (20:39 +0000)]
Precompile stylesheet for OpenLayers
Tom Hughes [Fri, 25 Nov 2011 20:13:03 +0000 (20:13 +0000)]
Precompile openlayers wrapper
Tom Hughes [Fri, 25 Nov 2011 20:07:50 +0000 (20:07 +0000)]
Serve OpenLayers through the asset pipeline
Tom Hughes [Fri, 25 Nov 2011 18:43:51 +0000 (18:43 +0000)]
Fix javascript
Matt Amos [Fri, 25 Nov 2011 15:11:37 +0000 (15:11 +0000)]
Always update perma and shortlinks, keeping layers
Tom Hughes [Fri, 25 Nov 2011 13:45:25 +0000 (13:45 +0000)]
Never disable a base layer
Tom Hughes [Fri, 25 Nov 2011 11:59:17 +0000 (11:59 +0000)]
Add attribution to cycle and transport layers
Tom Hughes [Thu, 24 Nov 2011 22:46:44 +0000 (22:46 +0000)]
Add attribution to the MapQuest layer
Tom Hughes [Thu, 24 Nov 2011 22:03:04 +0000 (22:03 +0000)]
Remove the noname layer and add the transport and MapQuest layers
Tom Hughes [Fri, 25 Nov 2011 09:41:15 +0000 (09:41 +0000)]
Make sure all forms have the correct authenticity token
A cached page may include forms, which will then have the wrong
authenticity token, so after the page has finished loading we fix
up those tokens using the one from the meta tags which will always
be correct as we never cache the layout.
Matt Amos [Thu, 24 Nov 2011 22:15:43 +0000 (22:15 +0000)]
Replace @ with ~ in the shortlink
This should help Twitter's horribly broken URL detection algorithm
not screw up shortlinks from OSM.