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

12437 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Tom Hughes
6b2a5db1fa Add an entry for translation issues to the issue template 2022-12-30 10:56:15 +00:00
mmd-osm
f40e1911fe update-wiki-pages: process KeyPrefixDescription template 2022-12-30 08:48:57 +01:00
mmd-osm
b6869e2a43 Update wiki_pages.yml 2022-12-30 08:35:44 +01:00
Tom Hughes
6033359bd0 Preserve rel=me on links in rich text 
Fixes #3859
 2022-12-29 18:02:23 +00:00
Tom Hughes
600ed78b04 Use CGI.escape for ruby 2.7 compatibility 2022-12-29 17:45:29 +00:00
Tom Hughes
27e9965dd2 Require integer IDs for diary_entries#show 
Fixes #3865
 2022-12-29 17:14:05 +00:00
Tom Hughes
df4f0b93d7 Update bundle 2022-12-29 16:53:25 +00:00
Tom Hughes
e5406c6836 Make test names clearer 2022-12-29 16:52:19 +00:00
Tom Hughes
07fe77b4fc Merge remote-tracking branch 'upstream/pull/3862' 2022-12-29 16:51:53 +00:00
Andy Allan
f99e028e42
Merge pull request #3864 from ZhengLin-Li/patch-1 
Change Save to Comment
 2022-12-29 10:35:07 +00:00
ZhengLin Li
381b83e08c
Change Save to Comment 
For comment submit buttons we currently have:

"Comment" (Changeset Comments)
"Add Comment" (Issue Comments)
"Comment" (Note Comments)
"Save" (Diary Comments)

So, to make them consistent, I'd propose to change "Save" to "Comment"
 2022-12-29 02:03:02 -08:00
Andy Allan
0925035a3e Add tests to ensure tokens are revoked 
This ensures that tokens are revoked or invalidated when a user
is soft destroyed.
 2022-12-28 15:25:57 +00:00
mmd-osm
0b76b22a2b update-wiki-pages: adding retry and timeout 2022-12-28 16:16:49 +01:00
Andy Allan
e69716ca05
Merge pull request #3860 from gravitystorm/yaml_quoting 
Quote ruby versions in yaml
 2022-12-28 14:05:11 +00:00
Andy Allan
61e0fa5f63 Quote ruby versions in yaml 
Without quotes these are parsed as numbers, which can cause subtle
problems. For example, "ruby: 3.0" is interpreted by the
ruby/setup-rubyaction as "ruby: 3", meaning 3.x instead of the
intended 3.0.x
 2022-12-28 10:04:32 +00:00
translatewiki.net
88b4555472 Localisation updates from https://translatewiki.net. 2022-12-26 13:16:29 +01:00
Tom Hughes
9cb7a7b36b Don't allow any abilities for inactive users 2022-12-23 16:37:33 +00:00
Tom Hughes
445e8162e9 Revoke authentication tokens when a user is deleted 2022-12-23 16:24:10 +00:00