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

4830 commits

Author SHA1 Message Date
hikemaniac
908f9b5276
Rebase to current master 
Merge openstreetmap/openstreetmap-website into hikemaniac/openstreetmap-website
 2018-05-18 13:59:59 +02:00
Peter Karich
1cea6b363a Use XHR instead of jsonp for GraphHopper 
Closes #1872
 2018-05-17 20:47:58 +01:00
Tom Hughes
99492de1d3 Convert note view to use server side conditions 
Fixes #1869
 2018-05-17 11:33:50 +01:00
Tom Hughes
fdd4361d5b Remove some inline styles 2018-05-16 20:27:35 +01:00
Tom Hughes
9c04912f1d Merge remote-tracking branch 'upstream/pull/1866' 2018-05-16 18:57:34 +01:00
Tom Hughes
9227f6aecd Allow iD to access wikidata 2018-05-16 11:36:46 +01:00
Tom Hughes
8d41015673 Allow iD to access wikipedia 2018-05-16 08:48:38 +01:00
Andy Allan
e1c62f1bf2 Remove if_user and similar methods 
Rather than hiding features based on CSS, just avoid including them
in the output. Fixes #1862
 2018-05-16 13:05:20 +08:00
hikemaniac
d799f4e750 Fix a browse icon typo. 2018-05-15 20:05:40 +02:00
Tom Hughes
9e50c3851c Merge remote-tracking branch 'upstream/pull/1863' 2018-05-15 18:36:55 +01:00
Tom Hughes
50f85248db Use https to launch the remote editor except for modern browsers 
Currently only Chrome 53+ and Firefox 55+ are known to support loading
of http resources from localhost for an https page.
 2018-05-15 14:21:09 +01:00
Tom Hughes
79284a0fcd Add frame-src to allow http://127.0.0.1:8111 2018-05-15 12:43:37 +01:00
Andy Allan
84fa437d50 Ensure database is writable before destroying a message 2018-05-15 18:28:33 +08:00
Andy Allan
4ec70f7994 Rename messages#read to #show 
Also rename the named path, to align with resourceful routing
 2018-05-15 18:25:54 +08:00
Andy Allan
73df8447e3 Rename messages#delete to destroy 
This is a better fit for rails controller method conventions, paving
the way to resourceful routing. Keep user-facing strings as 'delete'
since that's more commonly used.
 2018-05-15 18:15:01 +08:00
Tom Hughes
d14cf519fd Merge remote-tracking branch 'upstream/pull/1858' 2018-05-14 20:14:56 +01:00
Tom Hughes
33ea119c8f Merge remote-tracking branch 'upstream/pull/1857' 2018-05-14 20:13:41 +01:00
Tom Hughes
0e810db927 Make CSP rule for the remote control explicitly allow http 2018-05-13 16:01:39 +01:00
Tom Hughes
d7063ab0a9 Merge remote-tracking branch 'upstream/pull/1851' 2018-05-13 15:24:44 +01:00
Andy Allan
00bd64c7fb Rename message_controller to messages_controller 2018-05-09 16:38:37 +08:00
Andy Allan
ec13ef77bc Lazy lookups for translations in message_controller.rb 2018-05-09 16:25:42 +08:00
Andy Allan
b446138aef Rename trace_controller to traces_controller 2018-05-09 12:38:09 +08:00
Andy Allan
a1853204fa More lazy translation lookups for traces 2018-05-09 12:08:39 +08:00
Andy Allan
011cfa794a Use named paths for messages 2018-05-09 11:24:11 +08:00
Tom Hughes
64f3a1a947 Fix translation lookups for roundabout exits 2018-04-30 23:01:08 +01:00
Tom Hughes
91c30d3a8c Avoid using "one" and "two" as translation keys 2018-04-30 22:38:43 +01:00
Tom Hughes
69ff048ae1 Merge remote-tracking branch 'upstream/pull/1802' 2018-04-30 18:56:09 +01:00
Tom Hughes
1ecf146766 Add terminating semicolon to overpass query 
Fixes #1843
 2018-04-30 18:54:31 +01:00
J Guthrie
e833ef6315 Separated ordinal roundabout exit text from normal exit text 2018-04-29 21:59:54 +01:00
J Guthrie
e0b175d3bd Merge branch 'convert_roundabout_exits' of https://github.com/jguthrie100/openstreetmap-website into convert_roundabout_exits 2018-04-29 21:44:26 +01:00
J Guthrie
9efa2c7b92 Change roundabout exit logic and remove blank string from locale file 2018-04-29 20:30:44 +01:00
Jamie Guthrie
76bc5eba06
Merge branch 'master' into convert_roundabout_exits 2018-04-29 19:53:57 +01:00
Tom Hughes
f349aeb061 Update translation keys for renaming of note to notes 2018-04-29 01:09:38 +01:00
Tom Hughes
d7b43c5f17 Fix syntax error with ruby 2.5 2018-04-28 17:12:27 +01:00
J Guthrie
4330dcdf94 Added exit counts as seperate keys in locale file 2018-04-26 00:43:01 +01:00
Rajdeep Mandrekar
3def2f839f Use rails helpers to construct URLs 
Fixes #1817
Closes #1840
 2018-04-25 22:22:51 +01:00
Tom Hughes
827024f7e6 Merge remote-tracking branch 'upstream/pull/1833' 2018-04-25 17:44:53 +01:00
Tom Hughes
b15a8c73d9 Merge remote-tracking branch 'upstream/pull/1839' 2018-04-25 17:39:27 +01:00
Tom Hughes
00425c8fca Merge remote-tracking branch 'upstream/pull/1838' 2018-04-25 17:38:35 +01:00
Tom Hughes
aebfbdcfbd Merge remote-tracking branch 'upstream/pull/1837' 2018-04-25 17:38:19 +01:00
Tom Hughes
0d7c9a187e Merge remote-tracking branch 'upstream/pull/1836' 2018-04-25 17:37:55 +01:00
Tom Hughes
7f24a2f1d6 Merge remote-tracking branch 'upstream/pull/1835' 2018-04-25 17:37:34 +01:00
Andy Allan
af4003e2ee Lazy translation lookups and key renames for help page. 2018-04-25 17:09:29 +08:00
Andy Allan
7d0a94552c Lazy translation lookup and key renames for fixthemap page. 2018-04-25 17:09:29 +08:00
Andy Allan
fb16b5ed14 Use lazy lookups and rename translation keys for export 2018-04-25 17:09:29 +08:00
Andy Allan
c7e514a56b Use lazy lookups and rename keys for the copyright page 2018-04-25 16:33:34 +08:00
Andy Allan
ab79d8c520 Use lazy lookups and rename keys for the welcome page. 2018-04-25 16:33:34 +08:00
Andy Allan
246596225e Use lazy lookups and rename keys for the about page. 2018-04-25 16:19:46 +08:00
Andy Allan
8d45f1a5cf Use lazy lookups for site translations 2018-04-25 16:04:34 +08:00
Andy Allan
3720004d9c Remove empty and unused view template 2018-04-25 15:51:48 +08:00