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

12353 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
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
Andy Allan
a4bab94f60
Merge pull request #3885 from tomhughes/diary-new 
Fix some translation issues for diary_entry#new
 2023-01-09 19:07:04 +00:00
Tom Hughes
1e5ffd1389 Fix some translation issues for diary_entry#new 
Fixes #3880
 2023-01-09 19:02:11 +00:00
translatewiki.net
e28a8fd992 Localisation updates from https://translatewiki.net. 2023-01-09 13:28:11 +01:00
Tom Hughes
f42a7a2d8d Make sanitize convert text alignment styles to bootstrap classes 
The kramdown converter for markdown uses inline styles for table
column alignment which gets lost when we strip the styles so add
bootstrap classes to replace it.
 2023-01-09 11:10:11 +00:00
Andy Allan
fbbcbf5c63
Merge pull request #3874 from tomhughes/offline 
Allow models to load when the database is offline
 2023-01-06 13:10:28 +00:00
Tom Hughes
4a5d509adf Allow models to load when the database is offline 
It used to be necessary to stop ActiveRecord loading because
it would immediately try and connect the database but with the
introduction of switchable database connections it now only connects
when a model is used for the first time.

Fixes #3858
 2023-01-05 20:25:34 +00:00
translatewiki.net
74f444d453 Localisation updates from https://translatewiki.net. 2023-01-05 13:20:08 +01:00
Tom Hughes
52078b5d76 Escape each portion of a semicolon seprated value individually 
Fixes #3872
 2023-01-04 15:41:54 +00:00
Tom Hughes
fb81107b6e Merge remote-tracking branch 'upstream/pull/3868' 2023-01-03 19:20:31 +00:00
Tom Hughes
c3cc8eb687 Update rubocop todo 2023-01-03 19:13:14 +00:00
Tom Hughes
cd06a449b3 Update bundle 2023-01-03 19:08:51 +00:00
Tom Hughes
1b33553b86 Merge remote-tracking branch 'upstream/pull/3871' 2023-01-03 19:07:34 +00:00
dependabot[bot]
ebf9e1f06d
Bump eslint from 8.30.0 to 8.31.0 
Bumps [eslint](https://github.com/eslint/eslint) from 8.30.0 to 8.31.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.30.0...v8.31.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-02 23:00:37 +00:00
translatewiki.net
2be5332689 Localisation updates from https://translatewiki.net. 2023-01-02 13:14:32 +01:00
Kyle Hensel
e774e1619c
fix formatting 2023-01-02 12:50:37 +13:00
Andy Allan
b72e2ef5d7
Merge pull request #3870 from Dimitar5555/patch-1 
Added missing `</p>` tag
 2023-01-01 15:35:38 +00:00
Dimitar
3247ffd57c
Added missing </p> tag 2023-01-01 16:06:41 +02:00
Kyle Hensel
305acfe516
fix formatting of tag values with semicolon-separated URLs 2022-12-31 17:30:03 +13:00
Tom Hughes
18b642bfa9 Merge remote-tracking branch 'upstream/pull/3863' 2022-12-30 11:48:49 +00:00