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

8435 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
5f31e8d99d Merge remote-tracking branch 'upstream/pull/1895' 2018-06-06 14:28:30 +01:00
Tom Hughes
a516d13d33 Allow iD to access ESRI imagery metadata 2018-06-06 14:25:52 +01:00
Tom Hughes
b7dfcf020f Update Potlatch 2 to 2.5-37-ga38498b2 build 2018-06-06 14:17:49 +01:00
Andy Allan
d336523738 Speed up tests by making fewer random changes 
The old_node_controller#test_version in particular was slow, since
it saves a huge number of tags when adding a tag 30 times over. Since
the tests are random and not based on the number of iterations, this
reduces the iteration counts.
 2018-06-06 13:54:09 +08: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
translatewiki.net
892c30aa8c Localisation updates from https://translatewiki.net. 2018-06-04 08:05:07 +02:00
Tom Hughes
b6c36c8545 Revert to using ubuntu/xenial64 with virtualbox 
The generic/ubuntu1604 box doesn't support the vbox extensions.
 2018-06-01 18:26:21 +01:00
Tom Hughes
2f342ba8e8 Only set QT_QPA_PLATFORM if phantomjs fails without it 2018-06-01 00:41:29 +01:00
Tom Hughes
619fa7d802 Update vagrant configuration 
Use a common box for all platforms and fix up various
issues with the provisioning script.
 2018-05-31 22:53:22 +01:00
Tom Hughes
41326fd6d4 Set QT_QPA_PLATFORM to offscreen in the test environment 
Works around an issue with the weird way the debian/ubuntu
version of phantomjs is built:

https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=817277
https://github.com/ariya/phantomjs/issues/14376
 2018-05-31 22:52:59 +01:00
Tom Hughes
33a532bddf Quote translations to stop them looking like numbers 2018-05-31 22:49:34 +01:00
translatewiki.net
079ee97471 Localisation updates from https://translatewiki.net. 2018-05-31 08:32:14 +02: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
Tom Hughes
662d6334a8 Quote translations to stop them looking like numbers 2018-05-28 12:59:31 +01:00
translatewiki.net
5244a1f81c Localisation updates from https://translatewiki.net. 2018-05-28 11:02:50 +02:00
Tom Hughes
dedda1a157 Update for final linear-gradient syntax 2018-05-27 20:48:30 +01:00
Tom Hughes
fb53e2af4c Remove include of Mixin.Events 
The Events mixin has been replaced by inherting from Evented and
the Layer class already inherits from that.
 2018-05-27 20:33:54 +01:00
Tom Hughes
17981cf472 Update bundle 2018-05-27 15:51:47 +01:00
J Guthrie
30756f72ca Change language immediately after updating settings 
Closes #1883
 2018-05-27 15:12:34 +01:00
Tom Hughes
973e7ae398 Quote translations to stop them looking like numbers 2018-05-27 11:48:24 +01:00
translatewiki.net
08da00fa84 Localisation updates from https://translatewiki.net. 2018-05-25 11:57:39 +02: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
Tom Hughes
0a3a4014d9 Merge remote-tracking branch 'upstream/pull/1880' 2018-05-24 19:06:31 +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
Andrew Harvey
3908927b02 update New Zealand copyright based on current attribution instructions from LINZ 2018-05-24 19:45:05 +10: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
4634c6bc42 Quote translations to stop them looking like numbers 2018-05-22 08:53:53 +01:00
Tom Hughes
d82cc08734 Allow CSP to be put in enforcing mode 2018-05-22 08:51:21 +01:00
Tom Hughes
b47c27b5af Update swfobject to use uncompressed source 2018-05-22 08:51:21 +01:00
translatewiki.net
624e59b1e5 Localisation updates from https://translatewiki.net. 2018-05-21 16:16:17 +02:00
Tom Hughes
6f4f4b4d71 Add missing dependencies 2018-05-19 11:15:56 +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
cb3c4ec09b Update for rubocop 0.54.0 2018-05-17 19:39:25 +01:00
Tom Hughes
b126f02df9 Update bundle 2018-05-17 19:25:58 +01:00
Tom Hughes
584ac67c10 Configure manifest-src and worker-src in security policy 2018-05-17 19:10:39 +01:00
Tom Hughes
5cd4aeb1aa Preserve schemes in security policy 2018-05-17 19:10:23 +01:00
Tom Hughes
a6feffca9b Quote translations to stop them looking like numbers 2018-05-17 18:37:52 +01:00
Tom Hughes
fcff8b94c5 Quote translations to stop them looking like numbers 2018-05-17 11:44:49 +01:00