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

12372 commits

This branch
This branch
All branches
Author SHA1 Message Date
Tom Hughes
1becffcbf5 Update bundle 2023-02-07 18:22:50 +00:00
translatewiki.net
65ed47c119 Localisation updates from https://translatewiki.net. 2023-02-06 13:15:08 +01:00
translatewiki.net
8e443649f3 Localisation updates from https://translatewiki.net. 2023-02-02 13:14:55 +01:00
Tom Hughes
52591c5561 Merge remote-tracking branch 'upstream/pull/3911' 2023-02-01 19:10:22 +00:00
Tom Hughes
9b39577f46 Merge remote-tracking branch 'upstream/pull/3915' 2023-02-01 19:07:09 +00:00
Andy Allan
c226d8e85e Avoid converting conditional restriction tags into emails 
Fixes #3884
 2023-02-01 18:57:16 +00:00
Andy Allan
c276625e7f Refactor to use submit_tag helper 
This is more readable than interpolating into element attributes
 2023-02-01 17:24:48 +00:00
Andy Allan
a88da1d71a Refactor translation strings for notes 
These aren't used by any javascript code, so don't need to be in
the `javascripts` key.
 2023-02-01 17:24:48 +00:00
Andy Allan
9bb8dd739a Use data attributes to pass alternative button labels 
This allows the text to be defined in the html partials, instead
of looking up the i18n via javascript.
 2023-02-01 17:24:47 +00:00
Andy Allan
9748ce301c Move browse#note to notes#show 
This allows a more resourceful routing approach.
 2023-02-01 17:13:41 +00:00
Andy Allan
b5046fdcd0 Move browse#new_note to notes#new 
This allows a more resourceful routing approach.
 2023-02-01 17:13:41 +00:00
