]> git.openstreetmap.org Git - rails.git/log
rails.git
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

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

10 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

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

10 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

10 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

10 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

10 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

10 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

10 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

10 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

10 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

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

10 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

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

10 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

10 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

10 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

10 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

10 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

10 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

10 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

10 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

10 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

10 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

10 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

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

10 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

11 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

11 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

11 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

11 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

11 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

11 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

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

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

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

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

11 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

11 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

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

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

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

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

11 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

11 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

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

11 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

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

11 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

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

11 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

11 years agoCompromise on fonts to look better on Windows
John Firebaugh [Fri, 22 Nov 2013 20:58:09 +0000 (12:58 -0800)]
Compromise on fonts to look better on Windows

11 years agoTweak welcome text
John Firebaugh [Fri, 22 Nov 2013 20:29:45 +0000 (12:29 -0800)]
Tweak welcome text

11 years agoRestore prev/next changeset by user links
John Firebaugh [Fri, 22 Nov 2013 20:13:12 +0000 (12:13 -0800)]
Restore prev/next changeset by user links

11 years agoPass along gpx parameter to iD
John Firebaugh [Fri, 22 Nov 2013 18:57:07 +0000 (10:57 -0800)]
Pass along gpx parameter to iD

See https://github.com/systemed/iD/issues/1965

11 years agoUse machine-readable lat/lon format
John Firebaugh [Thu, 21 Nov 2013 19:31:58 +0000 (11:31 -0800)]
Use machine-readable lat/lon format

11 years agoFix hidden text behind the search icon
Marco Antonio Frias Butrón [Thu, 21 Nov 2013 06:26:17 +0000 (02:26 -0400)]
Fix hidden text behind the search icon

11 years agoLocalisation updates from http://translatewiki.net.
Siebrand Mazeland [Thu, 21 Nov 2013 06:52:31 +0000 (06:52 +0000)]
Localisation updates from http://translatewiki.net.

11 years agoHide note overflow
Aaron Lidman [Wed, 20 Nov 2013 21:44:40 +0000 (13:44 -0800)]
Hide note overflow

Mostly for long links from craigslist notes.

11 years agoAdd coordinate detail to node pages
Aaron Lidman [Wed, 20 Nov 2013 21:31:05 +0000 (13:31 -0800)]
Add coordinate detail to node pages

11 years agoNominatim results zoom to the result location
Aaron Lidman [Wed, 20 Nov 2013 20:37:57 +0000 (12:37 -0800)]
Nominatim results zoom to the result location

11 years agoFixed individual note marker implementation, closes #78
Aaron Lidman [Wed, 20 Nov 2013 19:43:31 +0000 (11:43 -0800)]
Fixed individual note marker implementation, closes #78

- Removed forced noteLayer view, now respects current selection just
like an other browse page.
- Made marker replacement it’s own thing, seperate from noteLayer.
- Reduced opacity on noteLayer notes, it makes the selected note stand
out more

11 years agoSign Up -> Start Mapping
John Firebaugh [Tue, 19 Nov 2013 23:02:31 +0000 (15:02 -0800)]
Sign Up -> Start Mapping

11 years agoLogout -> Log Out
John Firebaugh [Tue, 19 Nov 2013 22:59:25 +0000 (14:59 -0800)]
Logout -> Log Out

11 years agoRefine changeset browse behavior
John Firebaugh [Tue, 19 Nov 2013 20:10:00 +0000 (12:10 -0800)]
Refine changeset browse behavior

The general history view shows changesets in the current view
and updates when you move the map. The view for an individual
user, nearby users, or friends zooms the map to the extent of
the results, and doesn't change when you move the map.

11 years agoImproved export warning, removed heading
Aaron Lidman [Tue, 19 Nov 2013 19:57:30 +0000 (11:57 -0800)]
Improved export warning, removed heading

11 years agoRevert padding; fixes header baseline
John Firebaugh [Tue, 19 Nov 2013 19:45:49 +0000 (11:45 -0800)]
Revert padding; fixes header baseline

11 years agoEliminate loading flash for welcome overlay
John Firebaugh [Tue, 19 Nov 2013 19:18:11 +0000 (11:18 -0800)]
Eliminate loading flash for welcome overlay

