]>
git.openstreetmap.org Git - rails.git/log
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.
Tom Hughes [Thu, 24 Nov 2011 22:24:45 +0000 (22:24 +0000)]
Don't escape links in "flash required" message
Tom Hughes [Thu, 24 Nov 2011 21:31:54 +0000 (21:31 +0000)]
Make sure the maximum scale is set when export is opened
Tom Hughes [Thu, 24 Nov 2011 21:21:17 +0000 (21:21 +0000)]
Don't escape the license link
Tom Hughes [Thu, 24 Nov 2011 19:23:12 +0000 (19:23 +0000)]
Update Potlatch 2 to
2.3-94-gad42530 build
Tom Hughes [Thu, 24 Nov 2011 09:42:04 +0000 (09:42 +0000)]
Log any session that is reset due to a username mismatch
Tom Hughes [Wed, 23 Nov 2011 00:11:51 +0000 (00:11 +0000)]
Don't escape the heading on a user block
Tom Hughes [Tue, 22 Nov 2011 22:45:24 +0000 (22:45 +0000)]
Don't escape HTML in the message shown to anonymous users
Tom Hughes [Tue, 22 Nov 2011 12:19:41 +0000 (12:19 +0000)]
Add feed action to relevant filters
Siebrand Mazeland [Mon, 21 Nov 2011 21:02:37 +0000 (22:02 +0100)]
Localisation updates from http://translatewiki.net.
Tom Hughes [Mon, 21 Nov 2011 09:57:58 +0000 (09:57 +0000)]
Replace HTML entities with normal character equivalents
Tom Hughes [Mon, 21 Nov 2011 09:19:04 +0000 (09:19 +0000)]
Update to rails 3.1.3
Tom Hughes [Sat, 19 Nov 2011 17:12:40 +0000 (17:12 +0000)]
Add some OAuth tests
Tom Hughes [Sat, 19 Nov 2011 17:11:54 +0000 (17:11 +0000)]
Add the OAuth verifier to 1.0a callbacks correctly
Tom Hughes [Sat, 19 Nov 2011 12:29:43 +0000 (12:29 +0000)]
Generate correct URLs for changeset feeds
Tom Hughes [Sat, 19 Nov 2011 00:25:17 +0000 (00:25 +0000)]
Override oauth1_authorize pending a fixed version of oauth-plugin
Tom Hughes [Fri, 18 Nov 2011 17:14:05 +0000 (17:14 +0000)]
Update Potlatch 2 to
2.3-92-g0b8633d build
Tom Hughes [Fri, 18 Nov 2011 16:50:54 +0000 (16:50 +0000)]
Pass sql_for_area a BoundingBox object
Tom Hughes [Fri, 18 Nov 2011 10:21:37 +0000 (10:21 +0000)]
Monkey patch CPK to fix problems with polymorphic has_many
Tom Hughes [Fri, 18 Nov 2011 09:23:40 +0000 (09:23 +0000)]
Update to rails 3.1.2
Tom Hughes [Thu, 17 Nov 2011 11:33:48 +0000 (11:33 +0000)]
Spell way_id correctly
Tom Hughes [Thu, 17 Nov 2011 11:03:27 +0000 (11:03 +0000)]
Fixed escaping in title
Tom Hughes [Thu, 17 Nov 2011 11:02:42 +0000 (11:02 +0000)]
Removed bogus characters from form_for
Tom Hughes [Thu, 17 Nov 2011 10:00:47 +0000 (10:00 +0000)]
Fix formatting of user list
Tom Hughes [Thu, 17 Nov 2011 09:53:21 +0000 (09:53 +0000)]
Filter out the current way correctly
Tom Hughes [Wed, 16 Nov 2011 21:06:47 +0000 (21:06 +0000)]
Make OAuth work again
Tom Hughes [Wed, 16 Nov 2011 15:55:33 +0000 (15:55 +0000)]
Make the text direction style come before the screen size style
Tom Hughes [Wed, 16 Nov 2011 15:42:43 +0000 (15:42 +0000)]
Update message delivery script to work with rails 3
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.
Tom Hughes [Wed, 16 Nov 2011 10:05:39 +0000 (10:05 +0000)]
Make the username cookie permanent
Tom Hughes [Wed, 16 Nov 2011 09:55:36 +0000 (09:55 +0000)]
Yet more raw markers
Tom Hughes [Wed, 16 Nov 2011 09:21:23 +0000 (09:21 +0000)]
Explicitly select the default locale if we have no better ideas
Tom Hughes [Wed, 16 Nov 2011 08:56:35 +0000 (08:56 +0000)]
Add some logging to help diagnose changeset feed locale issue
Tom Hughes [Wed, 16 Nov 2011 08:48:05 +0000 (08:48 +0000)]
Add some more raw markers
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 .
Tom Hughes [Tue, 15 Nov 2011 14:49:38 +0000 (14:49 +0000)]
Looks like @body is special somehow so use @text instead
Tom Hughes [Tue, 15 Nov 2011 12:56:38 +0000 (12:56 +0000)]
Put changeset feeds before lists in the routes
Tom Hughes [Tue, 15 Nov 2011 10:48:30 +0000 (10:48 +0000)]
Use asset_path to find the arrow icon
Tom Hughes [Tue, 15 Nov 2011 09:58:30 +0000 (09:58 +0000)]
Remove debugging code