Commit graph

7259 commits

Author SHA1 Message Date
Tom Hughes
bb9f20710e Merge remote-tracking branch 'openstreetmap/pull/1082' 2015-12-07 14:21:57 +00:00
Tom Hughes
ec9d2fde78 Merge remote-tracking branch 'openstreetmap/pull/1085' 2015-12-07 14:11:35 +00:00
Tom Hughes
e20bb507f1 Fix issues with bogus % encoded sequences in URLs
Add a URI sanitizer to the rack stack avoid rack throwing
exceptions on the server side, and ignore errors decoding
components on the client side.

Fixes #1101
2015-12-07 13:52:20 +00:00
Florian Schäfer
d02ea8a133 Allow closing the sidebar when a timeout occured 2015-12-05 21:59:27 +01:00
Tom Hughes
d218d5bf7d Fix display of raw HTML in flash message
Fixes #1095
2015-11-30 08:56:26 +00:00
Bryan Housel
33b5af5c85 Don't update urlhash while in intro
This should cut down on the errant edits in Three Rivers, MI.
Users getting stuck in walkthrough are probably refreshing their browser and
returning to the location in the walkthrough where they got stuck.
2015-11-23 14:00:25 -05:00
Tom Hughes
c56bf5677a Switch back to the upsteam image_optim 2015-11-21 16:21:30 +00:00
Tom Hughes
7f3bb52b65 Update to rails 4.2.5 2015-11-19 21:41:33 +00:00
Tom Hughes
081ac24295 Fix rubocop warnings 2015-11-19 21:41:33 +00:00
Tom Hughes
c96eb7d181 Update image_optim and disable cleanupIDs plugin 2015-11-19 21:29:23 +00:00
Aditya Prakash
ed151fdb78 Hide .describe_location on push and popstate 2015-11-13 09:41:47 +05:30
Edward17
3297444ecd Icon for shop=car_parts added 2015-11-08 21:55:57 +01:00
Bryan Housel
db78390ef3 Update to iD v1.8.0 2015-11-07 23:18:03 -05:00
Tom Hughes
82b4c8e3f0 Pass title to opengraph routine 2015-11-05 11:44:08 +00:00
Andrew Hain
f9570c4f05 Update key and data browser for new road colours
Update colours for main roads to match new style and replace
references to trunk, primary and secondary in the key with a
generic reference to main roads as trunk, primary and secondary
here have OSM specific meaning.

Also change road icons in the data browser to be the same colours
as the revised colours in the standard map style. The top and bottom
lines for motorway, trunk and primary are in the casing colours,
secondary and tertiary are 50% intensity of casing colour. Tertiary
is made deeper.
2015-11-01 22:29:03 +00:00
Tom Hughes
c9fdd5d3cb Don't send note comment notifications to deleted users 2015-10-30 19:20:36 +00:00
Tom Hughes
a082baebd7 Don't send changeset comment notifications to deleted users 2015-10-30 19:01:09 +00:00
Tom Hughes
243129b671 Add og:description to OpenGraph tags 2015-10-27 12:02:13 +00:00
Tom Hughes
c8640c8f82 Add og:url to OpenGraph tags 2015-10-27 12:01:58 +00:00
Tom Hughes
18d26c0d81 Use PNG logo for og:image 2015-10-27 12:01:44 +00:00
Tom Hughes
e62e879b3b Add more detail to OpenGraph tags
Closes #1073
2015-10-26 22:27:21 +00:00
Tom Hughes
447fef40cf Merge remote-tracking branch 'openstreetmap/pull/1078' 2015-10-26 15:51:59 +00:00
Tom Hughes
2b015ff522 Update leaflet to 0.7.7 2015-10-26 15:48:43 +00:00
Aditya Prakash
57a9c0d4fa Remove inline property of secondary links on diary page 2015-10-26 12:33:57 +05:30
Siebrand Mazeland
91d22710ba Localisation updates from https://translatewiki.net. 2015-10-22 11:37:14 +02:00
Siebrand Mazeland
6078c3ea0d Localisation updates from https://translatewiki.net. 2015-10-14 13:00:07 +02:00
Tom Hughes
3932c6b7f2 User ferry icon for kFerryEnter with Mapzen routing 2015-10-12 21:17:57 +01:00
Tom Hughes
d2765cb23d Merge remote-tracking branch 'openstreetmap/pull/1068' 2015-10-12 21:15:47 +01:00
Simon Legner
ee5e4ac5a4 Add ferry routing information for OSRM
Relates to #1000.

Uses instruction code 18 to represent a ferry instruction. Ferry icon
taken from Mapbox Maki set (CC0).
2015-10-06 21:09:56 +02:00
Andrew Zaborowski
f4a43c3ce2 Close html <source> tags
Apparently this unclosed tag didn't break rendering but judging from the
fact that this was the only unclosed tag and was introduced recently,
it probably wasn't intended.  The unit tests did expect the tag to be
closed.
2015-10-04 02:13:57 +02:00
Tom Hughes
509f07b32e Switch back to the upstream omniauth-google-oauth2 gem
Out patch is included now, so there is no need to use our version.
2015-10-02 09:01:58 +01:00
Tom Hughes
3c771a7844 Improve error handling for routing engines 2015-09-30 21:58:16 +01:00
Tom Hughes
3f93341506 Make travis copy example.application.yml to application.yml 2015-09-30 19:56:02 +01:00
Tom Hughes
d1d784bcca Ensure assets are recompiled when configuration changes 2015-09-30 19:34:14 +01:00
Tom Hughes
8df1212b59 Scale total distance to metres for Mapzen 2015-09-30 17:22:27 +01:00
Tom Hughes
e54eadea95 Add support for Mapzen's Valhalla routing engine 2015-09-29 15:37:04 +01:00
Tom Hughes
24eaeb2653 Fix jshint warning 2015-09-28 15:01:41 +01:00
Tom Hughes
31c80f6646 Use jsonp for MapQuest as CORS doesn't seem to be working 2015-09-28 14:47:32 +01:00
Tom Hughes
38213ab588 Allow jQuery to construct the routing URLs 2015-09-28 14:43:36 +01:00
Tom Hughes
2d6fb571dc Make MapQuest API key conditional 2015-09-28 13:54:49 +01:00
Tom Hughes
7dd23a4b56 Move the MapQuest API key to the configuration file 2015-09-28 13:45:01 +01:00
Tom Hughes
1dbc655235 Update Potlatch 2 to 2.4-12-g7158c69 build 2015-09-28 08:38:02 +01:00
Tom Hughes
36cbda3c80 Sprockets 3 seems to be OK now 2015-09-25 15:18:47 +01:00
Siebrand Mazeland
bafadbdac5 Localisation updates from https://translatewiki.net. 2015-09-25 16:12:45 +02:00
Bryan Housel
81408141e9 Allow iD in iframe to request fullscreen 2015-09-16 00:17:27 -04:00
Bryan Housel
92d284a678 Update to iD v1.7.4 2015-09-16 00:02:51 -04:00
Holger Jeromin
37a4fc6dd1 Add srcset to img tags inside picture elements
Some browsers (in particular Safari on iOS) don't support picture
yet but do support srcset on the img tag.
2015-09-15 08:48:50 +01:00
Holger Jeromin
9aaea24702 Converted inkscape font info to font-family 2015-09-15 08:34:50 +01:00
Tom Hughes
0d0498d303 Use SVG for sprites for better high DPI support 2015-09-14 08:45:13 +01:00
Tom Hughes
d377e8b4f2 Use picture elements to render some more graphics as SVG 2015-09-13 22:42:12 +01:00