Commit graph

3733 commits

Author SHA1 Message Date
Harry Wood
dce0f1639e Add wording to discourage reporting a note
Add some wording wrapped around the 'Report this note' link to explain to users to resolve the note instead.

Tackling the issue reported by DWG, that too many note reports are coming to them, where the users could deal it themselves: https://github.com/openstreetmap/openstreetmap-website/issues/3071
2022-08-03 18:10:03 +01:00
Tom Hughes
e9f62a8c30 Rename piwik to matomo and merge configuration into settings 2022-08-01 22:42:04 +01:00
translatewiki.net
4f74a67f6c Localisation updates from https://translatewiki.net. 2022-08-01 13:15:30 +02:00
Tom Hughes
a9b6a0278d Merge remote-tracking branch 'upstream/pull/3638' 2022-07-29 19:03:32 +01:00
Mateusz Konieczny
6388588909 rerun script/misc/update-wiki-pages 2022-07-29 01:18:24 +02:00
translatewiki.net
fb6b107469 Localisation updates from https://translatewiki.net. 2022-07-28 13:15:08 +02:00
translatewiki.net
8aa6d48360 Localisation updates from https://translatewiki.net. 2022-07-25 13:14:52 +02:00
Tom Hughes
21d52f2d3f Monkey patch MailDeliveryJob to work with delayed_job under ruby 3
The delayed_job gem does not currently perserve keyword arguments
properly leading to errors when running under ruby 3 and try to run
a job that requires them.

This affects our deferred mail deliveries so we monkey patch the
mail delivery job to unpack the hash from the normal arguments and
use it to provide the expected keyword arguments.

https://github.com/collectiveidea/delayed_job/issues/1134
2022-07-23 12:12:29 +01:00
translatewiki.net
7f23d10a17 Localisation updates from https://translatewiki.net. 2022-07-21 13:13:42 +02:00
translatewiki.net
48fff2bfea Localisation updates from https://translatewiki.net. 2022-07-18 13:12:12 +02:00
Martin Raifer
ef56e11e58
add banner for sotm 2022 2022-07-16 21:48:06 +02:00
translatewiki.net
93e21aea7d Localisation updates from https://translatewiki.net. 2022-07-14 13:12:52 +02:00
translatewiki.net
ef7bd37714 Localisation updates from https://translatewiki.net. 2022-07-11 13:13:06 +02:00
Tom Hughes
0ae438a5c1 Add a configuration option to disable HTTP basic authentication 2022-07-08 17:25:20 +01:00
translatewiki.net
679f442470 Localisation updates from https://translatewiki.net. 2022-07-07 13:13:39 +02:00
translatewiki.net
32104684f7 Localisation updates from https://translatewiki.net. 2022-07-04 13:14:17 +02:00
translatewiki.net
9e21b12678 Localisation updates from https://translatewiki.net. 2022-06-30 13:13:48 +02:00
translatewiki.net
6f31d5fb7f Localisation updates from https://translatewiki.net. 2022-06-27 13:15:32 +02:00
translatewiki.net
1153606a7c Localisation updates from https://translatewiki.net. 2022-06-23 13:16:25 +02:00
translatewiki.net
18a2b97cc1 Localisation updates from https://translatewiki.net. 2022-06-20 13:11:59 +02:00
Tom Hughes
35cd8f80cc Restore intended title for GPS trace view 2022-06-19 12:52:47 +01:00
Tom Hughes
8e288156d4 Merge remote-tracking branch 'upstream/pull/3569' 2022-06-19 12:49:38 +01:00
translatewiki.net
0c3551a670 Localisation updates from https://translatewiki.net. 2022-06-16 13:16:29 +02:00
translatewiki.net
9cc0d849b1 Localisation updates from https://translatewiki.net. 2022-06-13 13:16:18 +02:00
Anton Khorev
86b96f9af8 Remove duplicate keys from en locale data 2022-06-11 03:26:39 +03:00
Dermot McNally
82e44712bb Update copyright notice
Updated in accordance with LWG decision to better reflect updated
guidance, including providing a link to the Attribution Guidelines.

