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

4683 commits

Author SHA1 Message Date
Tom Hughes
ba9a00b10c Merge remote-tracking branch 'upstream/pull/1892' 2018-06-06 14:51:30 +01:00
Tom Hughes
beec16232d Update style for change of name for message controller 2018-06-06 14:45:19 +01:00
Tom Hughes
4df0fe72e2 Merge remote-tracking branch 'upstream/pull/1893' 2018-06-06 14:33:36 +01:00
Tom Hughes
3da3b93f80 Merge remote-tracking branch 'upstream/pull/1894' 2018-06-06 14:30:27 +01:00
Tom Hughes
a516d13d33 Allow iD to access ESRI imagery metadata 2018-06-06 14:25:52 +01:00
Andy Allan
e276bea2ff Prefer the helper in controllers 
This avoids future gotchas with conversion to lazy lookups.
 2018-06-06 13:34:34 +08:00
Andy Allan
25c2feaec9 Fix lazy i18n lookups for browse error pages 
`I18n.t` doesn't support lazy lookups, whereas the equivalent
rails `t` helper does. The code can also be simplified to avoid the
lookup table.

Fixes 1877
 2018-06-06 13:25:40 +08:00
Andy Allan
3e5a953e8f Fix missing message translation strings 2018-06-06 11:53:05 +08:00
Andy Allan
88ff81b694 Refactor messages show action to be resourceful 2018-06-06 11:51:52 +08:00
Andy Allan
9b36021ec5 Refactor inbox and outbox paths to avoid display names in urls. 2018-06-06 11:33:33 +08:00
Andy Allan
57d3b3af55 Refactor trace creation pages 
Split the trace creation into new and create methods, with standard resourceful routing. Provide a redirect for external requests to the old url.
 2018-06-06 10:22:42 +08:00
Tom Hughes
4a6779abf7 Avoid using inline javascript to update message list 2018-05-30 15:30:23 +01:00
David Abián
ed1f441ef3 Concept URIs for Wikidata entities 
Wikidata entities should be linked using concept URIs, which are
permanent. This is the right way of linking web resources according
to the Linked Data principles.

Closes #1884
 2018-05-28 13:02:47 +01:00
J Guthrie
30756f72ca Change language immediately after updating settings 
Closes #1883
 2018-05-27 15:12:34 +01:00
Benoît
e1f37fcc84 Improve HOT layer attribution 
The style is by HOT and the server is provided by OpenStreetMap France.

Closes #1882
 2018-05-25 10:22:56 +01:00
Edward Betts
196ac7c0d5 Wrap the permission label with a <label> tag 
Gives the user a larger target to toggle a permission.
 2018-05-24 15:41:32 +01:00
Andy Allan
6b2dcfd3d8
Merge pull request #1871 from hikemaniac/browse-icon-typo 
Fix a browse icon typo
 2018-05-24 11:39:22 +08:00
Tom Hughes
fb94bb6c58 Don't override non-existent policy 2018-05-23 12:50:10 +01:00
Tom Hughes
ff86bf136a Use an empty array for ruby 2.3 compatibility 
Apparently `false.dup` throws in ruby 2.3 and not in 2.5...
 2018-05-23 12:21:24 +01:00
Tom Hughes
5deba2782a Completely remove form-action restrictions for OAuth callbacks 
The CSP3 draft only allows a * rule match network schemes and
mobile devices often use callbacks to custom URL schemes.
 2018-05-23 12:09:21 +01:00
Tom Hughes
c5d3335a6c Allow inline styles in iD 2018-05-18 20:28:09 +01:00
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