Commit graph

7122 commits

Author SHA1 Message Date
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
Holger Jeromin
a0aa5a1741 Removed bogus filter:url(#filter6591-2); from sprite
The SVG file had a buggy filter in it, which prevented chrome
fro loading most icons from it.
2015-09-13 19:09:23 +01:00
Tom Hughes
d27eb63941 Disable jpegtran 2015-09-13 11:46:13 +01:00
Holger Jeromin
ecc4b64a23 Use HTML5 picture element to prefer SVG logo 2015-09-13 10:50:12 +01:00
Tom Hughes
284b56bee9 Use image_optim to optimize SVG assets with svgo 2015-09-13 10:48:33 +01:00
Tom Hughes
46d2e4ccfc Update bundle 2015-09-13 09:53:01 +01:00
Tom Hughes
66285e2820 Fix interpolation errors 2015-09-10 10:11:39 +01:00
Siebrand Mazeland
ec9b21bf1e Localisation updates from https://translatewiki.net. 2015-09-10 10:38:58 +02:00
Tom Hughes
e3de1c4572 Update to Leaflet 0.7.5 2015-09-02 19:05:24 +01:00
Tom Hughes
9ceb077afc Update to Leaflet 0.7.4 2015-09-01 19:08:44 +01:00
Tom Hughes
fe4d50588d Update test for changes in #903 2015-08-27 21:55:48 +01:00
Tom Hughes
9a9b045372 Merge remote-tracking branch 'openstreetmap/pull/891' 2015-08-27 21:46:56 +01:00
Tom Hughes
037585db39 Merge remote-tracking branch 'openstreetmap/pull/903' 2015-08-27 21:44:44 +01:00
Tom Hughes
db7374f2bb Merge remote-tracking branch 'openstreetmap/pull/1040' 2015-08-27 21:30:50 +01:00
Tom Hughes
dca0be1886 Merge remote-tracking branch 'openstreetmap/pull/1045' 2015-08-27 21:21:45 +01:00
Tom Hughes
d0998f3a63 Merge remote-tracking branch 'openstreetmap/pull/1043' 2015-08-27 21:18:05 +01:00
Tom Hughes
e479a8297c Mark some flash messages as html safe 2015-08-27 20:43:50 +01:00
Simon Legner
91bd0b4b12 Display number of comments in changeset list 2015-08-27 21:26:31 +02:00
Simon Legner
2520bdb9eb Close layers panel on double-clicking a layer
Relates to #465.
2015-08-26 23:31:36 +02:00
Simon Legner
6d511fbd34 Directions, read "to" location in URL - fixes #998 2015-08-26 21:38:39 +02:00
Tom Hughes
ee9ac1930d Update to rails 4.2.4 2015-08-24 22:32:00 +01:00
Tom Hughes
618526ba62 Don't treat flash messages as raw
This will likely break some things, but we should fix them
properly so that the rails auto-escaping can work.

Fixes #1027
2015-08-24 10:49:04 +01:00
Tom Hughes
41eb7a1407 Test rendering of OAuth authorization page 2015-08-19 08:35:41 +01:00
Tom Hughes
036519a448 Add missing parenthesis
Fixes #1037
2015-08-19 08:25:41 +01:00
Tom Hughes
c9d35839be Fix new rubocopy warnings 2015-08-18 20:57:14 +01:00