11 years agoFix test failures
John Firebaugh [Fri, 15 Nov 2013 23:36:54 +0000 (15:36 -0800)]
Fix test failures

11 years agoMerge branch 'master' into redesign
John Firebaugh [Tue, 19 Nov 2013 17:42:47 +0000 (09:42 -0800)]
Merge branch 'master' into redesign

Conflicts:
vendor/assets/leaflet/leaflet.hash.js
vendor/assets/leaflet/leaflet.js

11 years agoLocalisation updates from http://translatewiki.net.
Siebrand Mazeland [Tue, 19 Nov 2013 06:57:29 +0000 (06:57 +0000)]
Localisation updates from http://translatewiki.net.

11 years agoImproved export filter tool
Aaron Lidman [Tue, 19 Nov 2013 03:11:01 +0000 (19:11 -0800)]
Improved export filter tool

11 years agoFixed export filter
Aaron Lidman [Tue, 19 Nov 2013 02:44:48 +0000 (18:44 -0800)]
Fixed export filter

11 years agoShorten intro text
John Firebaugh [Tue, 19 Nov 2013 02:04:05 +0000 (18:04 -0800)]
Shorten intro text

11 years agoImprovements to changeset bbox styling
Aaron Lidman [Tue, 19 Nov 2013 01:29:55 +0000 (17:29 -0800)]
Improvements to changeset bbox styling

11 years agoWrap bounds of changeset request, closes #72
Aaron Lidman [Tue, 19 Nov 2013 00:41:25 +0000 (16:41 -0800)]
Wrap bounds of changeset request, closes #72

11 years agoIncrease sidebar width, back to 350px
Aaron Lidman [Tue, 19 Nov 2013 00:24:52 +0000 (16:24 -0800)]
Increase sidebar width, back to 350px

11 years agoReorder changeset detail lists
Aaron Lidman [Tue, 19 Nov 2013 00:24:25 +0000 (16:24 -0800)]
Reorder changeset detail lists

Nodes, ways, relations -> Ways, relations, nodes

11 years agoBetter spaced changeset lists
Aaron Lidman [Tue, 19 Nov 2013 00:02:48 +0000 (16:02 -0800)]
Better spaced changeset lists

11 years agoImprove changeset detail display
Aaron Lidman [Mon, 18 Nov 2013 23:23:48 +0000 (15:23 -0800)]
Improve changeset detail display

11 years agoFix new note wrapping
Aaron Lidman [Mon, 18 Nov 2013 19:43:48 +0000 (11:43 -0800)]
Fix new note wrapping

11 years agoAdjust header sizing
Aaron Lidman [Mon, 18 Nov 2013 19:26:43 +0000 (11:26 -0800)]
Adjust header sizing

11 years agoFix welcome page redirect, closed #70
Aaron Lidman [Mon, 18 Nov 2013 17:56:03 +0000 (09:56 -0800)]
Fix welcome page redirect, closed #70

11 years agoUpdate to latest leaflet-locationfilter plugin
Tom Hughes [Mon, 18 Nov 2013 17:41:33 +0000 (17:41 +0000)]
Update to latest leaflet-locationfilter plugin

11 years agoUpdate to latest leaflet-osm plugin
Tom Hughes [Mon, 18 Nov 2013 17:38:06 +0000 (17:38 +0000)]
Update to latest leaflet-osm plugin

11 years agoUpdate to latest Leaflet-hash plugin
Tom Hughes [Mon, 18 Nov 2013 17:36:09 +0000 (17:36 +0000)]
Update to latest Leaflet-hash plugin

11 years agoUpdate to Leaflet 0.7
Tom Hughes [Mon, 18 Nov 2013 17:34:22 +0000 (17:34 +0000)]
Update to Leaflet 0.7

11 years agoRemove the _osm_username cookie and session validation logic
Tom Hughes [Sun, 17 Nov 2013 21:52:04 +0000 (21:52 +0000)]
Remove the _osm_username cookie and session validation logic

This was a temporary hack to workaround issues with sessions getting
mixed up at the time of the rails 3.1 upgrade, but logs indicate that
whatever the original problem was it is no longer occurring.