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

10164 commits

This branch
This branch
All branches
Author SHA1 Message Date
Tom Hughes
4998157735 Rename many keys to other for the cs locale. 
Fixes #2645
 2020-06-07 22:35:37 +01:00
Tom Hughes
5f9cae5a6d Update bundle 2020-06-07 19:19:10 +01:00
Tom Hughes
d6f518f627 More improvements to locale selection for the data browser 
Use the browser language preferences for non-logged in users.
 2020-06-07 19:10:48 +01:00
Tom Hughes
293fe68eff Merge remote-tracking branch 'upstream/pull/2642' 2020-06-04 17:40:13 +01:00
Tom Hughes
768a792a61 Improve selection of name to display in data browser 
If the user is logged in then consider all their preferred
languages rather than just the UI language, and use the full
locale matching algorithm instead of just checking parents.

Fixes #2636
 2020-06-04 17:33:11 +01:00
Tom Hughes
bf22c69286 Improve locale selection algorithm 
Don't include locales which only have rails translations in
the candidates, and ensure that user specified options take
priority over less specific variants of earlier choices.
 2020-06-04 17:33:11 +01:00
translatewiki.net
b16388d099 Localisation updates from https://translatewiki.net. 2020-06-04 17:59:12 +02:00
Tom Hughes
c9f9ade96f Fix new rubocop warnings 2020-06-03 17:47:35 +01:00
Tom Hughes
2e840066e6 Update bundle 2020-06-03 17:41:38 +01:00
Tom Hughes
a8c63724f6 Merge remote-tracking branch 'upstream/pull/2641' 2020-06-03 17:31:12 +01: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
Tom Hughes
49a576a390 Merge remote-tracking branch 'upstream/pull/2640' 2020-06-03 17:07:31 +01:00
Andy Allan
59c90aa023 Move friendship related tests to separate file 2020-06-03 17:51:11 +02:00
Andy Allan
0a33c66146 Convert lib files to model concerns 2020-06-03 16:44:26 +02:00
Andy Allan
46c3e70ec6 Remove some unused scripts 2020-06-03 16:15:24 +02: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
translatewiki.net
877641fff9 Localisation updates from https://translatewiki.net. 2020-06-01 22:38:37 +02:00
Tom Hughes
bf2fb4bf5e Update bundle 2020-05-27 19:11:58 +01:00
translatewiki.net
ce32fe0943 Localisation updates from https://translatewiki.net. 2020-05-26 17:14:43 +02:00
Tom Hughes
c3bf4b4919 Update bundle 2020-05-21 18:50:23 +01:00
Tom Hughes
588a8cb604 Update to rails 6.0.3.1 2020-05-18 18:15:23 +01:00
translatewiki.net
6aadc289be Localisation updates from https://translatewiki.net. 2020-05-18 16:12:18 +02:00
Tom Hughes
fc6a4d442c Merge remote-tracking branch 'upstream/pull/2626' 2020-05-13 22:42:33 +01:00
Andy Allan
7485b49a3a Remove unused test helper 2020-05-13 18:15:07 +02:00
Andy Allan
3a16c465f7 Refactor user controller tests 
Because we don't have direct access to the session and cookies, some
of the tests need more setup e.g. by moving through the signup process
to get the session tokens into the right place for the confirmation
steps to work.
 2020-05-13 18:08:22 +02:00
Andy Allan
36a1f38109 Refactor api traces_controller tests 2020-05-13 18:08:07 +02:00
Tom Hughes
0f9e28711c Don't try and resize images that aren't resizable 2020-05-13 11:30:26 +01:00
Tom Hughes
5432cb6db5 Attach resized images to notification emails 
Fixes #2625
 2020-05-13 11:29:02 +01:00
Tom Hughes
f3219ada14 Fix new rubocop warnings 2020-05-12 19:18:45 +01:00
Tom Hughes
598e1c84fe Update bundle 2020-05-12 19:17:03 +01:00
François de Metz
2ea79e21a0
Add link to my diary in the diary index. 2020-05-12 11:37:43 +02:00
François de Metz
43385325a8
Refactor the link to create a new entry diary. 2020-05-12 11:27:08 +02:00
translatewiki.net
8cae0dfb65 Localisation updates from https://translatewiki.net. 2020-05-11 17:43:21 +02:00
Tom Hughes
7ffa2e96be Refactor users_controller_test and user_preferences_controller_test 2020-05-07 19:34:48 +01:00
Quincy Morgan
4d88d1677a Fix issue with iD embedded document sometimes showing scrollbars 2020-05-07 09:11:45 -07:00
translatewiki.net
69662ab419 Localisation updates from https://translatewiki.net. 2020-05-07 17:15:43 +02:00
Tom Hughes
8b588ee1f9 Update to rails 6.0.3 2020-05-06 20:36:23 +01:00
Tom Hughes
2d37f1a03c Refactor notes_controller_test 2020-05-06 18:39:48 +01:00
Tom Hughes
45e560bef6 Add test for browsing a note closed by a deleted user 2020-05-06 18:06:45 +01:00
Tom Hughes
d1a29bade4 Merge remote-tracking branch 'upstream/pull/2613' 2020-05-06 16:16:38 +01:00
Andy Allan
f84980f183 More controller test refactoring 2020-05-06 16:51:04 +02:00
Tom Hughes
7e925c3c00 Look at all note comments to find the close event 
Fixes #2612
 2020-05-06 14:06:04 +01:00
Tom Hughes
9a87412d2a Refactor permissions_controller_test 2020-05-05 19:40:52 +01:00