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

7904 commits

This branch
This branch
All branches
Author SHA1 Message Date
Niklas Laxström
f6c8f12179 Localisation updates from https://translatewiki.net. 2017-02-20 08:45:42 +01:00
Andy Allan
737a325f2e Refactor diary entry tests to use User factory 2017-02-19 16:43:32 +00:00
Tom Hughes
9b52542e52 Use simple string matches for user_blocks_helper tests 
Testing against the translations is not something we do anywhere
else is and is dangerously close to testing the helper against
itself which is a bit pointless.
 2017-02-19 11:50:01 +00:00
Tom Hughes
9c926c6c71 Use the factory to create user blocks 2017-02-19 11:42:38 +00:00
Tom Hughes
1e9a3f8664 Merge remote-tracking branch 'openstreetmap/pull/1445' 2017-02-19 11:38:27 +00:00
Simon Poole
325cd12c24 Make rupocop happy and correct placement of include 2017-02-19 12:35:02 +01:00
Simon Poole
455e906afa Improve wording and add test 2017-02-19 11:59:34 +01: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
Tom Hughes
80ff26802f Remove fake qqq locale 2017-02-16 08:43:34 +00:00
Niklas Laxström
703c91b46e Localisation updates from https://translatewiki.net. 2017-02-16 09:35:31 +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
Tom Hughes
34129ad9b5 Remove U+200C unicode "zero width non-joiner" from html.dir 2017-02-13 09:57:11 +00:00
Tom Hughes
feedf9984d Remove fake qqq locale 2017-02-13 09:21:04 +00:00
Niklas Laxström
33a9a1a110 Localisation updates from https://translatewiki.net. 2017-02-13 09:05:41 +01: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
e4f1588aa1 Update Leaflet.contextmenu to the 1.2.1 release 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
Tom Hughes
043d29fd7e Merge remote-tracking branch 'openstreetmap/pull/1030' into next 2017-02-12 15:04:50 +00:00
Herve Saint-Amand
fcba1a9857 A better way to contrain the width of the message box whilst also allowing it to shrink on narrow displays 
Setting a hard "width" it very compatible, but won't squeeze on narrow screens. Setting max-width works well, except in Outlook and Hotmail. We resort to old skool table tricks: a table with width=100%, with 3 columns, only oneof which, the middle one, had content, and a fixed with. This works.
 2017-02-12 12:04:43 +00:00
Herve Saint-Amand
6964c44584 Two more "nowrap" instructions removed to accommodate narrower displays 2017-02-11 21:08:36 +00:00
Herve Saint-Amand
acf933055f Remove nowrap on footer text, to accommodate narrow screens 2017-02-11 20:51:03 +00:00
Herve Saint-Amand
44d4a521a3 Set font on title 2017-02-11 20:50:28 +00:00
Nick Ingalls
a4eef7dab8 Remove invalid YML 
Closes #1434
 2017-02-09 22:31:14 +00:00
Herve Saint-Amand
82a6bb0d5a Make the mails squeezable on narrow screens 2017-02-09 21:39:49 +00:00
Tom Hughes
c439f957ae Only add traces for POST requests 2017-02-09 21:07:44 +00:00
Tom Hughes
92fe7a8506 Only create diary entries for POST requests 2017-02-09 21:07:18 +00:00
Tom Hughes
349862f1b7 Test that GET on message#new can't send a message 2017-02-09 20:39:03 +00:00
Herve Saint-Amand
852cc97707 Fixed alignment & underlining bugs in Outlook / WinMail 2017-02-09 20:38:02 +00:00
Tom Hughes
afa82bd2b1 Render message properly on error 2017-02-09 20:20:55 +00:00
Tom Hughes
4709d90594 Only send messages for POST requests 2017-02-09 19:37:48 +00:00
Tom Hughes
d798cc3bf7 Remove fake qqq locale 2017-02-09 08:47:59 +00:00