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

10736 commits

This branch
This branch
All branches
Author SHA1 Message Date
Tom Hughes
2b8d2bcb9f Update bundle 2021-01-26 22:43:30 +00:00
translatewiki.net
b304c1cae4 Localisation updates from https://translatewiki.net. 2021-01-25 18:13:09 +01:00
Tom Hughes
acc6aa08b0 Merge remote-tracking branch 'upstream/pull/3069' 2021-01-25 07:06:59 +00:00
Mikel Maron
7d2ff8e4cd reserve 60x60 in top right of survey banner 2021-01-24 20:31:21 -05:00
Tom Hughes
f0ae0aa130 Merge remote-tracking branch 'upstream/pull/3066' 2021-01-22 22:25:41 +00:00
Mikel Maron
04cb8d488e community survey banner 2021-01-22 14:52:49 -05:00
Tom Hughes
8ac2302837 Avoid concatenating text to a translation 
Fixes #3064
 2021-01-21 17:15:27 +00:00
Tom Hughes
82bb9d02f3 Merge remote-tracking branch 'upstream/pull/3065' 2021-01-21 17:00:05 +00:00
translatewiki.net
eedbf79ad6 Localisation updates from https://translatewiki.net. 2021-01-21 15:17:04 +01:00
Andy Allan
536c62175c Avoid recommending installation of the Ubuntu bundler package 
Due to a problem with namespacing and vendoring, the Ubuntu package
leads to namespace conflicts with Thor 1+

Fixes #3013
 2021-01-21 11:29:29 +00:00
Tom Hughes
90c5d95ac4 Merge remote-tracking branch 'upstream/pull/3063' 2021-01-20 15:52:08 +00:00
Andy Allan
8e02c98c3f Refactor diary comment form to use bootstrap 2021-01-20 15:38:10 +00:00
Andy Allan
cc8bb7c6a5 Refactor user registration form to use bootstrap 2021-01-20 15:38:10 +00:00
Andy Allan
601d28d4b4 Convert to use bootstrap form 2021-01-20 11:11:52 +00:00
Tom Hughes
10999cfc5e Merge remote-tracking branch 'upstream/pull/3061' 2021-01-19 20:17:50 +00:00
Frederik Ramm
d14083129c Fix a small typo and tests that depend on it. 2021-01-19 20:56:43 +01:00
Tom Hughes
812f5b44e8 Redirect after saving settings in case the username has changed 
Fixes #3059
 2021-01-19 18:57:34 +00:00
