Commit graph

3283 commits

Author SHA1 Message Date
Tom Hughes
c24c2e481c Merge remote-tracking branch 'upstream/pull/2667' 2020-08-05 21:50:08 +01:00
Tom Hughes
9aed420d20 Merge remote-tracking branch 'upstream/pull/2752' 2020-08-05 19:14:54 +01:00
translatewiki.net
ea9f784350 Localisation updates from https://translatewiki.net. 2020-08-03 19:48:17 +02:00
Dorothea Kazazi
d100e8a639 Added banner for OpenStreetMap 16th birthday 2020-08-03 02:45:51 +03:00
Tom Hughes
6c159b9673 Fix the Command Injection warnings from Brakeman 2020-07-31 15:54:06 +01:00
translatewiki.net
42ea4a12ca Localisation updates from https://translatewiki.net. 2020-07-30 15:35:19 +02:00
translatewiki.net
f17a83992d Localisation updates from https://translatewiki.net. 2020-07-27 18:29:55 +02:00
Tom Hughes
c4abe8eb28 Fix the CrossSiteScripting warnings from Brakeman 2020-07-22 20:57:16 +01:00
Andy Allan
6719d269e3 Use Brakeman for static code analysis 2020-07-22 13:37:38 +02:00
translatewiki.net
efdeca235f Localisation updates from https://translatewiki.net. 2020-07-20 19:53:23 +02:00
Andy Allan
3bc2b32111 Rephrase 'replying' text to clarify what will actually happen
Fixes #2166
2020-07-15 15:13:29 +02:00
translatewiki.net
06023cde27 Localisation updates from https://translatewiki.net. 2020-07-14 10:23:57 +02:00
translatewiki.net
fc832a1e6a Localisation updates from https://translatewiki.net. 2020-07-10 11:38:55 +02:00
Tom Hughes
9be62ca4bb Allow image loading from tileserver.memomaps.de 2020-07-08 19:07:49 +01:00
Tom Hughes
4cf3c3b6ed Merge remote-tracking branch 'upstream/pull/2670' 2020-07-08 19:04:04 +01:00
Andy Allan
41d6f19a6b Rename the notes#mine action to index 2020-07-08 18:43:30 +02:00
Tom Hughes
9f993fe8c8 Fix new rubocop warnings 2020-07-07 10:44:52 +01:00
translatewiki.net
93cd40ebd7 Localisation updates from https://translatewiki.net. 2020-07-06 18:51:54 +02:00
Andy Allan
6040814625 Rephrase the 'used_by' text on the about page. 2020-07-04 18:26:04 +02:00
translatewiki.net
90d6fd9d60 Localisation updates from https://translatewiki.net. 2020-07-02 17:56:03 +02:00
Andy Allan
8d2271699b Use bootstrap_form as the formbuilder for GPX upload form
This also uses the recommended bs-custom-file-input javascript plugin
for the file input control.
2020-07-01 17:23:02 +02:00
Martin Raifer
d49771ba95 Add banner for SOTM 2020 2020-07-01 12:27:07 +01:00
Tom Hughes
0585866202 Merge remote-tracking branch 'upstream/pull/2661' 2020-07-01 08:28:08 +01:00
translatewiki.net
8aea393632 Localisation updates from https://translatewiki.net. 2020-06-29 16:28:01 +02:00
Tom Hughes
1212fbad4c Enable locale fallback in all environments 2020-06-26 20:30:48 +01:00
Paul Norman
fb4aa31048
Add ÖPNVKarte layer 2020-06-25 20:47:25 -07:00
Tom Hughes
bcf6eafb0d Fix new rubocopy warnings 2020-06-24 18:49:12 +01:00
Tom Hughes
a2620bddfe Drop any pluralizable translations that are missing an "other" key 2020-06-24 11:33:55 +01:00
translatewiki.net
cc93c34953 Localisation updates from https://translatewiki.net. 2020-06-22 17:29:19 +02:00
Simon Poole
63c0b697a4 Change tile licence
This changes the text describing the tile licence as per decision of the OSMF board starting July 1st 2020
2020-06-22 01:06:14 +02:00
Tom Hughes
b7fe3db6a2 Drop any pluralizable translations that are missing an "other" key 2020-06-21 19:31:08 +01:00
translatewiki.net
f06013a41d Localisation updates from https://translatewiki.net. 2020-06-18 21:24:54 +02:00
Tom Hughes
e2145e6c1e Drop any pluralizable translations that are missing an "other" key 2020-06-17 00:03:45 +01:00
translatewiki.net
eb3cdd34da Localisation updates from https://translatewiki.net. 2020-06-15 22:21:49 +02:00
Tom Hughes
045ff92ac9 Drop any pluralizable translations that are missing an "other" key 2020-06-11 19:21:41 +01:00
translatewiki.net
ef7434f8b4 Localisation updates from https://translatewiki.net. 2020-06-11 19:30:37 +02:00
Andy Allan
600812f6ad Rework user#set_status and #delete to avoid GET requests
This renames the delete action to destroy, and starts using resourceful
routing for user actions.
2020-06-10 11:49:18 +02:00
translatewiki.net
f1c31dac25 Localisation updates from https://translatewiki.net. 2020-06-08 17:12:34 +02:00
Tom Hughes
4998157735 Rename many keys to other for the cs locale.
Fixes #2645
2020-06-07 22:35:37 +01:00
Tom Hughes
293fe68eff Merge remote-tracking branch 'upstream/pull/2642' 2020-06-04 17:40:13 +01:00
translatewiki.net
b16388d099 Localisation updates from https://translatewiki.net. 2020-06-04 17:59:12 +02:00
Andy Allan
3786366fdc Rename friend to friendship in notifier
Followup to #2269
2020-06-03 18:29:08 +02:00
Andy Allan
8ebfdbc1ff Move make_friend and remove_friend to friendships controller 2020-06-03 18:23:07 +02:00
Tom Hughes
1739bf6832 Merge remote-tracking branch 'upstream/pull/2639' 2020-06-03 17:19:03 +01:00
Tom Hughes
b10e0c46de Merge remote-tracking branch 'upstream/pull/2638' 2020-06-03 17:13:49 +01:00
Tom Hughes
0bd6f889c5 Merge remote-tracking branch 'upstream/pull/2637' 2020-06-03 17:09:07 +01:00
Andy Allan
c780a3f453
Merge pull request #2624 from francois2metz/diary-entry
Add link to my diary in the diary index
2020-06-03 14:11:04 +02:00
Andy Allan
f33f1f297e Use rails 6.0 framework defaults
Keep the old autoloader and utf-8 forms as they were, for now.
2020-06-03 13:45:07 +02:00
Andy Allan
b52aa72aa6 Remove the framework defaults initializer for 5.2
We're already using these defaults, as per 6a25ee9ec9
so we don't need to keep this file
2020-06-03 11:47:33 +02:00
Andy Allan
cc3ea94e2f Remove ineffective query cache disable initializer
This doesn't have any effect, since there is no middleware by that name.
2020-06-03 11:19:09 +02:00