Commit graph

8666 commits

Author SHA1 Message Date
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
Andy Allan
40cab845fb Remove unused POST method for message replies
This action just shows the pre-filled form, with the target for
the form being the same as for new messages.
2018-05-15 17:33:40 +08:00
Bryan Housel
2fd0d2304f Upgrade community index to 0.4.3 to fix issue with tirana polygon 2018-05-14 20:35:29 -04:00
Bryan Housel
b204b9dc64 Update to iD v2.8.2 2018-05-14 17:55:32 -04: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
e1050a2d1d Quote translations to stop them looking like numbers 2018-05-14 20:09:14 +01:00
translatewiki.net
f38824856d Localisation updates from https://translatewiki.net. 2018-05-14 08:24:58 +02: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
Tom Hughes
bc39159a68 Merge remote-tracking branch 'upstream/pull/1850' 2018-05-13 15:23:54 +01:00
Tom Hughes
71cd409f61 Quote translations to stop them looking like numbers 2018-05-13 15:17:08 +01:00
translatewiki.net
c0fa67af5c Localisation updates from https://translatewiki.net. 2018-05-10 10:28:45 +02: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
52f0ba78ea Quote translations to stop them looking like numbers 2018-05-07 15:21:50 +01:00
translatewiki.net
7c797157bc Localisation updates from https://translatewiki.net. 2018-05-07 08:07:53 +02:00
translatewiki.net
385ce3304a Localisation updates from https://translatewiki.net. 2018-05-03 09:34:57 +02: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
translatewiki.net
b10ac932c0 Localisation updates from https://translatewiki.net. 2018-04-30 08:31:00 +02: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
8bd001f128 Merge remote-tracking branch 'upstream/pull/1809' 2018-04-29 19:37:50 +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
Tom Hughes
cb0c185ce6 Update xid_to_int4 to use postgres version 1 calling convention 2018-04-28 15:16:46 +01:00
translatewiki.net
76d51a2a36 Localisation updates from https://translatewiki.net. 2018-04-26 08:05:31 +02:00
J Guthrie
e4c37036db Removed directions from roundabout exit instructions 2018-04-26 00:51:35 +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
Tom Hughes
c783b5c82f Merge remote-tracking branch 'upstream/pull/1834' 2018-04-25 17:37:31 +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