]>
git.openstreetmap.org Git - rails.git/log
Tom Hughes [Thu, 28 Jan 2021 10:41:06 +0000 (10:41 +0000)]
Merge remote-tracking branch 'upstream/pull/3074'
Tom Hughes [Thu, 28 Jan 2021 10:36:38 +0000 (10:36 +0000)]
Merge remote-tracking branch 'upstream/pull/3073'
Tucker Chapman [Sat, 16 Jan 2021 23:00:57 +0000 (18:00 -0500)]
Remove conditional for polyline layer
When a user searches for a route and one is not found the polyline
layer is removed - if they then change the mode of transportation the
event listener will not reroute if there is no polyline layer.
This commit removes the conditional that prevents the routing code from
re-running after the polyline has been removed.
Fixes #3050
Closes #3055
Andy Allan [Thu, 28 Jan 2021 10:10:38 +0000 (10:10 +0000)]
Provide better descriptions for sr-only labels
Andy Allan [Thu, 28 Jan 2021 10:10:03 +0000 (10:10 +0000)]
Use boolean instead of string for hiding labels
Andy Allan [Wed, 27 Jan 2021 15:36:59 +0000 (15:36 +0000)]
Refactor account form to use bootstrap
There's further refactoring that could be done, but this is sufficient for now.
Andy Allan [Wed, 27 Jan 2021 17:30:17 +0000 (17:30 +0000)]
Convert issue comments to use bootstrap
The reassign checkbox could be simplified in future by changing the expected parameter in the controller
Andy Allan [Wed, 27 Jan 2021 17:04:47 +0000 (17:04 +0000)]
Converge redaction forms to use bootstrap
Andy Allan [Wed, 27 Jan 2021 16:33:11 +0000 (16:33 +0000)]
Convert note form to use bootstrap
Tom Hughes [Wed, 27 Jan 2021 13:48:54 +0000 (13:48 +0000)]
Fix locate control popup on the main map to use new translations
Fixes #3072
Andy Allan [Wed, 27 Jan 2021 12:36:21 +0000 (12:36 +0000)]
Use model attributes and attribute help for the registration fields
The disply name keeps its specific help, since it is different on the account settings page
Tom Hughes [Tue, 26 Jan 2021 22:43:30 +0000 (22:43 +0000)]
Update bundle
translatewiki.net [Mon, 25 Jan 2021 17:13:09 +0000 (18:13 +0100)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Mon, 25 Jan 2021 07:06:59 +0000 (07:06 +0000)]
Merge remote-tracking branch 'upstream/pull/3069'
Mikel Maron [Mon, 25 Jan 2021 01:31:21 +0000 (20:31 -0500)]
reserve 60x60 in top right of survey banner
Tom Hughes [Fri, 22 Jan 2021 22:25:41 +0000 (22:25 +0000)]
Merge remote-tracking branch 'upstream/pull/3066'
Mikel Maron [Fri, 22 Jan 2021 19:52:49 +0000 (14:52 -0500)]
community survey banner
Tom Hughes [Thu, 21 Jan 2021 17:15:27 +0000 (17:15 +0000)]
Avoid concatenating text to a translation
Fixes #3064
Tom Hughes [Thu, 21 Jan 2021 17:00:05 +0000 (17:00 +0000)]
Merge remote-tracking branch 'upstream/pull/3065'
translatewiki.net [Thu, 21 Jan 2021 14:17:04 +0000 (15:17 +0100)]
Localisation updates from https://translatewiki.net.
Andy Allan [Thu, 21 Jan 2021 11:29:29 +0000 (11:29 +0000)]
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
Tom Hughes [Wed, 20 Jan 2021 15:52:08 +0000 (15:52 +0000)]
Merge remote-tracking branch 'upstream/pull/3063'
Andy Allan [Wed, 20 Jan 2021 13:02:09 +0000 (13:02 +0000)]
Refactor diary comment form to use bootstrap
Andy Allan [Wed, 20 Jan 2021 12:02:41 +0000 (12:02 +0000)]
Refactor user registration form to use bootstrap
Andy Allan [Wed, 20 Jan 2021 11:11:52 +0000 (11:11 +0000)]
Convert to use bootstrap form
Tom Hughes [Tue, 19 Jan 2021 20:17:50 +0000 (20:17 +0000)]
Merge remote-tracking branch 'upstream/pull/3061'
Frederik Ramm [Tue, 19 Jan 2021 19:56:43 +0000 (20:56 +0100)]
Fix a small typo and tests that depend on it.
Tom Hughes [Tue, 19 Jan 2021 18:24:41 +0000 (18:24 +0000)]
Redirect after saving settings in case the username has changed
Fixes #3059
Tom Hughes [Tue, 19 Jan 2021 18:18:42 +0000 (18:18 +0000)]
Update bundle
translatewiki.net [Mon, 18 Jan 2021 15:56:27 +0000 (16:56 +0100)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Mon, 18 Jan 2021 08:02:24 +0000 (08:02 +0000)]
Merge remote-tracking branch 'upstream/pull/3060'
dependabot[bot] [Mon, 18 Jan 2021 05:01:25 +0000 (05:01 +0000)]
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>
translatewiki.net [Thu, 14 Jan 2021 15:27:17 +0000 (16:27 +0100)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Thu, 14 Jan 2021 11:11:00 +0000 (11:11 +0000)]
Merge remote-tracking branch 'upstream/pull/3049'
Tom Hughes [Thu, 14 Jan 2021 10:52:10 +0000 (10:52 +0000)]
Merge remote-tracking branch 'upstream/pull/3048'
Andy Allan [Wed, 13 Jan 2021 17:01:51 +0000 (17:01 +0000)]
Refactor user_blocks form to use bootstrap
Further refactoring could involve a virtual attribute for duration.
dependabot[bot] [Thu, 14 Jan 2021 05:01:14 +0000 (05:01 +0000)]
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>
Tom Hughes [Wed, 13 Jan 2021 20:40:48 +0000 (20:40 +0000)]
Merge remote-tracking branch 'upstream/pull/2994'
Tom Hughes [Wed, 13 Jan 2021 20:35:04 +0000 (20:35 +0000)]
Merge remote-tracking branch 'upstream/pull/3046'
Tom Hughes [Wed, 13 Jan 2021 20:31:21 +0000 (20:31 +0000)]
Merge remote-tracking branch 'upstream/pull/3045'
Andy Allan [Wed, 13 Jan 2021 19:20:06 +0000 (19:20 +0000)]
Refactor login form to use bootstrap
Care has been taken to preserve exact tabindexes, field values etc.
Andy Allan [Wed, 13 Jan 2021 14:05:39 +0000 (14:05 +0000)]
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.
Andy Allan [Wed, 13 Jan 2021 10:12:15 +0000 (10:12 +0000)]
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.
Tom Hughes [Tue, 12 Jan 2021 23:09:51 +0000 (23:09 +0000)]
Merge remote-tracking branch 'upstream/pull/3044'
Mateusz Konieczny [Tue, 12 Jan 2021 21:56:37 +0000 (22:56 +0100)]
rerun script/misc/update-wiki-pages
Tom Hughes [Tue, 12 Jan 2021 22:41:53 +0000 (22:41 +0000)]
Use latest major version for all github actions
Tom Hughes [Mon, 11 Jan 2021 20:04:13 +0000 (20:04 +0000)]
Restore ruby 2.5 compatibility
Tom Hughes [Mon, 11 Jan 2021 19:14:00 +0000 (19:14 +0000)]
Fix new rubocop warnings
Tom Hughes [Mon, 11 Jan 2021 18:48:27 +0000 (18:48 +0000)]
Remove redundant gem requirements for unsupported ruby versions
Tom Hughes [Mon, 11 Jan 2021 18:39:54 +0000 (18:39 +0000)]
Unpin rubocop now erb_lint is fixed
Tom Hughes [Mon, 11 Jan 2021 18:38:11 +0000 (18:38 +0000)]
Update bundle
translatewiki.net [Mon, 11 Jan 2021 16:46:08 +0000 (17:46 +0100)]
Localisation updates from https://translatewiki.net.
translatewiki.net [Thu, 7 Jan 2021 14:26:56 +0000 (15:26 +0100)]
Localisation updates from https://translatewiki.net.
Andy Allan [Wed, 6 Jan 2021 15:41:42 +0000 (15:41 +0000)]
Merge branch 'pull/3035'
Andy Allan [Wed, 6 Jan 2021 15:40:53 +0000 (15:40 +0000)]
Remove spacing tweaks and legacy pagination spacing CSS
No need to fight against something that we no longer use.
Andy Allan [Wed, 6 Jan 2021 15:25:37 +0000 (15:25 +0000)]
Merge branch 'pull/3024'
Andy Allan [Wed, 6 Jan 2021 15:24:50 +0000 (15:24 +0000)]
Remove link_to_if since it's in a clause with the same condition
Tom Hughes [Wed, 6 Jan 2021 14:19:34 +0000 (14:19 +0000)]
Merge remote-tracking branch 'upstream/pull/3038'
Tom Hughes [Tue, 5 Jan 2021 19:45:04 +0000 (19:45 +0000)]
Remove both Potlatch versions
Fixes #2622
Tom Hughes [Tue, 5 Jan 2021 18:28:30 +0000 (18:28 +0000)]
Merge remote-tracking branch 'upstream/pull/3037'
translatewiki.net [Mon, 4 Jan 2021 13:52:37 +0000 (14:52 +0100)]
Localisation updates from https://translatewiki.net.
dependabot[bot] [Mon, 4 Jan 2021 05:02:07 +0000 (05:02 +0000)]
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>
Tobias Jordans [Sat, 2 Jan 2021 21:48:25 +0000 (22:48 +0100)]
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.
Tobias [Sat, 2 Jan 2021 21:24:46 +0000 (22:24 +0100)]
Diary entries #index: Simplify bootstrap pagination
- We can use a span instead of a disabled link as well
- Update to use double quotes everywhere
Tom Hughes [Fri, 1 Jan 2021 11:55:24 +0000 (11:55 +0000)]
Update bundle
Tom Hughes [Fri, 1 Jan 2021 11:54:29 +0000 (11:54 +0000)]
Remove unnecessary inflection
Tom Hughes [Thu, 10 Dec 2020 14:46:41 +0000 (14:46 +0000)]
Switch to using the zeitwork autoloader
Tom Hughes [Wed, 30 Dec 2020 17:58:04 +0000 (17:58 +0000)]
Verify that public and trackable traces don't return identity details
Tobias Jordans [Wed, 30 Dec 2020 13:20:13 +0000 (14:20 +0100)]
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.
Tom Hughes [Tue, 29 Dec 2020 19:26:58 +0000 (19:26 +0000)]
Revert "Switch to using the zeitwork autoloader"
This reverts commit
127880a73fa461400c53b29c98721e34660bca5e .
Tom Hughes [Tue, 29 Dec 2020 18:54:12 +0000 (18:54 +0000)]
Fix case for zeitwork
Tom Hughes [Thu, 10 Dec 2020 14:46:41 +0000 (14:46 +0000)]
Switch to using the zeitwork autoloader
Tom Hughes [Tue, 29 Dec 2020 18:39:25 +0000 (18:39 +0000)]
Update bundle
translatewiki.net [Tue, 29 Dec 2020 08:03:29 +0000 (09:03 +0100)]
Localisation updates from https://translatewiki.net.
Andy Allan [Mon, 28 Dec 2020 11:15:58 +0000 (11:15 +0000)]
Merge pull request #3018 from tordans/line-break-for-long-urls
Break long URLs in blog post show
Tobias Jordans [Sun, 27 Dec 2020 13:19:36 +0000 (14:19 +0100)]
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.
Tom Hughes [Thu, 24 Dec 2020 14:07:41 +0000 (14:07 +0000)]
Merge remote-tracking branch 'upstream/pull/3017'
Andy Allan [Thu, 24 Dec 2020 13:31:04 +0000 (13:31 +0000)]
Refactor diary entry forms to use a custom form builder
Andy Allan [Thu, 24 Dec 2020 13:29:12 +0000 (13:29 +0000)]
Ensure richtext editing style rules are only applied on standard forms
Tom Hughes [Wed, 23 Dec 2020 15:24:10 +0000 (15:24 +0000)]
Merge remote-tracking branch 'upstream/pull/3016'
Tom Hughes [Wed, 23 Dec 2020 15:02:04 +0000 (15:02 +0000)]
Merge remote-tracking branch 'upstream/pull/3015'
Andy Allan [Wed, 23 Dec 2020 15:01:01 +0000 (15:01 +0000)]
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.
Andy Allan [Wed, 23 Dec 2020 14:25:58 +0000 (14:25 +0000)]
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.
translatewiki.net [Tue, 22 Dec 2020 13:04:52 +0000 (14:04 +0100)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Mon, 21 Dec 2020 09:47:00 +0000 (09:47 +0000)]
Update bundle
Tom Hughes [Mon, 21 Dec 2020 09:45:22 +0000 (09:45 +0000)]
Merge remote-tracking branch 'upstream/pull/3014'
dependabot[bot] [Mon, 21 Dec 2020 05:03:00 +0000 (05:03 +0000)]
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>
Tom Hughes [Fri, 18 Dec 2020 22:39:23 +0000 (22:39 +0000)]
Make coverage testing work with parallel tests
https://github.com/simplecov-ruby/simplecov/issues/718#issuecomment-
538201587
translatewiki.net [Thu, 17 Dec 2020 14:21:34 +0000 (15:21 +0100)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Thu, 17 Dec 2020 12:30:05 +0000 (12:30 +0000)]
Merge remote-tracking branch 'upstream/pull/3010'
Andy Allan [Thu, 17 Dec 2020 11:44:22 +0000 (11:44 +0000)]
Merge pull request #3009 from gravitystorm/svg_icons
Add updated authentication icons
Tom Hughes [Wed, 16 Dec 2020 19:17:22 +0000 (19:17 +0000)]
Merge remote-tracking branch 'upstream/pull/3002'
Andy Allan [Wed, 16 Dec 2020 18:23:38 +0000 (18:23 +0000)]
Increase memory given to the virtualbox vm
Fixes #2972
Like others, I found that the previous setting caused OOM failures, and
4096 was sufficient. I suspect lower values will also work, but I don't
have time or inclination to bisect a smaller value.
Andy Allan [Wed, 16 Dec 2020 11:57:34 +0000 (11:57 +0000)]
Use bootstrap utility class instead of custom css
Tom Hughes [Wed, 16 Dec 2020 11:17:51 +0000 (11:17 +0000)]
Ignore GPX archive entries that aren't regular files
Fixes #3008
Tom Hughes [Mon, 14 Dec 2020 14:48:59 +0000 (14:48 +0000)]
Convert id column for oauth_nonces to bigint
translatewiki.net [Mon, 14 Dec 2020 14:14:05 +0000 (15:14 +0100)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Thu, 10 Dec 2020 14:40:16 +0000 (14:40 +0000)]
Update bundle
translatewiki.net [Thu, 10 Dec 2020 12:56:16 +0000 (13:56 +0100)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Wed, 9 Dec 2020 22:47:52 +0000 (22:47 +0000)]
Enable dependabot for github actions