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

11776 commits

This branch
This branch
All branches
Author SHA1 Message Date
Tom Hughes
60b16b9421 Update bundle 2021-06-15 18:39:24 +01:00
translatewiki.net
85dadb1082 Localisation updates from https://translatewiki.net. 2021-06-14 09:58:54 +02:00
translatewiki.net
32c4181f41 Localisation updates from https://translatewiki.net. 2021-06-10 16:55:57 +02:00
Tom Hughes
3fff377b00 Merge remote-tracking branch 'upstream/pull/3217' 2021-06-09 17:46:45 +01:00
Tom Hughes
616f3783df Merge remote-tracking branch 'upstream/pull/3216' 2021-06-09 17:46:11 +01:00
Andy Allan
63c82ed72f Set updated_by when resolving issues 
Refs #3211
 2021-06-09 15:47:31 +01:00
Andy Allan
7e5bbce23d
Merge pull request #3208 from osm-hr/update-rcn-color 
fix map key color for regional OpenCycleMap
 2021-06-09 15:29:57 +01:00
Andy Allan
71be435886 Fix case when user block durations are slightly negative 
The output from ActiveSupport::Duration is wildly unhelpful in those cases

Fixes #3210
 2021-06-09 15:16:35 +01:00
Andy Allan
5ce14cfa4d Ensure that short duration blockss are shown as '0 hours' 
Passing `:count => nil` means that i18n.t will return the hash of translations, so use a default value of 0 when checking for hours to prevent this.

Refs #3210
 2021-06-09 14:17:56 +01:00