Closes #3565
2022-06-09 19:18:04 +01:00
translatewiki.net
25c54dd36c Localisation updates from https://translatewiki.net. 2022-06-09 13:15:14 +02:00
Tom Hughes
16210d9f4f Rename id_oauth_application to id_application in settings 2022-06-08 13:28:07 +01:00
Tom Hughes
a566589c1b Merge remote-tracking branch 'upstream/pull/3561' 2022-06-06 18:32:43 +01:00
translatewiki.net
43811131bd Localisation updates from https://translatewiki.net. 2022-06-06 13:16:18 +02:00
Tom Hughes
edf20e5f92 Merge remote-tracking branch 'upstream/pull/3557' 2022-06-05 19:44:55 +01:00
Martin Raifer
c55d346d5f
Update to iD v2.21.0
major changes in this release:
* dropped support for Internet Explorer 11
* switched authentication to OAuth 2

for further changes please refer to https://github.com/openstreetmap/iD/blob/release/CHANGELOG.md#2210
2022-06-03 15:32:27 +02:00
translatewiki.net
32da856c00 Localisation updates from https://translatewiki.net. 2022-06-02 13:14:47 +02:00
Sarah Hoffmann
037670ed86
Fix highway crossing in nominatim description terms
The entry is syntactically wrong. The description terms expect a list of values for each key.

Given that 'crossing' is not a main tag, the key shouldn't be featured in the list at all. I've added highway=crossing instead.
2022-05-30 14:57:28 +02:00
translatewiki.net
86a1fb0779 Localisation updates from https://translatewiki.net. 2022-05-30 13:13:17 +02:00
translatewiki.net
9d8bbc926c Localisation updates from https://translatewiki.net. 2022-05-26 13:14:22 +02:00
translatewiki.net
390e882380 Localisation updates from https://translatewiki.net. 2022-05-23 13:13:26 +02:00
Tom Hughes
dd676f2257 Merge remote-tracking branch 'upstream/pull/3554' 2022-05-22 18:32:22 +01:00
translatewiki.net
0da05dbbb0 Localisation updates from https://translatewiki.net. 2022-05-19 13:25:56 +02:00
Frederik Ramm
437f0cd3ff
Add "garden" to map key
Make map key list "common, meadow, garden" instead of just "common, meadow".

This is in response to a DWG ticket ( #2022051810000111) where a resident complained that their private garden was "listed as 'common, meadow' " in OSM because they consulted the map key. Listing "garden" along these should clear up that misunderstanding.
2022-05-18 15:46:24 +02:00
translatewiki.net
6f0477ee72 Localisation updates from https://translatewiki.net. 2022-05-16 13:12:36 +02:00
translatewiki.net
6fb93aa97b Localisation updates from https://translatewiki.net. 2022-05-12 13:12:49 +02:00
translatewiki.net
5a5e629693 Localisation updates from https://translatewiki.net. 2022-05-09 13:12:15 +02:00
translatewiki.net
a4c20249b9 Localisation updates from https://translatewiki.net. 2022-05-05 13:12:22 +02:00
translatewiki.net
318229079d Localisation updates from https://translatewiki.net. 2022-05-02 13:11:33 +02:00
translatewiki.net
b3797384b7 Localisation updates from https://translatewiki.net. 2022-04-28 13:12:54 +02:00
Andy Allan
082880fca6
Merge pull request #3536 from JesseWeinstein/dittaeva_ancient_patch
Meaningful and disambiguating class/type labels (from 2012)
2022-04-27 16:29:54 +01:00
Andy Allan
50f658142b Merge commit '73f0be9647'
Closes #3512
2022-04-27 16:12:52 +01:00
Jesse Weinstein
91ba00c03e Apply the 4 suggestions from @gravitystorm 2022-04-27 10:14:26 -04:00
Tom Hughes
0724ed1aeb Fix new rubocopy warnings 2022-04-26 18:10:52 +01:00