rails.git
6 years agoAdd tests for node methods on way models
Tom Hughes [Wed, 4 Dec 2013 21:44:39 +0000 (21:44 +0000)]
Add tests for node methods on way models

6 years agoUpdate i18n to fix bogus deprecation warning
Tom Hughes [Wed, 4 Dec 2013 19:31:03 +0000 (19:31 +0000)]
Update i18n to fix bogus deprecation warning

6 years agoAdd tests for tag methods on object models
Tom Hughes [Wed, 4 Dec 2013 18:39:07 +0000 (18:39 +0000)]
Add tests for tag methods on object models

6 years agoFix OldRelation.tags
Tom Hughes [Wed, 4 Dec 2013 17:41:21 +0000 (17:41 +0000)]
Fix OldRelation.tags

6 years agoPosition on notes correctly when a link to a comment is loaded
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.

6 years agoUnconditionally unbind moveend event
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.

6 years agoMore refactoring of common code in object models
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.

6 years agoRefactor generation of object metadata in API calls
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.

6 years agoUse a table for tags
John Firebaugh [Tue, 3 Dec 2013 22:07:33 +0000 (14:07 -0800)]
Use a table for tags

Fixes #595

6 years agoUpdate to rails 4.0.2
Tom Hughes [Tue, 3 Dec 2013 20:19:52 +0000 (20:19 +0000)]
Update to rails 4.0.2

6 years agoUpdate history feed URL with bbox parameter
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