Tom Hughes
ccaff5c40e Update bundle 2023-01-31 18:09:09 +00:00
Tom Hughes
9754d86d0f Merge remote-tracking branch 'upstream/pull/3913' 2023-01-31 18:07:24 +00:00
dependabot[bot]
f76aad0120
Bump eslint from 8.32.0 to 8.33.0 
Bumps [eslint](https://github.com/eslint/eslint) from 8.32.0 to 8.33.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.32.0...v8.33.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-01-30 23:00:40 +00:00
translatewiki.net
850ced0288 Localisation updates from https://translatewiki.net. 2023-01-30 13:13:12 +01:00
Tom Hughes
9224c47622 Update to rails 7.0.4.2 2023-01-26 18:06:57 +00:00
translatewiki.net
7a182d9e12 Localisation updates from https://translatewiki.net. 2023-01-26 13:17:10 +01:00
Tom Hughes
b5b2e4dfbc Sort issues in descending order of their last update 2023-01-26 09:04:37 +00:00
Andy Allan
f7367baa6b Rename api_notes resource to avoid conflict with non-API resource 
This allows using e.g. note_path for notes#show in the future.
 2023-01-25 19:01:57 +00:00
Tom Hughes
2059a7dfcf Merge remote-tracking branch 'upstream/pull/3908' 2023-01-25 12:15:41 +00:00
Martin Raifer
d449021343
Update to iD v2.24.1 2023-01-25 12:59:54 +01:00
Tom Hughes
e443d99edd Merge remote-tracking branch 'upstream/pull/3905' 2023-01-24 18:28:27 +00:00
Tom Hughes
c599f2bfaf Fix new rubocop warnings 2023-01-24 18:23:49 +00:00
Tom Hughes
9786fb939c Update bundle 2023-01-24 18:13:02 +00:00
translatewiki.net
175615f226 Localisation updates from https://translatewiki.net. 2023-01-23 13:13:19 +01:00
Martin Raifer
50fc6f1ed1
Update to iD v2.24.0 2023-01-19 16:04:52 +01:00
translatewiki.net
63708f4a52 Localisation updates from https://translatewiki.net. 2023-01-19 13:16:50 +01:00
Tom Hughes
eba722c2c8 Update to rails 7.0.4.1 2023-01-17 19:29:30 +00:00
Tom Hughes
3f74ef2ab8 Merge remote-tracking branch 'upstream/pull/3898' 2023-01-17 18:38:03 +00:00
Tom Hughes
aae589e6ce Update bundle 2023-01-17 18:37:43 +00:00
dependabot[bot]
638ffe37cd
Bump eslint from 8.31.0 to 8.32.0 
Bumps [eslint](https://github.com/eslint/eslint) from 8.31.0 to 8.32.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.31.0...v8.32.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-01-16 23:00:52 +00:00
translatewiki.net
b278bc06ef Localisation updates from https://translatewiki.net. 2023-01-16 13:13:25 +01:00
Tom Hughes
4704059096 Update tests for changes in osm-community-index 2023-01-14 15:12:23 +00:00
Tom Hughes
0ad7e1949e Merge remote-tracking branch 'upstream/pull/3893' 2023-01-14 14:49:18 +00:00
dependabot[bot]
08459a096e
Bump osm-community-index from 5.4.0 to 5.5.0 
Bumps [osm-community-index](https://github.com/osmlab/osm-community-index) from 5.4.0 to 5.5.0.
- [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.4.0...v5.5.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-01-13 23:00:43 +00:00
Tom Hughes
2ee8fcda40 Drop version constraint on mail and update bundle 2023-01-13 09:29:04 +00:00
translatewiki.net
c8cbf2457d Localisation updates from https://translatewiki.net. 2023-01-12 13:15:28 +01:00
Tom Hughes
226e2d654a Merge remote-tracking branch 'upstream/pull/3891' 2023-01-11 18:42:16 +00:00
Tom Hughes
19854d936d Merge remote-tracking branch 'upstream/pull/3890' 2023-01-11 15:38:36 +00:00
Andy Allan
088ccd2d8f
Merge pull request #3878 from tomhughes/issues-offline 
Add database checks to issue and report controllers
 2023-01-11 15:36:40 +00:00
Andy Allan
4c564e5a32 Move more api-related helper methods to ApiController 
This prevents them from being inadvertently used in non-API controllers
 2023-01-11 15:28:59 +00:00
Andy Allan
a7f0de41e6 Use web_timeout for notes controller 
This controller doesn't handle any API methods, and so the api call
error handling isn't appropriate.
 2023-01-11 15:28:02 +00:00
Andy Allan
581bf517cb Use bin/yarn consistently for installations 
Since rails 7, the `rails yarn:install` command no longer uses
bin/yarn and so a) doesn't detect yarn binaries named "yarnpkg"
(e.g. Ubuntu) and b) doesn't allow us to pass any flags to yarn,
(e.g. "--ignore-engines").

Since we want to avoid making the installation more difficult (by
e.g. installing yarn from other sources, or requiring particular
node versions) we can instead just use our existing bin/yarn script.

The reason Dockerfile did its own thing was to avoid pulling in
big chunks of rails, but bin/yarn is a standalone ruby script.

Fixes #3579
 2023-01-11 13:58:54 +00:00
Tom Hughes
a119240216 Add database checks to issue and report controllers 
Fixes #3875
 2023-01-11 11:12:36 +00:00
Tom Hughes
2ee5a63ead Merge remote-tracking branch 'upstream/pull/3886' 2023-01-11 10:57:04 +00:00
Andy Allan
0649e9cdbe
Merge pull request #3889 from tomhughes/distances 
Make distances in directions translatable
 2023-01-11 10:47:19 +00:00
Tom Hughes
4e0c5f5fcb Make distances in directions translatable 
Fixes #3888
 2023-01-10 20:58:10 +00:00
Tom Hughes
0c7fa2caec Update bundle 2023-01-10 18:40:52 +00:00
Richard Fairhurst
b7887b049f Remove Geonames and geocoder.ca 2023-01-09 21:23:48 +00:00
Tom Hughes
152e524002 Make error pages translatable 
Fixes #3877
 2023-01-09 19:32:22 +00:00