]> git.openstreetmap.org Git - rails.git/log
rails.git
10 years agoStop pretending we support MySQL
Tom Hughes [Wed, 8 Feb 2012 14:08:49 +0000 (14:08 +0000)]
Stop pretending we support MySQL

10 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

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

10 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

10 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

10 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

10 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

10 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

10 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

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

10 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

10 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

10 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

10 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

10 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

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

10 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

10 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.

10 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.

10 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

10 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.

10 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

10 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.

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

10 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

10 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

10 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.

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

10 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

10 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

10 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.

10 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

10 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

10 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

10 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

10 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

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

10 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

10 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

10 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.

10 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

10 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

10 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

10 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

10 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

10 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.

10 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

10 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

10 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

10 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

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

10 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

10 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.

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

10 years agoUpdate rails translations
Tom Hughes [Thu, 29 Dec 2011 15:23:21 +0000 (15:23 +0000)]
Update rails translations

10 years agoUpdate Potlatch 2 to 2.3-127-gbce938f build
Tom Hughes [Thu, 29 Dec 2011 15:07:31 +0000 (15:07 +0000)]
Update Potlatch 2 to 2.3-127-gbce938f build

10 years agoRemove fallback from nb to no
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.

10 years agoFix top level key in nb translation
Tom Hughes [Thu, 29 Dec 2011 15:04:56 +0000 (15:04 +0000)]
Fix top level key in nb translation

10 years agoAdd dummy for 'no'.
Siebrand Mazeland [Sun, 25 Dec 2011 10:14:38 +0000 (11:14 +0100)]
Add dummy for 'no'.

10 years agoRename no to nb.
Siebrand Mazeland [Sun, 25 Dec 2011 10:12:00 +0000 (11:12 +0100)]
Rename no to nb.

10 years agoRemove config/locales/nb.yml pending rename from 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.

10 years agoFix a nil check in Contributor Terms display
Andrzej Zaborowski [Fri, 23 Dec 2011 00:59:32 +0000 (01:59 +0100)]
Fix a nil check in Contributor Terms display

10 years agossl -> SSL
Siebrand Mazeland [Tue, 20 Dec 2011 18:10:33 +0000 (19:10 +0100)]
ssl -> SSL

10 years agoAllow a special ODBL message to be displayed at login
Tom Hughes [Tue, 20 Dec 2011 00:07:07 +0000 (00:07 +0000)]
Allow a special ODBL message to be displayed at login

10 years agoFix loading of blank tiles on some browsers to use the asset pipeline
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

10 years agoLocalisation updates from http://translatewiki.net.
Siebrand Mazeland [Mon, 19 Dec 2011 00:37:54 +0000 (01:37 +0100)]
Localisation updates from translatewiki.net.

10 years agoReplace @body with @text again...
Tom Hughes [Sun, 18 Dec 2011 17:46:21 +0000 (17:46 +0000)]
Replace @body with @text again...

10 years agoAdd stub files to allow various country specific rails locales to load
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

10 years agoAdd a dummy sv-SE locale so the corresponding rails locale is loaded
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

10 years agoUse normal fallbacks to handle the no/nb confusion
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.

10 years agoMonkey patch in an upstream fix for I18n::Backend::Fallbacks
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.

10 years agoUse I18n::Backend::Simple.include directly
Tom Hughes [Sun, 18 Dec 2011 15:49:21 +0000 (15:49 +0000)]
Use I18n::Backend::Simple.include directly

10 years agoUpdate rails translations
Tom Hughes [Sun, 18 Dec 2011 13:08:00 +0000 (13:08 +0000)]
Update rails translations

10 years agoDisplay the right title for friends' changesets
Tom Hughes [Fri, 16 Dec 2011 08:29:19 +0000 (08:29 +0000)]
Display the right title for friends' changesets

10 years agoForce a login to see your friends' changesets
Tom Hughes [Fri, 16 Dec 2011 08:27:57 +0000 (08:27 +0000)]
Force a login to see your friends' changesets

