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

12646 commits

This branch
This branch
All branches
Author SHA1 Message Date
Tom Hughes
141fc574db Merge remote-tracking branch 'upstream/pull/4097' 2023-07-16 12:07:00 +01:00
Tom Hughes
b3101110d4 Merge remote-tracking branch 'upstream/pull/4095' 2023-07-16 12:06:57 +01:00
Tom Hughes
a3d9b8b901 Merge remote-tracking branch 'upstream/pull/4094' 2023-07-16 12:06:54 +01:00
Amir E. Aharoni
6795fd3117
Consistent plural forms for browse.way.nodes_count 
Without this, translatewiki's validator shows an error for English.
 2023-07-15 10:34:24 +03:00
dependabot[bot]
dde978e225
Bump eslint from 8.44.0 to 8.45.0 
Bumps [eslint](https://github.com/eslint/eslint) from 8.44.0 to 8.45.0.
- [Release notes](https://github.com/eslint/eslint/releases)
- [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md)
- [Commits](https://github.com/eslint/eslint/compare/v8.44.0...v8.45.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-07-14 23:02:08 +00:00
dependabot[bot]
6939413a09
Bump coverallsapp/github-action from 2.2.0 to 2.2.1 
Bumps [coverallsapp/github-action](https://github.com/coverallsapp/github-action) from 2.2.0 to 2.2.1.
- [Release notes](https://github.com/coverallsapp/github-action/releases)
- [Commits](https://github.com/coverallsapp/github-action/compare/v2.2.0...v2.2.1)

---
updated-dependencies:
- dependency-name: coverallsapp/github-action
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-07-13 23:19:20 +00:00
Tom Hughes
1c420158f6 Remove default imagery blacklist 2023-07-13 20:14:13 +01:00
Tom Hughes
86cef1d4e7 Merge remote-tracking branch 'upstream/pull/4093' 2023-07-13 18:36:24 +01:00
Pavel Zbytovský
b78bdd0b70
Block mapy.cz as non-approved imagery 
Issue: https://github.com/openstreetmap/openstreetmap-website/issues/4085
 2023-07-13 19:04:24 +02:00
Tom Hughes
bbc72cfd8b Merge remote-tracking branch 'upstream/pull/4092' 2023-07-13 13:25:56 +01:00
Martin Raifer
cb6d528ecb
Update to iD v2.26.2 2023-07-13 14:09:43 +02:00
translatewiki.net
a3b7de3ec9 Localisation updates from https://translatewiki.net. 2023-07-13 13:19:25 +02:00
Tom Hughes
f2c3dca59b Merge remote-tracking branch 'upstream/pull/4091' 2023-07-13 08:03:52 +01:00
dependabot[bot]
f2e8587d98
Bump osm-community-index from 5.5.3 to 5.5.4 
Bumps [osm-community-index](https://github.com/osmlab/osm-community-index) from 5.5.3 to 5.5.4.
- [Release notes](https://github.com/osmlab/osm-community-index/releases)
- [Changelog](https://github.com/osmlab/osm-community-index/blob/main/CHANGELOG.md)
- [Commits](https://github.com/osmlab/osm-community-index/compare/v5.5.3...v5.5.4)

---
updated-dependencies:
- dependency-name: osm-community-index
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-07-12 23:58:30 +00:00
Tom Hughes
f0c52e8baa Merge remote-tracking branch 'upstream/pull/4090' 2023-07-12 21:57:17 +01:00
Martin Raifer
9aa646bd03
Update to iD v2.26.1 2023-07-12 22:19:43 +02:00
Tom Hughes
0a8dae77fb Merge remote-tracking branch 'upstream/pull/4088' 2023-07-12 18:34:56 +01:00
Tom Hughes
c6db419b55 Merge remote-tracking branch 'upstream/pull/4086' 2023-07-12 18:26:25 +01:00
Andy Allan
e108ec6d48 Avoid using sprockets for combining stylesheets 
There are two options for combining stylesheets, using sprockets
(via `require` statements) or using sass (via `@import` statements).

This commit switches to using `@import` statements throughout, to
avoid a bug with libsass that prevents us from using bootstrap 5.2+

See https://github.com/sass/sassc-rails/issues/174

Since R2 is not triggered when `@import`ing a file, we need to
switch the top-level stylesheet names to include the extension. We
can also take the opportunity to remove a level of indirection,
along with removing symlinks which cause problems on some platforms.

* https://github.com/openstreetmap/openstreetmap-website/issues/3984
* https://github.com/openstreetmap/openstreetmap-website/issues/3422
 2023-07-12 17:54:51 +01:00
Martin Raifer
8cfdbf8922
Update to iD v2.26.0 2023-07-12 13:57:19 +02:00
Tom Hughes
17b18fcb81 Update bundle 2023-07-11 18:16:45 +01:00
translatewiki.net
e2d62232bb Localisation updates from https://translatewiki.net. 2023-07-10 13:33:02 +02:00
Tom Hughes
9169a28c6b Merge remote-tracking branch 'upstream/pull/4078' 2023-07-06 22:16:03 +01:00
dependabot[bot]
a30aa658a8
Bump sanitize from 6.0.1 to 6.0.2 
Bumps [sanitize](https://github.com/rgrove/sanitize) from 6.0.1 to 6.0.2.
- [Release notes](https://github.com/rgrove/sanitize/releases)
- [Changelog](https://github.com/rgrove/sanitize/blob/main/HISTORY.md)
- [Commits](https://github.com/rgrove/sanitize/compare/v6.0.1...v6.0.2)

---
updated-dependencies:
- dependency-name: sanitize
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-07-06 20:04:31 +00:00
translatewiki.net
0a448f06cf Localisation updates from https://translatewiki.net. 2023-07-06 13:20:58 +02:00
Tom Hughes
62c68b9f20 Merge remote-tracking branch 'upstream/pull/4077' 2023-07-05 15:10:12 +01:00
Tom Hughes
817cd6995f Merge remote-tracking branch 'upstream/pull/4076' 2023-07-05 15:01:12 +01:00
Andy Allan
d58cae6ff6 Avoid using the zero key for pluralisation in English 
This makes it impossible to translate to other languages that use the
`zero:` key, e.g. for other numbers that end in zero.

An alternative approach would be possible in future, when ruby-i18n
and rails and translatewiki all have full support for `0:` and `1:` keys.

Fixes #3997
 2023-07-05 14:47:39 +01:00
Andy Allan
22c137cc0c Expand raw html checks to all translation files 
This closes a potential security issue, where unreviewed html could
be added via translation files.
 2023-07-05 13:47:12 +01:00
Tom Hughes
72c567d73b Merge remote-tracking branch 'upstream/pull/4075' 2023-07-05 12:52:58 +01:00
Andy Allan
b8da7922ec Remove obsolete pt-BR.yml translation file 
Translatewiki now pushes pt-BR to pt.yml, which is used for both
pt and pt-BR.

Fixes #3670.
 2023-07-05 12:11:01 +01:00
Tom Hughes
e66d0d232f Update bundle 2023-07-04 18:14:30 +01:00
translatewiki.net
e2450b1785 Localisation updates from https://translatewiki.net. 2023-07-03 13:18:06 +02:00
Tom Hughes
198888abf2 Update bundle 2023-07-01 15:22:23 +01:00
Tom Hughes
6df842de41 Update to rails 7.0.6 2023-07-01 15:21:34 +01:00
Tom Hughes
68ff443697 Merge remote-tracking branch 'upstream/pull/4074' 2023-07-01 15:21:27 +01:00
Tom Hughes
0254f7ee09 Fix confirmation prompt when granting or revoking roles 2023-07-01 15:21:02 +01:00
dependabot[bot]
d3b6714031
Bump eslint from 8.43.0 to 8.44.0 
Bumps [eslint](https://github.com/eslint/eslint) from 8.43.0 to 8.44.0.
- [Release notes](https://github.com/eslint/eslint/releases)
- [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md)
- [Commits](https://github.com/eslint/eslint/compare/v8.43.0...v8.44.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-06-30 23:49:45 +00:00
translatewiki.net
512f7de4a9 Localisation updates from https://translatewiki.net. 2023-06-29 13:18:30 +02:00
Tom Hughes
466de96a91 Fix new rubocop warnings 2023-06-27 18:13:33 +01:00
Tom Hughes
d1d80ce375 Update bundle 2023-06-27 18:09:50 +01:00
Tom Hughes
d9f061e72f Update to rails 7.0.5.1 2023-06-27 18:09:08 +01:00
translatewiki.net
e9f78dd08c Localisation updates from https://translatewiki.net. 2023-06-26 13:18:51 +02:00
translatewiki.net
0e00857d51 Localisation updates from https://translatewiki.net. 2023-06-22 13:23:29 +02:00
Tom Hughes
91655acf80 Update bundle 2023-06-21 20:26:26 +01:00
Tom Hughes
3be762b2ae Merge remote-tracking branch 'upstream/pull/4071' 2023-06-21 20:25:08 +01:00
dependabot[bot]
b5bcdbb2b6
Bump osm-community-index from 5.5.2 to 5.5.3 
Bumps [osm-community-index](https://github.com/osmlab/osm-community-index) from 5.5.2 to 5.5.3.
- [Release notes](https://github.com/osmlab/osm-community-index/releases)
- [Changelog](https://github.com/osmlab/osm-community-index/blob/main/CHANGELOG.md)
- [Commits](https://github.com/osmlab/osm-community-index/compare/v5.5.2...v5.5.3)

---
updated-dependencies:
- dependency-name: osm-community-index
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-06-20 23:56:36 +00:00
translatewiki.net
0dacc11785 Localisation updates from https://translatewiki.net. 2023-06-19 13:12:39 +02:00
Tom Hughes
ec7c50eb58 Merge remote-tracking branch 'upstream/pull/4068' 2023-06-18 18:40:48 +01:00
dependabot[bot]
648bb32791
Bump eslint from 8.42.0 to 8.43.0 
Bumps [eslint](https://github.com/eslint/eslint) from 8.42.0 to 8.43.0.
- [Release notes](https://github.com/eslint/eslint/releases)
- [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md)
- [Commits](https://github.com/eslint/eslint/compare/v8.42.0...v8.43.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-06-16 23:56:46 +00:00