Tom Hughes
baa32464cd Drop last vestiges of ruby 2.5 support 2021-06-08 20:33:25 +01:00
Tom Hughes
77304d4f50 Update bundle 2021-06-08 19:44:48 +01:00
Tom Hughes
0bd3229f89 Merge remote-tracking branch 'upstream/pull/3214' 2021-06-08 19:41:39 +01:00
translatewiki.net
cba1b6a640 Localisation updates from https://translatewiki.net. 2021-06-07 14:58:59 +02:00
dependabot[bot]
a8020dc475
Bump eslint from 7.27.0 to 7.28.0 
Bumps [eslint](https://github.com/eslint/eslint) from 7.27.0 to 7.28.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.27.0...v7.28.0)

---
updated-dependencies:
- dependency-name: eslint
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-06-07 05:01:26 +00:00
Tom Hughes
2c5e981684 Fix erblint warnings 2021-06-05 07:40:55 +01:00
Tom Hughes
29032847d9 Set a referrer policy 2021-06-04 21:50:15 +01:00
Tom Hughes
3b32753141 Merge remote-tracking branch 'upstream/pull/3213' 2021-06-04 21:10:32 +01:00
Tom Hughes
c233f6cb83 Merge remote-tracking branch 'upstream/pull/3212' 2021-06-04 21:09:26 +01:00
Robbendebiene
bc12774c21
Added missing dependency for fedora install 2021-06-04 16:48:33 +02:00
Robbendebiene
ff877321e7
fixed nodejs package name for fedora 2021-06-04 16:29:08 +02:00
translatewiki.net
40c3856906 Localisation updates from https://translatewiki.net. 2021-06-03 15:24:16 +02:00
Tom Hughes
17b5395e26 Fix new rubocop warnings 2021-06-01 18:27:50 +01:00
Tom Hughes
da9efb5c64 Update bundle 2021-06-01 18:25:21 +01:00
translatewiki.net
93bc938037 Localisation updates from https://translatewiki.net. 2021-05-31 10:10:52 +02:00
Tom Hughes
d9a8ac42aa Merge remote-tracking branch 'upstream/pull/3209' 2021-05-28 07:27:11 +01:00
dependabot[bot]
c4f5e6aa5d
Bump actions/cache from 2.1.5 to 2.1.6 
Bumps [actions/cache](https://github.com/actions/cache) from 2.1.5 to 2.1.6.
- [Release notes](https://github.com/actions/cache/releases)
- [Commits](https://github.com/actions/cache/compare/v2.1.5...v2.1.6)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-05-28 05:47:37 +00:00
translatewiki.net
ad485536a3 Localisation updates from https://translatewiki.net. 2021-05-27 15:49:57 +02:00
Matija Nalis
7b3c449b46 fix map key color for regional OpenCycleMap, as it changed from light cyan to purple on the map. 
Closes: https://github.com/openstreetmap/openstreetmap-website/issues/2785
 2021-05-25 22:48:38 +02:00
Tom Hughes
8b929a6e99 Update bundle 2021-05-25 18:27:19 +01:00
Tom Hughes
92a321911c Merge remote-tracking branch 'upstream/pull/3206' 2021-05-25 15:30:55 +01:00
dependabot[bot]
40a3ecb66d
Bump ohauth from 1.0.0 to 1.0.1 
Bumps [ohauth](https://github.com/osmlab/ohauth) from 1.0.0 to 1.0.1.
- [Release notes](https://github.com/osmlab/ohauth/releases)
- [Changelog](https://github.com/osmlab/ohauth/blob/main/CHANGELOG.md)
- [Commits](https://github.com/osmlab/ohauth/compare/v1.0.0...v1.0.1)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-05-25 05:01:10 +00:00
Tom Hughes
f798d5b40f Merge remote-tracking branch 'upstream/pull/3202' 2021-05-24 18:17:40 +01:00
translatewiki.net
a9fce763a5 Localisation updates from https://translatewiki.net. 2021-05-24 14:14:01 +02:00
dependabot[bot]
4c01b74cf8
Bump eslint from 7.26.0 to 7.27.0 
Bumps [eslint](https://github.com/eslint/eslint) from 7.26.0 to 7.27.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.26.0...v7.27.0)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-05-24 05:01:37 +00:00
Andy Allan
8e19f2c7f0 Fix translation text 2021-05-20 19:13:17 +01:00
Tom Hughes
4e44e0c8fe Merge remote-tracking branch 'upstream/pull/3200' 2021-05-20 18:17:39 +01:00
Tom Hughes
e2af9941a8 Fix downloading of image variants 2021-05-19 18:44:41 +01:00
Andy Allan
b18c1bff8b Use built-in translation lookups for form helps 2021-05-19 16:22:14 +01:00
Andy Allan
39ca64c814 Use Update and Register as actions, to be consistent with client_applications 2021-05-19 16:22:14 +01:00
Andy Allan
7c26d84a84 Rework some of the OAuth2 views, adding links and messages when there are no applications. 2021-05-19 16:22:14 +01:00
Andy Allan
4c785792fb Switch to using 'rails test:all' in documentation and CI 
Fixes #3116.

This allows us to drop our custom patch for running system tests,
as well as opening up all the usual rails test goodies like running
individual files or directories.
 2021-05-19 13:39:37 +01:00
Tom Hughes
b96f3867e6 Allow OAuth 2 authorizations to redirect to anywhere 2021-05-18 12:12:36 +01:00
Tom Hughes
5868be1f7b Show scope names in application views 2021-05-18 12:05:33 +01:00
Tom Hughes
aa9ce8b6db Allow OAuth 2 to redirect to plain HTTP for localhost 2021-05-18 12:05:33 +01:00
Tom Hughes
f064a18a16 Add tests for OAuth2 2021-05-18 12:05:33 +01:00
Tom Hughes
e222329d04 Add support for OAuth2 using doorkeeper 2021-05-18 12:05:32 +01:00
Tom Hughes
f58f49e196 Update bundle 2021-05-18 08:29:51 +01:00
Tom Hughes
edb95acedc Merge remote-tracking branch 'upstream/pull/3199' 2021-05-18 08:26:17 +01:00
dependabot[bot]
c8054024fc
Bump puma from 5.3.0 to 5.3.1 
Bumps [puma](https://github.com/puma/puma) from 5.3.0 to 5.3.1.
- [Release notes](https://github.com/puma/puma/releases)
- [Changelog](https://github.com/puma/puma/blob/master/History.md)
- [Commits](https://github.com/puma/puma/compare/v5.3.0...v5.3.1)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-05-18 01:34:02 +00:00
Tom Hughes
be9a9a1556 Enable variant tracking for Active Storage 2021-05-17 19:29:12 +01:00