]> git.openstreetmap.org Git - rails.git/log
rails.git
10 years agoFix typo
Richard Fairhurst [Wed, 11 Dec 2013 16:12:15 +0000 (16:12 +0000)]
Fix typo

restauraunt => restaurant

10 years agoMake rich text edit controls use as much space as possible
Tom Hughes [Thu, 12 Dec 2013 08:55:26 +0000 (08:55 +0000)]
Make rich text edit controls use as much space as possible

Use CSS3 calculations to set the width of a rich text edit control
to the maximum possible while still allowing space for the help.

Also set the subject/title fields to the same width.

Fixes #657

10 years agoAllow word-breaks in changeset comments
Tom Hughes [Wed, 11 Dec 2013 17:56:22 +0000 (17:56 +0000)]
Allow word-breaks in changeset comments

10 years agoIssue all _osm_location cookies against the root path
Tom Hughes [Wed, 11 Dec 2013 00:19:49 +0000 (00:19 +0000)]
Issue all _osm_location cookies against the root path

To ensure that any old cookies issued against other paths are
removed we make sure to do a removeCookie call first without a
path being specified so that any cookie for the current page is
removed before we add a new one against the root.

Fixes #652

10 years agoUpdate jquery.cookie
Tom Hughes [Wed, 11 Dec 2013 00:12:39 +0000 (00:12 +0000)]
Update jquery.cookie

10 years agoRestore autofocusing of the search field
Tom Hughes [Tue, 10 Dec 2013 19:45:28 +0000 (19:45 +0000)]
Restore autofocusing of the search field

Use the HTML5 autofocus attribute, and focus on load for browsers
which don't support it.

Also change the removal of the "Where am I?" prompt to happen on
input rather than when the field is focused, so that it is properly
removed and restored when the field has been autofocused.

Fixes https://trac.openstreetmap.org/ticket/5065

10 years agoRemove duplicate (hidden) search box from header
Tom Hughes [Tue, 10 Dec 2013 18:52:49 +0000 (18:52 +0000)]
Remove duplicate (hidden) search box from header

10 years agoRefine zooming and panning for note and data layers
Aaron Lidman [Mon, 9 Dec 2013 16:24:51 +0000 (11:24 -0500)]
Refine zooming and panning for note and data layers

Fixes #629
Fixes #643

10 years agoRequire i18n-js 3.0.0.rc5.3 for proper dependency on configuration
Tom Hughes [Mon, 9 Dec 2013 10:18:31 +0000 (10:18 +0000)]
Require i18n-js 3.0.0.rc5.3 for proper dependency on configuration

10 years agoUpdate gitignore
Tom Hughes [Mon, 9 Dec 2013 10:04:12 +0000 (10:04 +0000)]
Update gitignore

10 years agoRemove export rule for translations which no longer exist
Tom Hughes [Mon, 9 Dec 2013 09:29:21 +0000 (09:29 +0000)]
Remove export rule for translations which no longer exist

10 years agoUpdate page title when switching to the front page view
Tom Hughes [Mon, 9 Dec 2013 09:28:13 +0000 (09:28 +0000)]
Update page title when switching to the front page view

Fixes https://trac.openstreetmap.org/ticket/5063

10 years agoDrop redundant monkey patches
Tom Hughes [Sun, 8 Dec 2013 22:49:31 +0000 (22:49 +0000)]
Drop redundant monkey patches

10 years agoAdd functions tests for the oauth_clients controller
Tom Hughes [Sun, 8 Dec 2013 21:54:21 +0000 (21:54 +0000)]
Add functions tests for the oauth_clients controller

10 years agoRemove unused controllers
Tom Hughes [Sun, 8 Dec 2013 19:15:23 +0000 (19:15 +0000)]
Remove unused controllers

10 years agoRemove stub test for non-existent controller
Tom Hughes [Sun, 8 Dec 2013 19:15:12 +0000 (19:15 +0000)]
Remove stub test for non-existent controller

10 years agoDon't linkify comments in the changeset list
Tom Hughes [Sun, 8 Dec 2013 13:11:48 +0000 (13:11 +0000)]
Don't linkify comments in the changeset list

It's confusing to make links in comments active in the changeset list
as the rest of the comment is an active link to the changeset.

We do want to make them active in the changeset view however, so add
linkification to the comment there.

Fixes https://trac.openstreetmap.org/ticket/5061

10 years agoDon't show lat/lon for a deleted node, in case it is redacted
Tom Hughes [Sun, 8 Dec 2013 11:18:55 +0000 (11:18 +0000)]
Don't show lat/lon for a deleted node, in case it is redacted

Fixes #642

10 years agoFix untranslatable string
Tom Hughes [Sun, 8 Dec 2013 11:02:43 +0000 (11:02 +0000)]
Fix untranslatable string

10 years agoTest XHR rendering of pages which can load in the sidebar
Tom Hughes [Sat, 7 Dec 2013 17:40:19 +0000 (17:40 +0000)]
Test XHR rendering of pages which can load in the sidebar

10 years agoDo basic testing of all site controller methods
Tom Hughes [Sat, 7 Dec 2013 17:21:17 +0000 (17:21 +0000)]
Do basic testing of all site controller methods

10 years agoRevert "Remove unused file"
Tom Hughes [Sat, 7 Dec 2013 16:34:23 +0000 (16:34 +0000)]
Revert "Remove unused file"

