]>
git.openstreetmap.org Git - rails.git/log
Tom Hughes [Sat, 7 Dec 2013 00:28:01 +0000 (00:28 +0000)]
Add some more unit tests for the Trace model
Siebrand Mazeland [Sat, 7 Dec 2013 11:08:37 +0000 (11:08 +0000)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Fri, 6 Dec 2013 19:40:54 +0000 (19:40 +0000)]
Reapply leaflet.locate patch
Tom Hughes [Fri, 6 Dec 2013 19:40:31 +0000 (19:40 +0000)]
Update leaflet.locate
Tom Hughes [Fri, 6 Dec 2013 16:24:36 +0000 (16:24 +0000)]
Update to Leaflet 0.7.1
John Firebaugh [Fri, 6 Dec 2013 00:10:28 +0000 (16:10 -0800)]
Obey the location hash for edit URLs with objects
For a link like http://osm.org/edit?node=n#map=19/37.77683/-122.41459,
select the feature but also respect the map location.
This is the fix for iD. It appears P2 requires internal code
modifications.
Refs #620
Tom Hughes [Fri, 6 Dec 2013 00:19:35 +0000 (00:19 +0000)]
Pass details of any selected object to remote editors
Tom Hughes [Thu, 5 Dec 2013 22:35:21 +0000 (22:35 +0000)]
Fix translation interpolations
Siebrand Mazeland [Thu, 5 Dec 2013 22:14:38 +0000 (22:14 +0000)]
Localisation updates from https://translatewiki.net.
John Firebaugh [Thu, 5 Dec 2013 20:11:57 +0000 (12:11 -0800)]
Run unload method before pushing the new state
If running unload causes any hash changes, those should
not end up on the new URL.
Fixes #622
John Firebaugh [Thu, 5 Dec 2013 19:27:47 +0000 (11:27 -0800)]
Ensure object parameter is removed from edit link when closing sidebar
Refs #620
John Firebaugh [Thu, 5 Dec 2013 19:07:52 +0000 (11:07 -0800)]
Restore marker for non-browse search results
Fixes #615
John Firebaugh [Thu, 5 Dec 2013 18:59:15 +0000 (10:59 -0800)]
Remove object parameter from share URL
Fixes #616
Fixes #624
Simon Legner [Thu, 5 Dec 2013 18:04:47 +0000 (18:04 +0000)]
Extend API to allow changesets to be queried by ids
Make changesets queryable by specifying a list of ids, for example:
/api/0.6/changesets?changesets=1,2,3
This condition may be combined with others in the normal way.
Tom Hughes [Thu, 5 Dec 2013 17:57:12 +0000 (17:57 +0000)]
Report an error if a bogus limit value is passed to a notes API call
Tom Hughes [Thu, 5 Dec 2013 17:49:06 +0000 (17:49 +0000)]
Test get_nodes_undelete methods of the OldWay model
Tom Hughes [Thu, 5 Dec 2013 10:40:21 +0000 (10:40 +0000)]
Make remote edit work when /edit is loaded
Change detection of the edit request to use the URL as the class
will not be set on the body now, and force the router to think we
actually loaded the normal view.
Tom Hughes [Thu, 5 Dec 2013 10:40:07 +0000 (10:40 +0000)]
Use the map layout when rendering index for a remote edit
Tom Hughes [Thu, 5 Dec 2013 09:48:53 +0000 (09:48 +0000)]
Always use controller computed zoom when starting Potlatch
The value of mapParams.zoom may have come from the cookie and be
unrelated to the actual view the user came from with this click, so
just use the default zoom set by the controller.
Fixes #621.
Tom Hughes [Thu, 5 Dec 2013 09:47:22 +0000 (09:47 +0000)]
The value of mapParams.object is always a node/way/relation now
Tom Hughes [Thu, 5 Dec 2013 00:50:04 +0000 (00:50 +0000)]
Simplify a number of object model methods
Tom Hughes [Thu, 5 Dec 2013 00:38:25 +0000 (00:38 +0000)]
Add tests for member methods on relation models
Tom Hughes [Wed, 4 Dec 2013 21:44:39 +0000 (21:44 +0000)]
Add tests for node methods on way models
Tom Hughes [Wed, 4 Dec 2013 19:31:03 +0000 (19:31 +0000)]
Update i18n to fix bogus deprecation warning
Tom Hughes [Wed, 4 Dec 2013 18:39:07 +0000 (18:39 +0000)]
Add tests for tag methods on object models
Tom Hughes [Wed, 4 Dec 2013 17:41:21 +0000 (17:41 +0000)]
Fix OldRelation.tags
Tom Hughes [Wed, 4 Dec 2013 08:41:56 +0000 (08:41 +0000)]
Position on notes correctly when a link to a comment is loaded
Links to note comments in the RSS feed have a #id on the end to
position on the right comment, so don't let those hash strings
stop the map from panning to the note.
Fixes #603.
John Firebaugh [Tue, 3 Dec 2013 23:04:24 +0000 (15:04 -0800)]
Unconditionally unbind moveend event
Can't rely on checking location.pathname -- inside unload,
it already contains the new path. Fortunately, checking is
unnecessary.
Fixes TypeError: Cannot call method 'split' of undefined.
Tom Hughes [Wed, 4 Dec 2013 00:29:48 +0000 (00:29 +0000)]
More refactoring of common code in object models
Tidy up code and extract generation of tag elements to the
common code in the ObjectMetadata module.
Simon Legner [Tue, 3 Dec 2013 23:02:27 +0000 (23:02 +0000)]
Refactor generation of object metadata in API calls
Factor out duplicate from the object models into common code.
John Firebaugh [Tue, 3 Dec 2013 22:07:33 +0000 (14:07 -0800)]
Use a table for tags
Fixes #595
Tom Hughes [Tue, 3 Dec 2013 20:19:52 +0000 (20:19 +0000)]
Update to rails 4.0.2
John Firebaugh [Tue, 3 Dec 2013 19:51:37 +0000 (11:51 -0800)]
Update history feed URL with bbox parameter
https://lists.openstreetmap.org/pipermail/dev/2013-December/027599.html
John Firebaugh [Tue, 3 Dec 2013 19:03:10 +0000 (11:03 -0800)]
Remove map data size warning (#592)
John Firebaugh [Tue, 3 Dec 2013 18:47:38 +0000 (10:47 -0800)]
Restore support for #layers=X with no map parameter
https://trac.openstreetmap.org/ticket/5056
Tom Hughes [Tue, 3 Dec 2013 19:08:21 +0000 (19:08 +0000)]
Replace some legacy routes with redirects
Tom Hughes [Tue, 3 Dec 2013 19:04:15 +0000 (19:04 +0000)]
Remove debugging code
Tom Hughes [Tue, 3 Dec 2013 18:16:22 +0000 (18:16 +0000)]
Fix UCL link
Tom Hughes [Tue, 3 Dec 2013 18:15:02 +0000 (18:15 +0000)]
Throw an exception instead of logging to the console
Tom Hughes [Tue, 3 Dec 2013 17:51:01 +0000 (17:51 +0000)]
Log failures to match a route for the initial path
Tom Hughes [Tue, 3 Dec 2013 15:24:45 +0000 (15:24 +0000)]
Increase z-index for maximised content
Makes sure maximised content sits on top of the header.
Tom Hughes [Tue, 3 Dec 2013 15:14:59 +0000 (15:14 +0000)]
Remove unused code for handling search results in Potlatch
Tom Hughes [Tue, 3 Dec 2013 14:53:24 +0000 (14:53 +0000)]
Improve zoom level selection when invoking Potlatch on an object
When invoking Potlatch on a node/way/relation object we should
normally have valid location information in the map parameters, so
use any zoom which is there if possible, otherwise fall back to an
object type specific default value.
Fixes #605.
Tom Hughes [Tue, 3 Dec 2013 09:17:02 +0000 (09:17 +0000)]
Display the size warning when the data layer is disabled
John Firebaugh [Tue, 3 Dec 2013 01:01:13 +0000 (17:01 -0800)]
Auto-uncheck the data and notes layers at low zoom
Reenable them when returning to high zoom in the
same session.
Fixes #592
Tom Hughes [Tue, 3 Dec 2013 00:28:50 +0000 (00:28 +0000)]
Use jQuery Simulate to simulate click events
Tom Hughes [Tue, 3 Dec 2013 00:23:16 +0000 (00:23 +0000)]
Merge remote-tracking branch 'jfirebaugh/562'
John Firebaugh [Tue, 3 Dec 2013 00:13:58 +0000 (16:13 -0800)]
Improve click behavior on changeset entries
On Chrome, this lets clicks with modifier keys anywhere
on the changeset entry work as expected. On other browsers,
modifier keys still only work on the link itself.
John Firebaugh [Mon, 2 Dec 2013 23:36:10 +0000 (15:36 -0800)]
Align "Way" in relation member list
Fixes #590
John Firebaugh [Mon, 2 Dec 2013 22:42:15 +0000 (14:42 -0800)]
Allow word-breaks in long keys/values
Fixes #561
Tom Hughes [Mon, 2 Dec 2013 22:25:46 +0000 (22:25 +0000)]
Generate valid URLs for search results with no object attached
John Firebaugh [Mon, 2 Dec 2013 22:25:45 +0000 (14:25 -0800)]
Restore correct link behavior with modifier keys
Fixes #562
John Firebaugh [Mon, 2 Dec 2013 22:08:56 +0000 (14:08 -0800)]
Fix application error on non-feature search results
Fixes #560
Tom Hughes [Mon, 2 Dec 2013 20:29:34 +0000 (20:29 +0000)]
Merge remote-tracking branch 'jfirebaugh/legacy-params'
Tom Hughes [Mon, 2 Dec 2013 20:24:11 +0000 (20:24 +0000)]
Document need for a Javascript runtime
Tom Hughes [Mon, 2 Dec 2013 19:39:56 +0000 (19:39 +0000)]
Don't show "Load More" if we found less than 20 changesets
John Firebaugh [Mon, 2 Dec 2013 18:54:16 +0000 (10:54 -0800)]
Support legacy bbox param on /history as well
Fixes #586
John Firebaugh [Mon, 2 Dec 2013 18:26:04 +0000 (10:26 -0800)]
Restore legacy bbox/min/max params support
https://trac.openstreetmap.org/ticket/5050
https://trac.openstreetmap.org/ticket/5051
Tom Hughes [Mon, 2 Dec 2013 19:28:51 +0000 (19:28 +0000)]
Remove unused strings
Tom Hughes [Mon, 2 Dec 2013 18:49:56 +0000 (18:49 +0000)]
Restore click handler for changeset entries
The default click handler only handle the, not the rest of the
entry, so retore the handler but add an e.preventDefault() call
to stop the second handler running.
Tom Hughes [Mon, 2 Dec 2013 10:17:53 +0000 (10:17 +0000)]
Drop click handler for changeset entries in the history sidebar
The default click handler in index.js handles them fine, and as this
one was not calling preventDefault both were actually firing in some
browsers, causing the changeset to be loaded twice and two history
entries to be created.
Tom Hughes [Mon, 2 Dec 2013 09:10:10 +0000 (09:10 +0000)]
Removed bogus translation
Siebrand Mazeland [Mon, 2 Dec 2013 08:40:42 +0000 (08:40 +0000)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Sun, 1 Dec 2013 23:00:41 +0000 (23:00 +0000)]
Prevent wrapping of dates in message lists
Tom Hughes [Sun, 1 Dec 2013 22:41:30 +0000 (22:41 +0000)]
Fix javascript eror redirecting to new notes
Tom Hughes [Sun, 1 Dec 2013 22:37:04 +0000 (22:37 +0000)]
Fix URL updating in Potlatch 1
Potlatch 1 has hard coded calls to updatelinks, so rename the
updatelinks function to updateLinks and add an updatelinks function
using the old style argument list for Potlatch 1 to call.
Tom Hughes [Sun, 1 Dec 2013 22:30:34 +0000 (22:30 +0000)]
Fix stripping of trailing slash
Tom Hughes [Sun, 1 Dec 2013 21:47:55 +0000 (21:47 +0000)]
Strip any trailing slash from the initial location
Richard Fairhurst [Sun, 1 Dec 2013 19:08:56 +0000 (19:08 +0000)]
Add 'x' to close welcome box; remember preference
Tom Hughes [Sun, 1 Dec 2013 20:54:52 +0000 (20:54 +0000)]
Drop monkey patch now we're using option style redirects
Option style redirects escape path parameters correctly, so we
can drop out monkey patch.
Tom Hughes [Sun, 1 Dec 2013 20:31:48 +0000 (20:31 +0000)]
Force the X-Page-Title value to be treated as UTF-8
This is basically a black magic hack to get javascript to treat
a string as UTF-8 and decode it to the correct form.
http://monsur.hossa.in/2012/07/20/utf-8-in-javascript.html
Tom Hughes [Sun, 1 Dec 2013 19:59:57 +0000 (19:59 +0000)]
Preserve the bounding box when redirecting history URLs
Using the options style for the redirect seems to cause parameters
to be preserved, which the path style of redirect does not.
Tom Hughes [Sun, 1 Dec 2013 09:11:59 +0000 (09:11 +0000)]
Rename changed translation to avoid test failures
Siebrand Mazeland [Sat, 30 Nov 2013 18:36:16 +0000 (18:36 +0000)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Sat, 30 Nov 2013 17:53:42 +0000 (17:53 +0000)]
Don't offer iD on IE11
RM87 [Sat, 30 Nov 2013 15:37:52 +0000 (17:37 +0200)]
Remove spurious < character as reported in #508
Tom Hughes [Sat, 30 Nov 2013 15:38:11 +0000 (15:38 +0000)]
Load gravatar images over https on https pages
Tom Hughes [Sat, 30 Nov 2013 14:41:12 +0000 (14:41 +0000)]
Add margin space below lists on non-map content pages
Tom Hughes [Sat, 30 Nov 2013 14:18:08 +0000 (14:18 +0000)]
Test for the map argument correctly
Tom Hughes [Sat, 30 Nov 2013 14:02:49 +0000 (14:02 +0000)]
Remove monkey patch which has been merged upstream in rails 4
Tom Hughes [Sat, 30 Nov 2013 13:46:07 +0000 (13:46 +0000)]
Monkey patch escaping in redirect routes
The correct method of escaping depends on whether the parameter
is being substituted in the path or the query, but all our ones
are substitued in the path so use URI.escape instead of the
standard Rack::Utils.escape which does query escaping.
https://github.com/rails/rails/issues/13110
Tom Hughes [Sat, 30 Nov 2013 13:20:31 +0000 (13:20 +0000)]
Don't throw an exception if the hash doesn't contain a map argument
Tom Hughes [Sat, 30 Nov 2013 12:36:47 +0000 (12:36 +0000)]
Redirect /?query= to /search?query=
Tom Hughes [Sat, 30 Nov 2013 12:35:01 +0000 (12:35 +0000)]
Update the OpenSearch definition for URL changes
Tom Hughes [Sat, 30 Nov 2013 12:16:44 +0000 (12:16 +0000)]
Tidy up the OAuth authorization screens
Make sure all messages are translatable, separate errors from
user initiated denial of authorization.
Tom Hughes [Sat, 30 Nov 2013 10:51:43 +0000 (10:51 +0000)]
Change "Copyright & License" to "Copyright" and move it left
Paul Norman [Fri, 29 Nov 2013 05:50:05 +0000 (21:50 -0800)]
Restore Copyright & License link
The copyright and license is an important part of OpenStreetMap.
This restores the copyright & license link to the menu, placing
it in the top-right with the other pages which do not display a map.
Fixes #548
Fixes comments in https://github.com/openstreetmap/openstreetmap-website/pull/498#issuecomment-
26741518
Tom Hughes [Sat, 30 Nov 2013 10:20:22 +0000 (10:20 +0000)]
Update to CPK 6.0.1 and drop monkey patch
Tom Hughes [Fri, 29 Nov 2013 15:33:09 +0000 (15:33 +0000)]
Revert
39468944 and fix osmlab#91 without loosing the editor choice
Tom Hughes [Fri, 29 Nov 2013 09:52:46 +0000 (09:52 +0000)]
Pass the correct ID when switching to a node/way/relation view
Tom Hughes [Fri, 29 Nov 2013 00:05:25 +0000 (00:05 +0000)]
Stop browse routes matching user URLs
Tom Hughes [Thu, 28 Nov 2013 20:25:36 +0000 (20:25 +0000)]
Allow moderators to reopen hidden notes
Tom Hughes [Thu, 28 Nov 2013 20:23:50 +0000 (20:23 +0000)]
Add a title for hidden notes
Tom Hughes [Thu, 28 Nov 2013 19:06:17 +0000 (19:06 +0000)]
Add hidden_by message for notes hidden by moderators
Tom Hughes [Thu, 28 Nov 2013 17:30:53 +0000 (17:30 +0000)]
Merge branch 'redesign'
Conflicts:
app/assets/stylesheets/common.css.scss
Tom Hughes [Thu, 28 Nov 2013 08:56:52 +0000 (08:56 +0000)]
Add tests for new redirects and fix a few bugs in the redirects
Tom Hughes [Thu, 28 Nov 2013 00:14:07 +0000 (00:14 +0000)]
Simplify browse routes and make routes more consistent
This gets rid of the /browse/ prefix and uses /history consistently
for all routes that show a list of changesets.
John Firebaugh [Wed, 27 Nov 2013 03:34:53 +0000 (19:34 -0800)]
Update to iD v1.3.4
John Firebaugh [Mon, 25 Nov 2013 23:46:14 +0000 (15:46 -0800)]
Fix feed link for pushState loaded history page
Tom Hughes [Mon, 25 Nov 2013 22:27:49 +0000 (22:27 +0000)]
Drop max_id from the changeset feed URL