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

10810 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
dependabot[bot]
91090bf553
Bump eslint from 7.16.0 to 7.17.0 
Bumps [eslint](https://github.com/eslint/eslint) from 7.16.0 to 7.17.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.16.0...v7.17.0)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-01-04 05:02:07 +00:00
Tobias Jordans
18ec273038 Traces: Migrate pagination to bootstrap 
Same feature, different style.
- Change pagination to use bootstrap default styles
- … but with empty span-tags instead of non-active a-tags
- refactor partial to not use @-variables but get the variables via
the render-call, simplify render-call-syntax
- remove the additional `if @traces.size > 1` inside the pagination
partial since that caused the pagination to disappear on the last page.
The partial will be visible with inactive links.
- Add bootstrap spacer-classes to overwrite commons-css so removing. Eg.
commons also has a pagination class same as bootstrap.
 2021-01-03 20:55:50 +01:00
Tobias
36a41a8cc5
Diary entries #index: Simplify bootstrap pagination 
- We can use a span instead of a disabled link as well
- Update to use double quotes everywhere
 2021-01-02 22:24:46 +01:00
Tom Hughes
430872ad7b Update bundle 2021-01-01 11:55:24 +00:00
Tom Hughes
3e150205ad Remove unnecessary inflection 2021-01-01 11:54:29 +00:00
Tom Hughes
eada36ff96 Switch to using the zeitwork autoloader 2020-12-30 20:30:21 +00:00
Tom Hughes
786b8cce65 Verify that public and trackable traces don't return identity details 2020-12-30 17:58:04 +00:00
Tobias Jordans
abc83298cd Diary entries #index: Migrate to bootstrap pagination 
Use https://getbootstrap.com/docs/4.5/components/pagination/ for the pagination.

I tried using link_to_if but this does not work well in this case since multiple changes need to happen for the disabled state.
 2020-12-30 14:20:13 +01:00
Tom Hughes
e392556444 Revert "Switch to using the zeitwork autoloader" 
This reverts commit 127880a73f.
 2020-12-29 19:29:36 +00:00
Tom Hughes
5677877ed1 Fix case for zeitwork 2020-12-29 18:54:12 +00:00
Tom Hughes
127880a73f Switch to using the zeitwork autoloader 2020-12-29 18:42:22 +00:00
Tom Hughes
b8a2cf0f2b Update bundle 2020-12-29 18:39:25 +00:00
translatewiki.net
1f2653d476 Localisation updates from https://translatewiki.net. 2020-12-29 09:03:29 +01:00
Andy Allan
4189e150f6
Merge pull request #3018 from tordans/line-break-for-long-urls 
Break long URLs in blog post show
 2020-12-28 11:15:58 +00:00
Tobias Jordans
b470e01f84 Break long URLs where richtext is used. 
For example on the blog post show page.

This uses https://getbootstrap.com/docs/4.4/utilities/text/#word-break to break long URLs on the blog post show view.
 2020-12-27 22:11:36 +01:00
Tom Hughes
8ecc1a4fce Merge remote-tracking branch 'upstream/pull/3017' 2020-12-24 14:07:41 +00:00
Andy Allan
547459314b Refactor diary entry forms to use a custom form builder 2020-12-24 13:32:41 +00:00
Andy Allan
170ea3399b Ensure richtext editing style rules are only applied on standard forms 2020-12-24 13:32:41 +00:00
Tom Hughes
f4885874f0 Merge remote-tracking branch 'upstream/pull/3016' 2020-12-23 15:24:10 +00:00
Tom Hughes
1eb1335bb2 Merge remote-tracking branch 'upstream/pull/3015' 2020-12-23 15:02:04 +00:00
Andy Allan
2519841efe Return the centre of the image if the bbox has no extent 
Fixes #3007. If all the provided points in the gpx file have the same
lat/lon, then an image where they are all at the centre seems plausible.
 2020-12-23 15:01:01 +00:00
Andy Allan
4f304e2301 Remove SystemTimer and use stdlib Timeout directly 
SystemTimer was only needed on ruby 1.8, and we dropped support for
that a long time ago.
 2020-12-23 14:25:58 +00:00
translatewiki.net
279787943e Localisation updates from https://translatewiki.net. 2020-12-22 14:04:52 +01:00
Tom Hughes
da42319b2c Update bundle 2020-12-21 09:47:00 +00:00
Tom Hughes
58abbf17f2 Merge remote-tracking branch 'upstream/pull/3014' 2020-12-21 09:45:22 +00:00
dependabot[bot]
5366e67a40
Bump eslint from 7.15.0 to 7.16.0 
Bumps [eslint](https://github.com/eslint/eslint) from 7.15.0 to 7.16.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.15.0...v7.16.0)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-12-21 05:03:00 +00:00