Commit graph

11229 commits

Author SHA1 Message Date
Tom Hughes
2def62ee19 Fix errors with GPX offline mode 2020-07-05 14:49:12 +01:00
Tom Hughes
d8a1cbd27b Merge remote-tracking branch 'upstream/pull/2689' 2020-07-04 23:57:12 +01:00
Andy Allan
6040814625 Rephrase the 'used_by' text on the about page. 2020-07-04 18:26:04 +02:00
Tom Hughes
b8eaf227d9 Merge remote-tracking branch 'upstream/pull/2688' 2020-07-04 10:39:07 +01:00
Tom Hughes
62fb6cb1af Merge remote-tracking branch 'upstream/pull/2687' 2020-07-04 10:39:02 +01:00
Andy Allan
8cd83426cc Make the back button not look disabled
This switches the message buttons to use bootstrap, so that we can have a back button that looks clickable.

Alternative implementation of #2386
2020-07-04 11:20:46 +02:00
Andy Allan
bae057dbdf Avoid list markers for the richtext help text 2020-07-04 10:51:16 +02:00
Andy Allan
2b962023e3
Merge pull request #2674 from openstreetmap/dependabot/bundler/bootstrap-4.5.0
Bump bootstrap from 4.3.1 to 4.5.0
2020-07-04 10:12:18 +02:00
Tom Hughes
c9b9f07ac7 Merge remote-tracking branch 'upstream/pull/2685' 2020-07-03 07:09:52 +01:00
dependabot[bot]
313ac3fba1
Bump aws-sdk-s3 from 1.72.0 to 1.73.0
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.72.0 to 1.73.0.
- [Release notes](https://github.com/aws/aws-sdk-ruby/releases)
- [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-sdk-s3/CHANGELOG.md)
- [Commits](https://github.com/aws/aws-sdk-ruby/commits)

Signed-off-by: dependabot[bot] <support@github.com>
2020-07-03 05:01:14 +00:00
translatewiki.net
90d6fd9d60 Localisation updates from https://translatewiki.net. 2020-07-02 17:56:03 +02:00
dependabot[bot]
152e311040
Bump bootstrap from 4.3.1 to 4.5.0
Bumps [bootstrap](https://github.com/twbs/bootstrap-rubygem) from 4.3.1 to 4.5.0.
- [Release notes](https://github.com/twbs/bootstrap-rubygem/releases)
- [Changelog](https://github.com/twbs/bootstrap-rubygem/blob/master/CHANGELOG.md)
- [Commits](https://github.com/twbs/bootstrap-rubygem/compare/v4.3.1...v4.5.0)

Signed-off-by: dependabot[bot] <support@github.com>
2020-07-01 15:58:13 +00: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
Andy Allan
54616e9612 Add bootstrap_form formbuilder gem 2020-07-01 17:23:02 +02:00
Andy Allan
4a25d60876 Remove the red colour override, and use the bootstrap default
Full red clashes badly when side-by-side with our blues
2020-07-01 17:23:02 +02:00
Andy Allan
627f2493fa Refactor away from global form control styling
This enables forms to be converted one-by-one to bootstrap. Without this
refactoring, these global styles interfere with form control styling from
bootstrap.

The rearrangement of the search and directions styling is to solve CSS selector specitivity issues.
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
02184fae74 Merge remote-tracking branch 'upstream/pull/2683' 2020-07-01 08:28:18 +01:00
Tom Hughes
0585866202 Merge remote-tracking branch 'upstream/pull/2661' 2020-07-01 08:28:08 +01:00
dependabot[bot]
a27e6636a6
Bump json from 2.3.0 to 2.3.1
Bumps [json](https://github.com/flori/json) from 2.3.0 to 2.3.1.
- [Release notes](https://github.com/flori/json/releases)
- [Changelog](https://github.com/flori/json/blob/master/CHANGES.md)
- [Commits](https://github.com/flori/json/compare/v2.3.0...v2.3.1)

Signed-off-by: dependabot[bot] <support@github.com>
2020-07-01 05:01:35 +00:00
Tom Hughes
a8011d8eb9 Merge remote-tracking branch 'upstream/pull/2680' 2020-06-30 19:06:11 +01:00
dependabot[bot]
6870abe494
Bump i18n-js from 3.7.0 to 3.7.1
Bumps [i18n-js](https://github.com/fnando/i18n-js) from 3.7.0 to 3.7.1.
- [Release notes](https://github.com/fnando/i18n-js/releases)
- [Changelog](https://github.com/fnando/i18n-js/blob/master/CHANGELOG.md)
- [Commits](https://github.com/fnando/i18n-js/compare/v3.7.0...v3.7.1)

Signed-off-by: dependabot[bot] <support@github.com>
2020-06-30 05:01:08 +00:00
Andy Allan
e7456739f4
Merge pull request #2681 from rahulvaish/patch-1
Updated README.md
2020-06-29 16:42:06 +02:00
Rahul Vaish
2f243bdd45
Updated README.md
Introduced Full Stops to maintain the consistency in the document.
2020-06-29 20:09:52 +05:30
translatewiki.net
8aea393632 Localisation updates from https://translatewiki.net. 2020-06-29 16:28:01 +02:00
Tom Hughes
efaddc5070 Merge remote-tracking branch 'upstream/pull/2679' 2020-06-29 10:32:46 +01:00
Tom Hughes
0c842480e7 Merge remote-tracking branch 'upstream/pull/2678' 2020-06-29 10:32:43 +01:00
dependabot[bot]
38c17fdee8
Bump rails-i18n from 4.0.2 to 6.0.0
Bumps [rails-i18n](https://github.com/svenfuchs/rails-i18n) from 4.0.2 to 6.0.0.
- [Release notes](https://github.com/svenfuchs/rails-i18n/releases)
- [Changelog](https://github.com/svenfuchs/rails-i18n/blob/master/CHANGELOG.md)
- [Commits](https://github.com/svenfuchs/rails-i18n/commits/v6.0.0)

Signed-off-by: dependabot[bot] <support@github.com>
2020-06-29 05:01:53 +00:00
dependabot[bot]
c9aebe6980
Bump aws-sdk-s3 from 1.71.1 to 1.72.0
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.71.1 to 1.72.0.
- [Release notes](https://github.com/aws/aws-sdk-ruby/releases)
- [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-sdk-s3/CHANGELOG.md)
- [Commits](https://github.com/aws/aws-sdk-ruby/commits)

Signed-off-by: dependabot[bot] <support@github.com>
2020-06-29 05:01:31 +00:00
dependabot[bot]
979a8dc6e6
Bump kramdown from 2.2.1 to 2.3.0
Bumps [kramdown](https://github.com/gettalong/kramdown) from 2.2.1 to 2.3.0.
- [Release notes](https://github.com/gettalong/kramdown/releases)
- [Changelog](https://github.com/gettalong/kramdown/blob/master/doc/news.page)
- [Commits](https://github.com/gettalong/kramdown/commits)

Signed-off-by: dependabot[bot] <support@github.com>
2020-06-29 05:01:11 +00:00
Tom Hughes
c7076ef2a0 Revert "Bump rails-i18n from 4.0.2 to 6.0.0"
This reverts commit a6d8043dc2.
2020-06-28 19:21:24 +01:00
Tom Hughes
45c599b1b0 Merge remote-tracking branch 'upstream/pull/2676' 2020-06-28 18:42:18 +01:00
Tom Hughes
1212fbad4c Enable locale fallback in all environments 2020-06-26 20:30:48 +01:00
dependabot[bot]
a6d8043dc2
Bump rails-i18n from 4.0.2 to 6.0.0
Bumps [rails-i18n](https://github.com/svenfuchs/rails-i18n) from 4.0.2 to 6.0.0.
- [Release notes](https://github.com/svenfuchs/rails-i18n/releases)
- [Changelog](https://github.com/svenfuchs/rails-i18n/blob/master/CHANGELOG.md)
- [Commits](https://github.com/svenfuchs/rails-i18n/commits/v6.0.0)

Signed-off-by: dependabot[bot] <support@github.com>
2020-06-26 18:41:52 +00:00
Tom Hughes
3abeeb7f41 Require open3 before using it 2020-06-26 19:40:37 +01:00
Tom Hughes
4ab70b63c3 Merge remote-tracking branch 'upstream/pull/2673' 2020-06-26 19:32:42 +01:00
dependabot[bot]
bb8d35df3b
Bump puma from 3.12.6 to 4.3.5
Bumps [puma](https://github.com/puma/puma) from 3.12.6 to 4.3.5.
- [Release notes](https://github.com/puma/puma/releases)
- [Changelog](https://github.com/puma/puma/blob/master/History.md)
- [Commits](https://github.com/puma/puma/commits)

Signed-off-by: dependabot[bot] <support@github.com>
2020-06-26 18:24:52 +00:00
dependabot[bot]
5588b8201d
Bump http_accept_language from 2.0.5 to 2.1.1
Bumps [http_accept_language](https://github.com/iain/http_accept_language) from 2.0.5 to 2.1.1.
- [Release notes](https://github.com/iain/http_accept_language/releases)
- [Commits](https://github.com/iain/http_accept_language/compare/v2.0.5...v2.1.1)

Signed-off-by: dependabot[bot] <support@github.com>
2020-06-26 18:24:22 +00:00
dependabot[bot]
0667ae0a36
Bump eslint from 6.8.0 to 7.3.1
Bumps [eslint](https://github.com/eslint/eslint) from 6.8.0 to 7.3.1.
- [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/v6.8.0...v7.3.1)

Signed-off-by: dependabot[bot] <support@github.com>
2020-06-26 18:24:19 +00:00
Tom Hughes
c2d093416b Enable dependabot 2020-06-26 19:23:10 +01:00
Tom Hughes
dc5fedb687 Update bundle 2020-06-26 19:15:26 +01:00
Paul Norman
fb4aa31048
Add ÖPNVKarte layer 2020-06-25 20:47:25 -07:00
Paul Norman
5dfb6432e0
Update leaflet-osm 2020-06-25 20:23:04 -07:00
Tom Hughes
bcf6eafb0d Fix new rubocopy warnings 2020-06-24 18:49:12 +01:00
Tom Hughes
233c6c0e97 Update bundle 2020-06-24 18:46:28 +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