6 years agoRemove map data size warning (#592)
John Firebaugh [Tue, 3 Dec 2013 19:03:10 +0000 (11:03 -0800)]
Remove map data size warning (#592)

6 years agoRestore support for #layers=X with no map parameter
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

6 years agoReplace some legacy routes with redirects
Tom Hughes [Tue, 3 Dec 2013 19:08:21 +0000 (19:08 +0000)]
Replace some legacy routes with redirects

6 years agoRemove debugging code
Tom Hughes [Tue, 3 Dec 2013 19:04:15 +0000 (19:04 +0000)]
Remove debugging code

6 years agoFix UCL link
Tom Hughes [Tue, 3 Dec 2013 18:16:22 +0000 (18:16 +0000)]
Fix UCL link

6 years agoThrow an exception instead of logging to the console
Tom Hughes [Tue, 3 Dec 2013 18:15:02 +0000 (18:15 +0000)]
Throw an exception instead of logging to the console

6 years agoLog failures to match a route for the initial path
Tom Hughes [Tue, 3 Dec 2013 17:51:01 +0000 (17:51 +0000)]
Log failures to match a route for the initial path

6 years agoIncrease z-index for maximised content
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.

6 years agoRemove unused code for handling search results in Potlatch
Tom Hughes [Tue, 3 Dec 2013 15:14:59 +0000 (15:14 +0000)]
Remove unused code for handling search results in Potlatch

6 years agoImprove zoom level selection when invoking Potlatch on an object
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.

6 years agoDisplay the size warning when the data layer is disabled
Tom Hughes [Tue, 3 Dec 2013 09:17:02 +0000 (09:17 +0000)]
Display the size warning when the data layer is disabled

6 years agoAuto-uncheck the data and notes layers at low zoom
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

6 years agoUse jQuery Simulate to simulate click events
Tom Hughes [Tue, 3 Dec 2013 00:28:50 +0000 (00:28 +0000)]
Use jQuery Simulate to simulate click events

6 years agoMerge remote-tracking branch 'jfirebaugh/562'
Tom Hughes [Tue, 3 Dec 2013 00:23:16 +0000 (00:23 +0000)]
Merge remote-tracking branch 'jfirebaugh/562'

6 years agoImprove click behavior on changeset entries
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.

6 years agoAlign "Way" in relation member list
John Firebaugh [Mon, 2 Dec 2013 23:36:10 +0000 (15:36 -0800)]
Align "Way" in relation member list

Fixes #590

6 years agoAllow word-breaks in long keys/values
John Firebaugh [Mon, 2 Dec 2013 22:42:15 +0000 (14:42 -0800)]
Allow word-breaks in long keys/values

Fixes #561

6 years agoGenerate valid URLs for search results with no object attached
Tom Hughes [Mon, 2 Dec 2013 22:25:46 +0000 (22:25 +0000)]
Generate valid URLs for search results with no object attached

6 years agoRestore correct link behavior with modifier keys
John Firebaugh [Mon, 2 Dec 2013 22:25:45 +0000 (14:25 -0800)]
Restore correct link behavior with modifier keys

Fixes #562

6 years agoFix application error on non-feature search results
John Firebaugh [Mon, 2 Dec 2013 22:08:56 +0000 (14:08 -0800)]
Fix application error on non-feature search results

Fixes #560

6 years agoMerge remote-tracking branch 'jfirebaugh/legacy-params'
Tom Hughes [Mon, 2 Dec 2013 20:29:34 +0000 (20:29 +0000)]
Merge remote-tracking branch 'jfirebaugh/legacy-params'

6 years agoDocument need for a Javascript runtime
Tom Hughes [Mon, 2 Dec 2013 20:24:11 +0000 (20:24 +0000)]
Document need for a Javascript runtime

6 years agoDon't show "Load More" if we found less than 20 changesets
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

6 years agoSupport legacy bbox param on /history as well
John Firebaugh [Mon, 2 Dec 2013 18:54:16 +0000 (10:54 -0800)]
Support legacy bbox param on /history as well

Fixes #586

6 years agoRestore legacy bbox/min/max params support
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

6 years agoRemove unused strings
Tom Hughes [Mon, 2 Dec 2013 19:28:51 +0000 (19:28 +0000)]
Remove unused strings

6 years agoRestore click handler for changeset entries
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.

6 years agoDrop click handler for changeset entries in the history sidebar
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.

6 years agoRemoved bogus translation
Tom Hughes [Mon, 2 Dec 2013 09:10:10 +0000 (09:10 +0000)]
Removed bogus translation

6 years agoLocalisation updates from https://translatewiki.net.
Siebrand Mazeland [Mon, 2 Dec 2013 08:40:42 +0000 (08:40 +0000)]
Localisation updates from https://translatewiki.net.

6 years agoPrevent wrapping of dates in message lists
Tom Hughes [Sun, 1 Dec 2013 23:00:41 +0000 (23:00 +0000)]
Prevent wrapping of dates in message lists

6 years agoFix javascript eror redirecting to new notes
Tom Hughes [Sun, 1 Dec 2013 22:41:30 +0000 (22:41 +0000)]
Fix javascript eror redirecting to new notes

6 years agoFix URL updating in Potlatch 1
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.

6 years agoFix stripping of trailing slash
Tom Hughes [Sun, 1 Dec 2013 22:30:34 +0000 (22:30 +0000)]
Fix stripping of trailing slash

6 years agoStrip any trailing slash from the initial location
Tom Hughes [Sun, 1 Dec 2013 21:47:55 +0000 (21:47 +0000)]
Strip any trailing slash from the initial location

6 years agoAdd 'x' to close welcome box; remember preference
Richard Fairhurst [Sun, 1 Dec 2013 19:08:56 +0000 (19:08 +0000)]
Add 'x' to close welcome box; remember preference

6 years agoDrop monkey patch now we're using option style redirects
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.

6 years agoForce the X-Page-Title value to be treated as UTF-8
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

6 years agoPreserve the bounding box when redirecting history URLs
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.

6 years agoRename changed translation to avoid test failures
Tom Hughes [Sun, 1 Dec 2013 09:11:59 +0000 (09:11 +0000)]
Rename changed translation to avoid test failures

6 years agoLocalisation updates from https://translatewiki.net.
Siebrand Mazeland [Sat, 30 Nov 2013 18:36:16 +0000 (18:36 +0000)]
Localisation updates from https://translatewiki.net.

6 years agoDon't offer iD on IE11
Tom Hughes [Sat, 30 Nov 2013 17:53:42 +0000 (17:53 +0000)]
Don't offer iD on IE11

6 years agoRemove spurious < character as reported in #508
RM87 [Sat, 30 Nov 2013 15:37:52 +0000 (17:37 +0200)]
Remove spurious < character as reported in #508

6 years agoLoad gravatar images over https on https pages
Tom Hughes [Sat, 30 Nov 2013 15:38:11 +0000 (15:38 +0000)]
Load gravatar images over https on https pages

6 years agoAdd margin space below lists on non-map content pages
Tom Hughes [Sat, 30 Nov 2013 14:41:12 +0000 (14:41 +0000)]
Add margin space below lists on non-map content pages

6 years agoTest for the map argument correctly
Tom Hughes [Sat, 30 Nov 2013 14:18:08 +0000 (14:18 +0000)]
Test for the map argument correctly

6 years agoRemove monkey patch which has been merged upstream in rails 4
Tom Hughes [Sat, 30 Nov 2013 14:02:49 +0000 (14:02 +0000)]
Remove monkey patch which has been merged upstream in rails 4

6 years agoMonkey patch escaping in redirect routes
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

6 years agoDon't throw an exception if the hash doesn't contain a map argument
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

6 years agoRedirect /?query= to /search?query=
Tom Hughes [Sat, 30 Nov 2013 12:36:47 +0000 (12:36 +0000)]
Redirect /?query= to /search?query=

6 years agoUpdate the OpenSearch definition for URL changes
Tom Hughes [Sat, 30 Nov 2013 12:35:01 +0000 (12:35 +0000)]
Update the OpenSearch definition for URL changes

6 years agoTidy up the OAuth authorization screens
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.

6 years agoChange "Copyright & License" to "Copyright" and move it left
Tom Hughes [Sat, 30 Nov 2013 10:51:43 +0000 (10:51 +0000)]
Change "Copyright & License" to "Copyright" and move it left

6 years agoRestore Copyright & License link
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

6 years agoUpdate to CPK 6.0.1 and drop monkey patch
Tom Hughes [Sat, 30 Nov 2013 10:20:22 +0000 (10:20 +0000)]
Update to CPK 6.0.1 and drop monkey patch

6 years agoRevert 39468944 and fix osmlab#91 without loosing the editor choice
Tom Hughes [Fri, 29 Nov 2013 15:33:09 +0000 (15:33 +0000)]
Revert 39468944 and fix osmlab#91 without loosing the editor choice

6 years agoPass the correct ID when switching to a node/way/relation view
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

6 years agoStop browse routes matching user URLs
Tom Hughes [Fri, 29 Nov 2013 00:05:25 +0000 (00:05 +0000)]
Stop browse routes matching user URLs

6 years agoAllow moderators to reopen hidden notes
Tom Hughes [Thu, 28 Nov 2013 20:25:36 +0000 (20:25 +0000)]
Allow moderators to reopen hidden notes

6 years agoAdd a title for hidden notes
Tom Hughes [Thu, 28 Nov 2013 20:23:50 +0000 (20:23 +0000)]
Add a title for hidden notes

6 years agoAdd hidden_by message for notes hidden by moderators
Tom Hughes [Thu, 28 Nov 2013 19:06:17 +0000 (19:06 +0000)]
Add hidden_by message for notes hidden by moderators

6 years agoMerge branch 'redesign'
Tom Hughes [Thu, 28 Nov 2013 17:30:53 +0000 (17:30 +0000)]
Merge branch 'redesign'

Conflicts:
app/assets/stylesheets/common.css.scss

6 years agoAdd tests for new redirects and fix a few bugs in the redirects
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

6 years agoSimplify browse routes and make routes more consistent
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.

6 years agoUpdate to iD v1.3.4
John Firebaugh [Wed, 27 Nov 2013 03:34:53 +0000 (19:34 -0800)]
Update to iD v1.3.4

6 years agoFix feed link for pushState loaded history page
John Firebaugh [Mon, 25 Nov 2013 23:46:14 +0000 (15:46 -0800)]
Fix feed link for pushState loaded history page

6 years agoDrop max_id from the changeset feed URL
Tom Hughes [Mon, 25 Nov 2013 22:27:49 +0000 (22:27 +0000)]
Drop max_id from the changeset feed URL

6 years agoFix accumulation of parameters in edit link
John Firebaugh [Mon, 25 Nov 2013 21:49:47 +0000 (13:49 -0800)]
Fix accumulation of parameters in edit link

6 years agoFix scroll bar issue on edit pages
John Firebaugh [Mon, 25 Nov 2013 21:35:06 +0000 (13:35 -0800)]
Fix scroll bar issue on edit pages

6 years agoMake main page flash messages visible
John Firebaugh [Mon, 25 Nov 2013 21:20:48 +0000 (13:20 -0800)]
Make main page flash messages visible

6 years agoThere are four methods, not three
Tom Hughes [Mon, 25 Nov 2013 21:13:40 +0000 (21:13 +0000)]
There are four methods, not three

6 years agoAdd test for redirect routes
Tom Hughes [Mon, 25 Nov 2013 21:10:56 +0000 (21:10 +0000)]
Add test for redirect routes

6 years agoAdd explanatory comment
John Firebaugh [Mon, 25 Nov 2013 21:12:04 +0000 (13:12 -0800)]
Add explanatory comment

6 years agoDocument/clarify OSM.Router use
John Firebaugh [Mon, 25 Nov 2013 21:08:24 +0000 (13:08 -0800)]
Document/clarify OSM.Router use

6 years agoRevert "Remove redundant code"
Tom Hughes [Mon, 25 Nov 2013 20:41:25 +0000 (20:41 +0000)]
Revert "Remove redundant code"

This reverts commit 28530085fb94e23b55cc6277dc6e15fdd3cc8a46.

6 years agoSort changesets by id rather than created_at, closes #87
Aaron Lidman [Mon, 25 Nov 2013 20:27:52 +0000 (12:27 -0800)]
Sort changesets by id rather than created_at, closes #87

6 years agoFix border-bottom for browse#note, closes #88
Aaron Lidman [Mon, 25 Nov 2013 20:04:22 +0000 (12:04 -0800)]
Fix border-bottom for browse#note, closes #88

6 years agoRemove unneessary return added accidentally
Tom Hughes [Mon, 25 Nov 2013 19:14:52 +0000 (19:14 +0000)]
Remove unneessary return added accidentally

6 years agoFix "in bounds" test in updateData
Tom Hughes [Mon, 25 Nov 2013 19:03:35 +0000 (19:03 +0000)]
Fix "in bounds" test in updateData

Only call getData if the new bounds are not contained within the
old bounds, and only update the bounds after a successful load so
that the don't change if we error out.

6 years agoRemove unused partials
Tom Hughes [Mon, 25 Nov 2013 00:51:53 +0000 (00:51 +0000)]
Remove unused partials

6 years agoEnable oauth for geocoder#search
Tom Hughes [Sun, 24 Nov 2013 17:05:02 +0000 (17:05 +0000)]
Enable oauth for geocoder#search

6 years agoBlock max_id for changeset feeds instead of page which is no longer used
Tom Hughes [Sun, 24 Nov 2013 17:02:38 +0000 (17:02 +0000)]
Block max_id for changeset feeds instead of page which is no longer used

6 years agoFormat browse page titles in a consistent way
Tom Hughes [Sun, 24 Nov 2013 16:55:56 +0000 (16:55 +0000)]
Format browse page titles in a consistent way

6 years agoDon't wait for a timeout when the browser doesn't support geolocation
Tom Hughes [Sun, 24 Nov 2013 16:45:45 +0000 (16:45 +0000)]
Don't wait for a timeout when the browser doesn't support geolocation

If the browser doesn't support geolocation then we might as well just
start manual edit mode straight away rather than waiting four seconds.

6 years agoDrop ejs as we aren't using it anymore
Tom Hughes [Sun, 24 Nov 2013 16:42:43 +0000 (16:42 +0000)]
Drop ejs as we aren't using it anymore

6 years agoRemove redundant code
Tom Hughes [Sun, 24 Nov 2013 16:38:53 +0000 (16:38 +0000)]
Remove redundant code

Attempts to view an object are now redirected to the browse pages
so we will never see a node/way/relation parameter here.

6 years agoMake sure all pages using the map layout call require_oauth
Tom Hughes [Sun, 24 Nov 2013 15:29:38 +0000 (15:29 +0000)]
Make sure all pages using the map layout call require_oauth

6 years agoRemove code to fixup authenticity tokens on page load
Tom Hughes [Sun, 24 Nov 2013 12:13:02 +0000 (12:13 +0000)]
Remove code to fixup authenticity tokens on page load

We don't cache anything with forms in now, so the code is no longer
needed and the comment was now misleading as extra code has been added
to the ready callback.

6 years agoUpdate to iD v1.3.3
John Firebaugh [Sat, 23 Nov 2013 00:52:04 +0000 (16:52 -0800)]
Update to iD v1.3.3