10 years agoFix double render error
Tom Hughes [Fri, 16 Dec 2011 08:25:59 +0000 (08:25 +0000)]
Fix double render error

10 years agoConvert friend changeset selection to use Arel queries
Tom Hughes [Thu, 15 Dec 2011 21:47:43 +0000 (21:47 +0000)]
Convert friend changeset selection to use Arel queries

10 years agoDetabify
Tom Hughes [Thu, 15 Dec 2011 21:26:51 +0000 (21:26 +0000)]
Detabify

10 years agoAdd support for viewing a list of your friends' changesets
Mikel Maron [Thu, 15 Dec 2011 02:43:38 +0000 (21:43 -0500)]
Add support for viewing a list of your friends' changesets

10 years agoAdd extra login tests for case insensitive usernames
Tom Hughes [Tue, 13 Dec 2011 21:49:25 +0000 (21:49 +0000)]
Add extra login tests for case insensitive usernames

10 years agoLook up names and emails case insensitively for authentication
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.

10 years agoAdd some password recovery tests
Tom Hughes [Tue, 13 Dec 2011 19:13:34 +0000 (19:13 +0000)]
Add some password recovery tests

10 years agoLook up email addresses case insensitively for password resets
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.

10 years agoAllow generic URIs to use the registry format
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

10 years agoUpdate Potlatch 2 to 2.3-121-geaece4c build
Tom Hughes [Tue, 13 Dec 2011 10:36:05 +0000 (10:36 +0000)]
Update Potlatch 2 to 2.3-121-geaece4c build

10 years agoAdd some tests for updating users
Tom Hughes [Tue, 13 Dec 2011 10:26:46 +0000 (10:26 +0000)]
Add some tests for updating users

10 years agoCope with no openid_url being supplied
Tom Hughes [Tue, 13 Dec 2011 10:26:30 +0000 (10:26 +0000)]
Cope with no openid_url being supplied

10 years agoValidate email addresses before confirming them
Tom Hughes [Tue, 13 Dec 2011 09:49:13 +0000 (09:49 +0000)]
Validate email addresses before confirming them

10 years agoRequire user names and emails to be case insensitively unique
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.

10 years agoRemoved bogus attempt to look up the previous version
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.

10 years agoDisplay CT status on the user page
Tom Hughes [Fri, 9 Dec 2011 09:34:29 +0000 (09:34 +0000)]
Display CT status on the user page

10 years agoDon't try and show the IP address when there isn't one
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

10 years agoGet the print stylesheet working again
Tom Hughes [Thu, 8 Dec 2011 00:28:08 +0000 (00:28 +0000)]
Get the print stylesheet working again

10 years agoWire up the en_US locale for Potlatch 2
Tom Hughes [Sun, 4 Dec 2011 17:35:01 +0000 (17:35 +0000)]
Wire up the en_US locale for Potlatch 2

10 years agoUpdate Potlatch 2 to 2.3-114-g3b2755d build
Tom Hughes [Sun, 4 Dec 2011 17:33:15 +0000 (17:33 +0000)]
Update Potlatch 2 to 2.3-114-g3b2755d build

10 years agoDon't escape anything in text/plain message notifications
Tom Hughes [Sat, 3 Dec 2011 17:58:21 +0000 (17:58 +0000)]
Don't escape anything in text/plain message notifications

10 years agoFix HTML escaping issues on the copyright page
Tom Hughes [Fri, 2 Dec 2011 16:59:30 +0000 (16:59 +0000)]
Fix HTML escaping issues on the copyright page

10 years agoEnable the donation drive message
Tom Hughes [Fri, 2 Dec 2011 11:05:43 +0000 (11:05 +0000)]
Enable the donation drive message

10 years agoUse jQuery syntax for the history request
Tom Hughes [Fri, 2 Dec 2011 11:03:19 +0000 (11:03 +0000)]
Use jQuery syntax for the history request

10 years agoHandle non-multipart email
Tom Hughes [Fri, 2 Dec 2011 08:36:08 +0000 (08:36 +0000)]
Handle non-multipart email