cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
7960 commits 4 branches 1 tag 499 MiB
Commit graph

4456 commits

Author SHA1 Message Date
Tom Hughes
88d16deadd Detect a timeout encapsulated in ActionView::Template::Error 
Fixes #1476
 2017-03-06 17:50:09 +00:00
Tom Hughes
6c0501d62a Fix hiding of sidebar loading indicator 
Fixes #1475
 2017-03-06 12:22:14 +00:00
Tom Hughes
dff0eef787 Remove inline styles 2017-03-05 19:51:01 +00:00
Han Chao
49a7921ec8 Use local api to export map.osm 
Closes #1282
 2017-03-05 10:37:25 +00:00
Tom Hughes
b954416a70 Merge remote-tracking branch 'openstreetmap/pull/1437' 2017-03-05 10:34:23 +00:00
Tom Hughes
d3b9987bb8 Silence remaining jshint warnings 2017-03-02 10:44:18 +00:00
Tom Hughes
427f5457d9 Fix some jshint warnings 2017-03-02 10:20:51 +00:00
Tom Hughes
c5ef6404f5 Improve the content security policy 2017-03-01 22:38:24 +00:00
Tom Hughes
d7b4f88d5e Remove inline javascript from page header 2017-03-01 21:19:32 +00:00
Tom Hughes
293fb99467 Remove inline javascript from id views 2017-03-01 18:07:22 +00:00
Tom Hughes
fe159b2417 Correct name of zoom argument for Potlatch 2 
Fixes #1471
 2017-03-01 14:06:05 +00:00
Tom Hughes
1b21b8a209 Remove inline javascript from potlatch2 view 2017-03-01 00:12:42 +00:00
Tom Hughes
8c3d16ecc4 Remove inline javascript from potlatch view 2017-02-28 20:41:22 +00:00
Tom Hughes
56e96d856c Merge remote-tracking branch 'openstreetmap/pull/1469' 2017-02-28 00:21:23 +00:00
Tom Hughes
d13348c0ea Remove inline javascript from user views 2017-02-27 22:51:03 +00:00
Herve Saint-Amand
b69e8b5c42 Included greeting string in changeset_comment_notification email 2017-02-27 22:36:09 +00:00
Tom Hughes
57443546f8 Revert "Update iD frame parameters if the parent URL changes" 
This reverts commit a6fa8cc273.
 2017-02-27 14:31:56 +00:00
Tom Hughes
a6fa8cc273 Update iD frame parameters if the parent URL changes 
Fixes #1468
 2017-02-27 13:23:27 +00:00
Tom Hughes
428e7d6baa Merge remote-tracking branch 'openstreetmap/pull/1467' 2017-02-26 22:22:48 +00:00
Simon Poole
12013f60a0 Externalize message about missing OAuth capabilities/permissions and make it less technical 2017-02-26 21:43:43 +01:00
Tom Hughes
40a8e5caf5 Add support for Content-Security-Policy 
Currently this is report only, and disabled unless a report URL has
been set in the application configuration.
 2017-02-26 19:48:13 +00:00
Tom Hughes
8db0548119 Remove explicit context menu width 
Firefox and Chromium at least seem to autosize correctly based
on the actual text in use for a given locale.
 2017-02-25 10:57:00 +00:00
Tom Hughes
4b43396ede Rename 'clickable' to 'interactive' per leaflet 1.x change 2017-02-24 23:10:12 +00:00
Tom Hughes
392b68a65f Merge remote-tracking branch 'openstreetmap/pull/1436' 2017-02-23 10:06:42 +00:00
Tom Hughes
ad0e829fc7 Enable context menu on mouse down with no shift pressed 2017-02-21 09:16:38 +00:00
Tom Hughes
425f3f309b Use created at for RSS format with note#show 
This matches other formats and is also what the tests expect.
 2017-02-20 08:50:56 +00:00
Tom Hughes
1e9a3f8664 Merge remote-tracking branch 'openstreetmap/pull/1445' 2017-02-19 11:38:27 +00:00
Holger Jeromin
d716e4095b Fix shift key handling in contextmenu 2017-02-19 09:45:47 +01:00
Simon Poole
998a84a1b4 Small improvement to block status display 2017-02-18 18:08:25 +01:00
Tom Hughes
0bdf29f10b Merge branch 'contextmenu' 2017-02-18 16:20:20 +00:00
Tom Hughes
af72cb51e9 Fix rubocop warnings 2017-02-18 16:18:04 +00:00
Tom Hughes
8e6a5c21cb Merge remote-tracking branch 'openstreetmap/pull/1443' 2017-02-18 16:08:04 +00:00
Simon Poole
7f05783949 Make test for a "zero hour" block more robust 2017-02-18 17:05:36 +01:00
Tom Hughes
7a0766a5e6 Apparently some fool things the colon is part of the protocol 2017-02-18 15:38:14 +00:00
Simon Poole
58c61c7962 Actually use user_block 2017-02-18 16:17:46 +01:00
Simon Poole
823f6b4d36 Add functionality to return a specific message for zero hour blocks 2017-02-18 13:53:21 +01:00
Tom Hughes
b170c06d5c Preserve protocol in standard links 2017-02-18 12:18:34 +00:00
Tom Hughes
77fee91785 Preserve protocol in short links 2017-02-18 12:08:58 +00:00
Tom Hughes
9fb382eaa9 Initialise locale before looking up user blocked error 2017-02-17 19:59:06 +00:00
Matt Amos
469f64384d Implement the OWG credit policy for hosting partners. 
See https://operations.osmfoundation.org/policies/hosting/
 2017-02-17 11:52:04 +00:00
Tom Hughes
d1044674c5 Merge remote-tracking branch 'openstreetmap/pull/1439' 2017-02-16 20:31:34 +00:00
Nicolas Cornu
63fca227ca Add line segment to each steps of GraphHopper routing 2017-02-16 21:19:55 +01:00
Nicolas Cornu
ffeddd62a8 Fix latLng from GraphHopper engine 
latLng is an array and not a latLng object
 2017-02-16 20:59:42 +01:00
Nicolas Cornu
5401055ce1 Add Ascend/Descend when routing with GraphHopper 2017-02-16 19:52:41 +01:00
Herve Saint-Amand
cc65b2d126 Fixed quote style to please rubocop 2017-02-13 12:08:41 +00:00
Tom Hughes
e23541c20f Allow a POST with no arguments to trace#edit to fetch the form 2017-02-13 10:09:43 +00:00
Herve Saint-Amand
a520f1251c merging master into html-mail-fixes 2017-02-12 21:05:38 +00:00
Tom Hughes
8376a430b6 Allow context menu to add notes without panning the map 2017-02-12 19:19:14 +00:00
Tom Hughes
e58a5c69d3 Make context menu entries translateable 2017-02-12 19:19:14 +00:00
Tom Hughes
430978fab7 Improve context menu initialisation to avoid namespace pollution 2017-02-12 19:19:13 +00:00