Tom Hughes
d58b74a685 Update bundle 2021-01-19 18:18:42 +00:00
translatewiki.net
18ee3c7133 Localisation updates from https://translatewiki.net. 2021-01-18 16:56:27 +01:00
Tom Hughes
3a6397fb2a Merge remote-tracking branch 'upstream/pull/3060' 2021-01-18 08:02:24 +00:00
dependabot[bot]
279a397860
Bump eslint from 7.17.0 to 7.18.0 
Bumps [eslint](https://github.com/eslint/eslint) from 7.17.0 to 7.18.0.
- [Release notes](https://github.com/eslint/eslint/releases)
- [Changelog](https://github.com/eslint/eslint/blob/master/CHANGELOG.md)
- [Commits](https://github.com/eslint/eslint/compare/v7.17.0...v7.18.0)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-01-18 05:01:25 +00:00
translatewiki.net
4feeba645b Localisation updates from https://translatewiki.net. 2021-01-14 16:27:17 +01:00
Tom Hughes
de8a49a9d7 Merge remote-tracking branch 'upstream/pull/3049' 2021-01-14 11:11:00 +00:00
Tom Hughes
f61455b8e7 Merge remote-tracking branch 'upstream/pull/3048' 2021-01-14 10:52:10 +00:00
Andy Allan
e94a8a45ba Refactor user_blocks form to use bootstrap 
Further refactoring could involve a virtual attribute for duration.
 2021-01-14 10:03:11 +00:00
dependabot[bot]
0fa09de8f8
Bump qs from 6.9.4 to 6.9.6 
Bumps [qs](https://github.com/ljharb/qs) from 6.9.4 to 6.9.6.
- [Release notes](https://github.com/ljharb/qs/releases)
- [Changelog](https://github.com/ljharb/qs/blob/master/CHANGELOG.md)
- [Commits](https://github.com/ljharb/qs/compare/v6.9.4...v6.9.6)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-01-14 05:01:14 +00:00
Tom Hughes
4abd9cfcf1 Merge remote-tracking branch 'upstream/pull/2994' 2021-01-13 20:40:48 +00:00
Tom Hughes
697e36f364 Merge remote-tracking branch 'upstream/pull/3046' 2021-01-13 20:35:04 +00:00
Tom Hughes
7f3b86e30b Merge remote-tracking branch 'upstream/pull/3045' 2021-01-13 20:31:21 +00:00
Andy Allan
e8e4aa53d4 Refactor login form to use bootstrap 
Care has been taken to preserve exact tabindexes, field values etc.
 2021-01-13 19:20:06 +00:00
Andy Allan
78bf2993e4 Refactor richtext fields to use a custom bootstrap_form input. 
This allows us to use form_group_builder and get all the label and
help text handling in line with other bootstrap_form inputs.
 2021-01-13 14:05:39 +00:00
Andy Allan
ed07e17ca2 Align the richtext help text height with the height of the textarea. 
This works by setting the card to the same height as its containing flexbox. For perfect alignment, we need to make sure the extra margin at the bottom of the text-area stops applying when they are shown side by side.
 2021-01-13 10:12:15 +00:00
Tom Hughes
58d8a8d3c4 Merge remote-tracking branch 'upstream/pull/3044' 2021-01-12 23:09:51 +00:00
Mateusz Konieczny
f2b3397525 rerun script/misc/update-wiki-pages 2021-01-12 23:02:05 +00:00
Tom Hughes
f041893ead Use latest major version for all github actions 2021-01-12 22:48:46 +00:00
Tom Hughes
b7d6243aff Restore ruby 2.5 compatibility 2021-01-11 20:04:13 +00:00
Tom Hughes
0654be27f9 Fix new rubocop warnings 2021-01-11 19:17:31 +00:00
Tom Hughes
52d40ee42b Remove redundant gem requirements for unsupported ruby versions 2021-01-11 18:48:27 +00:00
Tom Hughes
004a369a42 Unpin rubocop now erb_lint is fixed 2021-01-11 18:39:54 +00:00
Tom Hughes
8612d4ddc9 Update bundle 2021-01-11 18:38:11 +00:00
translatewiki.net
10065abea6 Localisation updates from https://translatewiki.net. 2021-01-11 17:46:08 +01:00
translatewiki.net
75edada351 Localisation updates from https://translatewiki.net. 2021-01-07 15:26:56 +01:00
Andy Allan
85bf0af488 Merge branch 'pull/3035' 2021-01-06 15:41:42 +00:00
Andy Allan
76146baf60 Remove spacing tweaks and legacy pagination spacing CSS 
No need to fight against something that we no longer use.
 2021-01-06 15:40:53 +00:00
Andy Allan
9568c7fee8 Merge branch 'pull/3024' 2021-01-06 15:25:37 +00:00
Andy Allan
b5188cae08 Remove link_to_if since it's in a clause with the same condition 2021-01-06 15:24:50 +00:00
Tom Hughes
1303ba8c7d Merge remote-tracking branch 'upstream/pull/3038' 2021-01-06 14:19:34 +00:00
Tom Hughes
0ff89c31e4 Remove both Potlatch versions 
Fixes #2622
 2021-01-05 21:18:45 +00:00
Tom Hughes
84d90fabe4 Merge remote-tracking branch 'upstream/pull/3037' 2021-01-05 18:28:30 +00:00
translatewiki.net
739b917851 Localisation updates from https://translatewiki.net. 2021-01-04 14:52:37 +01:00