This reverts commit db41978f098f6044bf007b051525ff9d1c9149c9.

10 years agoAdd link to per-user RSS feed on diary view page
Tom Hughes [Sat, 7 Dec 2013 15:07:25 +0000 (15:07 +0000)]
Add link to per-user RSS feed on diary view page

10 years agoImprove display of alternative download sources
Roland Olbricht [Sat, 7 Dec 2013 14:56:47 +0000 (14:56 +0000)]
Improve display of alternative download sources

Makes the list of alternative sources displayed all the time
rather than just when the bounding box is too large, and adds
the Overpass API to the list of sources.

Fixes #606
Fixed #635

10 years agoRemove unused file
Tom Hughes [Sat, 7 Dec 2013 14:34:13 +0000 (14:34 +0000)]
Remove unused file

10 years agoPut all feed discovery tags in the auto_discovery_link_tag section
Tom Hughes [Sat, 7 Dec 2013 14:33:52 +0000 (14:33 +0000)]
Put all feed discovery tags in the auto_discovery_link_tag section

10 years agoDiary and trace feeds are RSS not Atom
Tom Hughes [Sat, 7 Dec 2013 14:31:59 +0000 (14:31 +0000)]
Diary and trace feeds are RSS not Atom

Fixes #638

10 years agoMake title of "More" menu translatable
Tom Hughes [Sat, 7 Dec 2013 11:24:44 +0000 (11:24 +0000)]
Make title of "More" menu translatable

10 years agoFix interpolation variable errors
Tom Hughes [Sat, 7 Dec 2013 11:16:02 +0000 (11:16 +0000)]
Fix interpolation variable errors

10 years agoAdd some more unit tests for the Trace model
Tom Hughes [Sat, 7 Dec 2013 00:28:01 +0000 (00:28 +0000)]
Add some more unit tests for the Trace model

10 years agoLocalisation updates from https://translatewiki.net.
Siebrand Mazeland [Sat, 7 Dec 2013 11:08:37 +0000 (11:08 +0000)]
Localisation updates from https://translatewiki.net.

10 years agoReapply leaflet.locate patch
Tom Hughes [Fri, 6 Dec 2013 19:40:54 +0000 (19:40 +0000)]
Reapply leaflet.locate patch

10 years agoUpdate leaflet.locate
Tom Hughes [Fri, 6 Dec 2013 19:40:31 +0000 (19:40 +0000)]
Update leaflet.locate

10 years agoUpdate to Leaflet 0.7.1
Tom Hughes [Fri, 6 Dec 2013 16:24:36 +0000 (16:24 +0000)]
Update to Leaflet 0.7.1

10 years agoObey the location hash for edit URLs with objects
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

10 years agoPass details of any selected object to remote editors
Tom Hughes [Fri, 6 Dec 2013 00:19:35 +0000 (00:19 +0000)]
Pass details of any selected object to remote editors

10 years agoFix translation interpolations
Tom Hughes [Thu, 5 Dec 2013 22:35:21 +0000 (22:35 +0000)]
Fix translation interpolations

10 years agoLocalisation updates from https://translatewiki.net.
Siebrand Mazeland [Thu, 5 Dec 2013 22:14:38 +0000 (22:14 +0000)]
Localisation updates from https://translatewiki.net.

10 years agoRun unload method before pushing the new state
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

10 years agoEnsure object parameter is removed from edit link when closing sidebar
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

10 years agoRestore marker for non-browse search results
John Firebaugh [Thu, 5 Dec 2013 19:07:52 +0000 (11:07 -0800)]
Restore marker for non-browse search results

Fixes #615

10 years agoRemove object parameter from share URL
John Firebaugh [Thu, 5 Dec 2013 18:59:15 +0000 (10:59 -0800)]
Remove object parameter from share URL

Fixes #616
Fixes #624

10 years agoExtend API to allow changesets to be queried by ids
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.

10 years agoReport an error if a bogus limit value is passed to a notes API call
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

10 years agoTest get_nodes_undelete methods of the OldWay model
Tom Hughes [Thu, 5 Dec 2013 17:49:06 +0000 (17:49 +0000)]
Test get_nodes_undelete methods of the OldWay model

10 years agoMake remote edit work when /edit is loaded
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.

10 years agoUse the map layout when rendering index for a remote edit
Tom Hughes [Thu, 5 Dec 2013 10:40:07 +0000 (10:40 +0000)]
Use the map layout when rendering index for a remote edit

10 years agoAlways use controller computed zoom when starting Potlatch
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.

10 years agoThe value of mapParams.object is always a node/way/relation now
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

10 years agoSimplify a number of object model methods
Tom Hughes [Thu, 5 Dec 2013 00:50:04 +0000 (00:50 +0000)]
Simplify a number of object model methods

10 years agoAdd tests for member methods on relation models
Tom Hughes [Thu, 5 Dec 2013 00:38:25 +0000 (00:38 +0000)]
Add tests for member methods on relation models

10 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

10 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

10 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

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

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

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

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

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

10 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

10 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

10 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

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

10 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

10 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

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

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

10 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

10 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

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

10 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

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

10 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

10 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

10 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

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

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

10 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

10 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

10 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

10 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

10 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

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

10 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

10 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

10 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

10 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

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

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

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

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

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

10 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

10 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

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

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

10 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

10 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

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

10 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