]>
git.openstreetmap.org Git - rails.git/log
Martin Raifer [Fri, 3 Mar 2023 15:53:00 +0000 (16:53 +0100)]
Update to iD v2.25.1
translatewiki.net [Thu, 2 Mar 2023 12:17:49 +0000 (13:17 +0100)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Tue, 28 Feb 2023 15:20:33 +0000 (15:20 +0000)]
Fix new rubocop warnings
Tom Hughes [Tue, 28 Feb 2023 15:19:07 +0000 (15:19 +0000)]
Update bundle
Tom Hughes [Tue, 28 Feb 2023 15:16:49 +0000 (15:16 +0000)]
Merge remote-tracking branch 'upstream/pull/3950'
Tom Hughes [Tue, 28 Feb 2023 15:16:43 +0000 (15:16 +0000)]
Merge remote-tracking branch 'upstream/pull/3949'
dependabot[bot] [Mon, 27 Feb 2023 23:57:10 +0000 (23:57 +0000)]
Bump coverallsapp/github-action from 1.2.1 to 1.2.2
Bumps [coverallsapp/github-action](https://github.com/coverallsapp/github-action) from 1.2.1 to 1.2.2.
- [Release notes](https://github.com/coverallsapp/github-action/releases)
- [Commits](https://github.com/coverallsapp/github-action/compare/v1.2.1...v1.2.2)
---
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>
dependabot[bot] [Mon, 27 Feb 2023 23:56:39 +0000 (23:56 +0000)]
Bump eslint from 8.34.0 to 8.35.0
Bumps [eslint](https://github.com/eslint/eslint) from 8.34.0 to 8.35.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.34.0...v8.35.0)
---
updated-dependencies:
- dependency-name: eslint
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Tom Hughes [Mon, 27 Feb 2023 12:22:17 +0000 (12:22 +0000)]
Bump coverallsapp/github-action to 1.2.1
translatewiki.net [Mon, 27 Feb 2023 12:12:47 +0000 (13:12 +0100)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Mon, 27 Feb 2023 12:07:42 +0000 (12:07 +0000)]
Merge remote-tracking branch 'upstream/pull/3941'
dependabot[bot] [Fri, 24 Feb 2023 23:56:58 +0000 (23:56 +0000)]
Bump coverallsapp/github-action from 1.1.3 to 1.2.0
Bumps [coverallsapp/github-action](https://github.com/coverallsapp/github-action) from 1.1.3 to 1.2.0.
- [Release notes](https://github.com/coverallsapp/github-action/releases)
- [Commits](https://github.com/coverallsapp/github-action/compare/1.1.3...v1.2.0)
---
updated-dependencies:
- dependency-name: coverallsapp/github-action
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
translatewiki.net [Thu, 23 Feb 2023 12:14:12 +0000 (13:14 +0100)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Wed, 22 Feb 2023 18:17:51 +0000 (18:17 +0000)]
Merge remote-tracking branch 'upstream/pull/3936'
Andy Allan [Wed, 22 Feb 2023 15:26:20 +0000 (15:26 +0000)]
Merge pull request #3935 from Hufkratzer/rename-horse-riding-label
Change label for leisure=horse_riding in en.yml
Andy Allan [Wed, 15 Feb 2023 16:47:21 +0000 (16:47 +0000)]
Rework about page to avoid html in the translations
Andy Allan [Wed, 15 Feb 2023 16:47:02 +0000 (16:47 +0000)]
Remove html from translations for the welcome page
This also refactors the "any questions" section, which is shared with the fixthemap page.
Tom Hughes [Wed, 22 Feb 2023 10:04:31 +0000 (10:04 +0000)]
Merge remote-tracking branch 'upstream/pull/3937'
Andy Allan [Wed, 22 Feb 2023 09:46:48 +0000 (09:46 +0000)]
Ensure kramdown table alignment styles are converted to bootstrap classes
Adds tests for commit
f42a7a2d8dd507a3746a1e2de91deda9614cf807
Andy Allan [Wed, 8 Feb 2023 14:33:46 +0000 (14:33 +0000)]
Refactor trace guidance to avoid raw html in translations
Also rearrange to avoid multiple sentences in a heading.
Andy Allan [Wed, 8 Feb 2023 14:11:45 +0000 (14:11 +0000)]
Refactor translation to avoid raw html tags
Andy Allan [Wed, 8 Feb 2023 14:01:41 +0000 (14:01 +0000)]
Move public editing content into its own partial
This makes the editing page easier to read, and simplifies the i18n
in the public editing section.
Andy Allan [Wed, 8 Feb 2023 13:55:33 +0000 (13:55 +0000)]
Refactor public editing note to avoid raw html in the translations
Tom Hughes [Tue, 21 Feb 2023 18:09:58 +0000 (18:09 +0000)]
Update bundle
translatewiki.net [Mon, 20 Feb 2023 12:14:01 +0000 (13:14 +0100)]
Localisation updates from https://translatewiki.net.
Hufkratzer [Sat, 18 Feb 2023 21:16:19 +0000 (22:16 +0100)]
Change label for leisure=horse_riding in en.yml
Change "Horse Riding" to "Horse Riding Centre"
translatewiki.net [Thu, 16 Feb 2023 12:14:07 +0000 (13:14 +0100)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Tue, 14 Feb 2023 18:08:45 +0000 (18:08 +0000)]
Update bundle
translatewiki.net [Mon, 13 Feb 2023 12:12:35 +0000 (13:12 +0100)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Sun, 12 Feb 2023 18:25:36 +0000 (18:25 +0000)]
Merge remote-tracking branch 'upstream/pull/3930'
dependabot[bot] [Fri, 10 Feb 2023 23:57:11 +0000 (23:57 +0000)]
Bump eslint from 8.33.0 to 8.34.0
Bumps [eslint](https://github.com/eslint/eslint) from 8.33.0 to 8.34.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.33.0...v8.34.0)
---
updated-dependencies:
- dependency-name: eslint
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Tom Hughes [Thu, 9 Feb 2023 17:48:55 +0000 (17:48 +0000)]
Merge remote-tracking branch 'upstream/pull/3924'
translatewiki.net [Thu, 9 Feb 2023 12:13:40 +0000 (13:13 +0100)]
Localisation updates from https://translatewiki.net.
Martin Raifer [Thu, 9 Feb 2023 10:15:22 +0000 (11:15 +0100)]
Update to iD v2.24.2
Andy Allan [Wed, 8 Feb 2023 17:30:25 +0000 (17:30 +0000)]
Merge pull request #3691 from AntonKhorev/wikipedia-secondary-links
Link prefixed wikipedia tags
Tom Hughes [Tue, 7 Feb 2023 18:22:50 +0000 (18:22 +0000)]
Update bundle
translatewiki.net [Mon, 6 Feb 2023 12:15:08 +0000 (13:15 +0100)]
Localisation updates from https://translatewiki.net.
translatewiki.net [Thu, 2 Feb 2023 12:14:55 +0000 (13:14 +0100)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Wed, 1 Feb 2023 19:10:22 +0000 (19:10 +0000)]
Merge remote-tracking branch 'upstream/pull/3911'
Tom Hughes [Wed, 1 Feb 2023 19:07:09 +0000 (19:07 +0000)]
Merge remote-tracking branch 'upstream/pull/3915'
Andy Allan [Wed, 1 Feb 2023 18:57:16 +0000 (18:57 +0000)]
Avoid converting conditional restriction tags into emails
Fixes #3884
Andy Allan [Wed, 1 Feb 2023 17:01:32 +0000 (17:01 +0000)]
Refactor to use submit_tag helper
This is more readable than interpolating into element attributes
Andy Allan [Thu, 26 Jan 2023 11:36:09 +0000 (11:36 +0000)]
Refactor translation strings for notes
These aren't used by any javascript code, so don't need to be in
the `javascripts` key.
Andy Allan [Wed, 1 Feb 2023 15:30:57 +0000 (15:30 +0000)]
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.
Andy Allan [Wed, 25 Jan 2023 21:46:35 +0000 (21:46 +0000)]
Move browse#note to notes#show
This allows a more resourceful routing approach.
Andy Allan [Wed, 25 Jan 2023 19:22:10 +0000 (19:22 +0000)]
Move browse#new_note to notes#new
This allows a more resourceful routing approach.
Tom Hughes [Tue, 31 Jan 2023 18:09:09 +0000 (18:09 +0000)]
Update bundle
Tom Hughes [Tue, 31 Jan 2023 18:07:24 +0000 (18:07 +0000)]
Merge remote-tracking branch 'upstream/pull/3913'
dependabot[bot] [Mon, 30 Jan 2023 23:00:40 +0000 (23:00 +0000)]
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>
translatewiki.net [Mon, 30 Jan 2023 12:13:12 +0000 (13:13 +0100)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Thu, 26 Jan 2023 18:06:57 +0000 (18:06 +0000)]
Update to rails 7.0.4.2
translatewiki.net [Thu, 26 Jan 2023 12:17:10 +0000 (13:17 +0100)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Thu, 26 Jan 2023 09:04:37 +0000 (09:04 +0000)]
Sort issues in descending order of their last update
Andy Allan [Wed, 25 Jan 2023 19:01:57 +0000 (19:01 +0000)]
Rename api_notes resource to avoid conflict with non-API resource
This allows using e.g. note_path for notes#show in the future.
Tom Hughes [Wed, 25 Jan 2023 12:15:41 +0000 (12:15 +0000)]
Merge remote-tracking branch 'upstream/pull/3908'
Martin Raifer [Wed, 25 Jan 2023 11:59:54 +0000 (12:59 +0100)]
Update to iD v2.24.1
Tom Hughes [Tue, 24 Jan 2023 18:28:27 +0000 (18:28 +0000)]
Merge remote-tracking branch 'upstream/pull/3905'
Tom Hughes [Tue, 24 Jan 2023 18:19:30 +0000 (18:19 +0000)]
Fix new rubocop warnings
Tom Hughes [Tue, 24 Jan 2023 18:13:02 +0000 (18:13 +0000)]
Update bundle
translatewiki.net [Mon, 23 Jan 2023 12:13:19 +0000 (13:13 +0100)]
Localisation updates from https://translatewiki.net.
Martin Raifer [Thu, 19 Jan 2023 15:04:52 +0000 (16:04 +0100)]
Update to iD v2.24.0
translatewiki.net [Thu, 19 Jan 2023 12:16:50 +0000 (13:16 +0100)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Tue, 17 Jan 2023 19:29:30 +0000 (19:29 +0000)]
Update to rails 7.0.4.1
Tom Hughes [Tue, 17 Jan 2023 18:38:03 +0000 (18:38 +0000)]
Merge remote-tracking branch 'upstream/pull/3898'
Tom Hughes [Tue, 17 Jan 2023 18:37:43 +0000 (18:37 +0000)]
Update bundle
dependabot[bot] [Mon, 16 Jan 2023 23:00:52 +0000 (23:00 +0000)]
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>
translatewiki.net [Mon, 16 Jan 2023 12:13:25 +0000 (13:13 +0100)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Sat, 14 Jan 2023 15:12:23 +0000 (15:12 +0000)]
Update tests for changes in osm-community-index
Tom Hughes [Sat, 14 Jan 2023 14:49:18 +0000 (14:49 +0000)]
Merge remote-tracking branch 'upstream/pull/3893'
dependabot[bot] [Fri, 13 Jan 2023 23:00:43 +0000 (23:00 +0000)]
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>
Tom Hughes [Fri, 13 Jan 2023 09:29:04 +0000 (09:29 +0000)]
Drop version constraint on mail and update bundle
translatewiki.net [Thu, 12 Jan 2023 12:15:28 +0000 (13:15 +0100)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Wed, 11 Jan 2023 18:42:16 +0000 (18:42 +0000)]
Merge remote-tracking branch 'upstream/pull/3891'
Tom Hughes [Wed, 11 Jan 2023 15:38:36 +0000 (15:38 +0000)]
Merge remote-tracking branch 'upstream/pull/3890'
Andy Allan [Wed, 11 Jan 2023 15:36:40 +0000 (15:36 +0000)]
Merge pull request #3878 from tomhughes/issues-offline
Add database checks to issue and report controllers
Andy Allan [Wed, 11 Jan 2023 15:28:59 +0000 (15:28 +0000)]
Move more api-related helper methods to ApiController
This prevents them from being inadvertently used in non-API controllers
Andy Allan [Wed, 11 Jan 2023 15:28:02 +0000 (15:28 +0000)]
Use web_timeout for notes controller
This controller doesn't handle any API methods, and so the api call
error handling isn't appropriate.
Andy Allan [Wed, 11 Jan 2023 11:26:35 +0000 (11:26 +0000)]
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
Tom Hughes [Sat, 7 Jan 2023 15:20:22 +0000 (15:20 +0000)]
Add database checks to issue and report controllers
Fixes #3875
Tom Hughes [Wed, 11 Jan 2023 10:57:04 +0000 (10:57 +0000)]
Merge remote-tracking branch 'upstream/pull/3886'
Andy Allan [Wed, 11 Jan 2023 10:47:19 +0000 (10:47 +0000)]
Merge pull request #3889 from tomhughes/distances
Make distances in directions translatable
Tom Hughes [Tue, 10 Jan 2023 20:58:10 +0000 (20:58 +0000)]
Make distances in directions translatable
Fixes #3888
Tom Hughes [Tue, 10 Jan 2023 18:40:52 +0000 (18:40 +0000)]
Update bundle
Richard Fairhurst [Mon, 9 Jan 2023 21:23:48 +0000 (21:23 +0000)]
Remove Geonames and geocoder.ca
Tom Hughes [Sat, 7 Jan 2023 15:39:27 +0000 (15:39 +0000)]
Make error pages translatable
Fixes #3877
Andy Allan [Mon, 9 Jan 2023 19:07:04 +0000 (19:07 +0000)]
Merge pull request #3885 from tomhughes/diary-new
Fix some translation issues for diary_entry#new
Tom Hughes [Mon, 9 Jan 2023 19:02:11 +0000 (19:02 +0000)]
Fix some translation issues for diary_entry#new
Fixes #3880
translatewiki.net [Mon, 9 Jan 2023 12:28:11 +0000 (13:28 +0100)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Mon, 9 Jan 2023 11:10:11 +0000 (11:10 +0000)]
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.
Andy Allan [Fri, 6 Jan 2023 13:10:28 +0000 (13:10 +0000)]
Merge pull request #3874 from tomhughes/offline
Allow models to load when the database is offline
Tom Hughes [Thu, 5 Jan 2023 19:51:01 +0000 (19:51 +0000)]
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
translatewiki.net [Thu, 5 Jan 2023 12:20:08 +0000 (13:20 +0100)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Wed, 4 Jan 2023 15:41:54 +0000 (15:41 +0000)]
Escape each portion of a semicolon seprated value individually
Fixes #3872
Tom Hughes [Tue, 3 Jan 2023 19:20:31 +0000 (19:20 +0000)]
Merge remote-tracking branch 'upstream/pull/3868'
Tom Hughes [Tue, 3 Jan 2023 19:13:14 +0000 (19:13 +0000)]
Update rubocop todo
Tom Hughes [Tue, 3 Jan 2023 19:08:51 +0000 (19:08 +0000)]
Update bundle
Tom Hughes [Tue, 3 Jan 2023 19:07:34 +0000 (19:07 +0000)]
Merge remote-tracking branch 'upstream/pull/3871'
dependabot[bot] [Mon, 2 Jan 2023 23:00:37 +0000 (23:00 +0000)]
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>
translatewiki.net [Mon, 2 Jan 2023 12:14:32 +0000 (13:14 +0100)]
Localisation updates from https://translatewiki.net.
Kyle Hensel [Sun, 1 Jan 2023 23:50:37 +0000 (12:50 +1300)]
fix formatting