]> git.openstreetmap.org Git - rails.git/log
rails.git
2 years agoBootstrap 5: Replace all form-group classes with mb-3
Andy Allan [Wed, 29 Jun 2022 16:14:10 +0000 (17:14 +0100)]
Bootstrap 5: Replace all form-group classes with mb-3

2 years agoBootstrap 5: Add form-label class to hand-crafted form labels
Andy Allan [Wed, 29 Jun 2022 16:02:43 +0000 (17:02 +0100)]
Bootstrap 5: Add form-label class to hand-crafted form labels

This is done automatically for forms created by bootstrap_form

2 years agoBootstrap 5: Override float attribute on legends
Andy Allan [Wed, 29 Jun 2022 14:29:42 +0000 (15:29 +0100)]
Bootstrap 5: Override float attribute on legends

I don't fully understand why bootstrap added this in v5, as the
discussion on the issue tracker isn't clear. But we neither want
nor need this.

2 years agoBootstrap 5: Update manual select boxes to use form-select class
Andy Allan [Wed, 29 Jun 2022 14:29:21 +0000 (15:29 +0100)]
Bootstrap 5: Update manual select boxes to use form-select class

2 years agoBootstrap 5: Remove use of form-row class
Andy Allan [Wed, 11 May 2022 14:31:50 +0000 (15:31 +0100)]
Bootstrap 5: Remove use of form-row class

This has been replaced by simple `row` class in v5. We can also use the
gx-N classes here, which tighten up the horizontal gutter sizes for
space-constrained forms.

2 years agoBootstrap 5: Enable negative margins
Andy Allan [Wed, 11 May 2022 13:26:05 +0000 (14:26 +0100)]
Bootstrap 5: Enable negative margins

2 years agoBootstrap 5: change rounded-sm to rounded-1
Andy Allan [Wed, 11 May 2022 13:16:28 +0000 (14:16 +0100)]
Bootstrap 5: change rounded-sm to rounded-1

2 years agoUpgrade to bootstrap 5
Andy Allan [Wed, 11 May 2022 13:07:09 +0000 (14:07 +0100)]
Upgrade to bootstrap 5

2 years agoSwitch actions workflows to use ruby/setup-ruby
Tom Hughes [Tue, 19 Jul 2022 17:51:29 +0000 (18:51 +0100)]
Switch actions workflows to use ruby/setup-ruby

2 years agoUpdate bundle
Tom Hughes [Tue, 19 Jul 2022 16:07:43 +0000 (17:07 +0100)]
Update bundle

2 years agoMerge remote-tracking branch 'upstream/pull/3604'
Tom Hughes [Tue, 19 Jul 2022 16:03:19 +0000 (17:03 +0100)]
Merge remote-tracking branch 'upstream/pull/3604'

2 years agoMerge remote-tracking branch 'upstream/pull/3597'
Tom Hughes [Tue, 19 Jul 2022 16:02:18 +0000 (17:02 +0100)]
Merge remote-tracking branch 'upstream/pull/3597'

2 years agoMerge remote-tracking branch 'upstream/pull/3603'
Tom Hughes [Tue, 19 Jul 2022 16:01:35 +0000 (17:01 +0100)]
Merge remote-tracking branch 'upstream/pull/3603'

2 years agoStrip leading/trailing whitespace from comma-separated trace tags
Anton Khorev [Tue, 19 Jul 2022 10:47:28 +0000 (13:47 +0300)]
Strip leading/trailing whitespace from comma-separated trace tags

2 years agoBump eslint from 8.19.0 to 8.20.0
dependabot[bot] [Mon, 18 Jul 2022 23:00:56 +0000 (23:00 +0000)]
Bump eslint from 8.19.0 to 8.20.0

Bumps [eslint](https://github.com/eslint/eslint) from 8.19.0 to 8.20.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.19.0...v8.20.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
2 years agoMerge branch 'master' into trace-description-maxlength
Anton Khorev [Mon, 18 Jul 2022 14:50:30 +0000 (17:50 +0300)]
Merge branch 'master' into trace-description-maxlength

2 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 18 Jul 2022 11:12:12 +0000 (13:12 +0200)]
Localisation updates from https://translatewiki.net.

2 years agoMerge remote-tracking branch 'upstream/pull/3602'
Tom Hughes [Sun, 17 Jul 2022 21:33:54 +0000 (22:33 +0100)]
Merge remote-tracking branch 'upstream/pull/3602'

2 years agooptimize image file size
Martin Raifer [Sun, 17 Jul 2022 19:55:27 +0000 (21:55 +0200)]
optimize image file size

2 years agoremove blue circle in top right corner, improving contrast with "x" button
Martin Raifer [Sun, 17 Jul 2022 19:47:10 +0000 (21:47 +0200)]
remove blue circle in top right corner, improving contrast with "x" button

2 years agoMerge remote-tracking branch 'upstream/pull/3601'
Tom Hughes [Sun, 17 Jul 2022 10:15:06 +0000 (11:15 +0100)]
Merge remote-tracking branch 'upstream/pull/3601'

2 years agoUpdate bundle
Tom Hughes [Sun, 17 Jul 2022 10:13:34 +0000 (11:13 +0100)]
Update bundle

2 years agoadd banner for sotm 2022
Martin Raifer [Sat, 16 Jul 2022 19:48:06 +0000 (21:48 +0200)]
add banner for sotm 2022

2 years agoSet trace description input max length
Anton Khorev [Fri, 15 Jul 2022 02:19:00 +0000 (05:19 +0300)]
Set trace description input max length

2 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 14 Jul 2022 11:12:52 +0000 (13:12 +0200)]
Localisation updates from https://translatewiki.net.

2 years agoUpdate to rails 7.0.3.1
Tom Hughes [Wed, 13 Jul 2022 15:55:26 +0000 (16:55 +0100)]
Update to rails 7.0.3.1

2 years agoUpdate bundle
Tom Hughes [Wed, 13 Jul 2022 15:52:28 +0000 (16:52 +0100)]
Update bundle

2 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 11 Jul 2022 11:13:06 +0000 (13:13 +0200)]
Localisation updates from https://translatewiki.net.

2 years agoAdd a configuration option to disable HTTP basic authentication
Tom Hughes [Fri, 8 Jul 2022 16:25:20 +0000 (17:25 +0100)]
Add a configuration option to disable HTTP basic authentication

2 years agoLog any use of basic authentication
Tom Hughes [Fri, 8 Jul 2022 16:13:02 +0000 (17:13 +0100)]
Log any use of basic authentication

2 years agoThere is no need to do setup_user_auth and authorize for the same action
Tom Hughes [Fri, 8 Jul 2022 08:48:00 +0000 (09:48 +0100)]
There is no need to do setup_user_auth and authorize for the same action

2 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 7 Jul 2022 11:13:39 +0000 (13:13 +0200)]
Localisation updates from https://translatewiki.net.

2 years agoUpdate bundle
Tom Hughes [Tue, 5 Jul 2022 17:12:20 +0000 (18:12 +0100)]
Update bundle

2 years agoMerge remote-tracking branch 'upstream/pull/3588'
Tom Hughes [Tue, 5 Jul 2022 17:06:54 +0000 (18:06 +0100)]
Merge remote-tracking branch 'upstream/pull/3588'

2 years agoBump eslint from 8.18.0 to 8.19.0
dependabot[bot] [Mon, 4 Jul 2022 23:00:42 +0000 (23:00 +0000)]
Bump eslint from 8.18.0 to 8.19.0

Bumps [eslint](https://github.com/eslint/eslint) from 8.18.0 to 8.19.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.18.0...v8.19.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
2 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 4 Jul 2022 11:14:17 +0000 (13:14 +0200)]
Localisation updates from https://translatewiki.net.

2 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 30 Jun 2022 11:13:48 +0000 (13:13 +0200)]
Localisation updates from https://translatewiki.net.

2 years agoFix new rubocop warning
Tom Hughes [Tue, 28 Jun 2022 20:11:12 +0000 (21:11 +0100)]
Fix new rubocop warning

2 years agoUpdate bundle
Tom Hughes [Tue, 28 Jun 2022 20:09:05 +0000 (21:09 +0100)]
Update bundle

2 years agoMerge remote-tracking branch 'upstream/pull/3583'
Tom Hughes [Tue, 28 Jun 2022 20:07:49 +0000 (21:07 +0100)]
Merge remote-tracking branch 'upstream/pull/3583'

2 years agoBump qs from 6.10.5 to 6.11.0
dependabot[bot] [Mon, 27 Jun 2022 23:00:54 +0000 (23:00 +0000)]
Bump qs from 6.10.5 to 6.11.0

Bumps [qs](https://github.com/ljharb/qs) from 6.10.5 to 6.11.0.
- [Release notes](https://github.com/ljharb/qs/releases)
- [Changelog](https://github.com/ljharb/qs/blob/main/CHANGELOG.md)
- [Commits](https://github.com/ljharb/qs/compare/v6.10.5...v6.11.0)

---
updated-dependencies:
- dependency-name: qs
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 27 Jun 2022 11:15:32 +0000 (13:15 +0200)]
Localisation updates from https://translatewiki.net.

2 years agoFix eslint warnings
Tom Hughes [Sun, 26 Jun 2022 18:56:27 +0000 (19:56 +0100)]
Fix eslint warnings

2 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 23 Jun 2022 11:16:25 +0000 (13:16 +0200)]
Localisation updates from https://translatewiki.net.

2 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 20 Jun 2022 11:11:59 +0000 (13:11 +0200)]
Localisation updates from https://translatewiki.net.

2 years agoUpdate bundle
Tom Hughes [Sun, 19 Jun 2022 11:53:46 +0000 (12:53 +0100)]
Update bundle

2 years agoRestore intended title for GPS trace view
Tom Hughes [Sun, 19 Jun 2022 11:52:47 +0000 (12:52 +0100)]
Restore intended title for GPS trace view

2 years agoMerge remote-tracking branch 'upstream/pull/3569'
Tom Hughes [Sun, 19 Jun 2022 11:49:38 +0000 (12:49 +0100)]
Merge remote-tracking branch 'upstream/pull/3569'

2 years agoMerge remote-tracking branch 'upstream/pull/3574'
Tom Hughes [Sun, 19 Jun 2022 11:38:49 +0000 (12:38 +0100)]
Merge remote-tracking branch 'upstream/pull/3574'

2 years agoMerge remote-tracking branch 'upstream/pull/3577'
Tom Hughes [Sun, 19 Jun 2022 11:38:08 +0000 (12:38 +0100)]
Merge remote-tracking branch 'upstream/pull/3577'

2 years agoMerge remote-tracking branch 'upstream/pull/3571'
Tom Hughes [Sun, 19 Jun 2022 11:33:52 +0000 (12:33 +0100)]
Merge remote-tracking branch 'upstream/pull/3571'

2 years agoMerge remote-tracking branch 'upstream/pull/3576'
Tom Hughes [Sun, 19 Jun 2022 11:32:44 +0000 (12:32 +0100)]
Merge remote-tracking branch 'upstream/pull/3576'

2 years agoMerge remote-tracking branch 'upstream/pull/3573'
Tom Hughes [Sun, 19 Jun 2022 11:32:22 +0000 (12:32 +0100)]
Merge remote-tracking branch 'upstream/pull/3573'

2 years agoFix map edit controls min-zoom behaviour
faebebin [Sun, 19 Jun 2022 06:15:37 +0000 (08:15 +0200)]
Fix map edit controls min-zoom behaviour

The map dropdown and tooltip of the map edit controls should
behave similar when zooming in and out.
This is achieved by disabling the button-group and the buttons.

2 years agoBump eslint from 8.17.0 to 8.18.0
dependabot[bot] [Fri, 17 Jun 2022 23:01:04 +0000 (23:01 +0000)]
Bump eslint from 8.17.0 to 8.18.0

Bumps [eslint](https://github.com/eslint/eslint) from 8.17.0 to 8.18.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.17.0...v8.18.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
2 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 16 Jun 2022 11:16:29 +0000 (13:16 +0200)]
Localisation updates from https://translatewiki.net.

2 years agoUpdate to iD v2.21.1
Martin Raifer [Wed, 15 Jun 2022 22:55:25 +0000 (00:55 +0200)]
Update to iD v2.21.1

2 years agoFix small error in _header.html.erb
Sky [Wed, 15 Jun 2022 21:14:34 +0000 (00:14 +0300)]
Fix small error in _header.html.erb

2 years agoonly parse hashParams if there is a hash
Martin Raifer [Tue, 14 Jun 2022 18:41:10 +0000 (20:41 +0200)]
only parse hashParams if there is a hash

Presumably this was an oversight in the original implementation, as `OSM.params` falls back to the page's `query` string if the function's parameter (here: the page's `hash`) is an empty string.

This fixes some inconsistent behaviour of the website. In the example below, the first URL sets the `background` to `none` while in the second example it doesn't.

* https://www.openstreetmap.org/edit.html?background=none
* https://www.openstreetmap.org/edit.html?background=none#map=…

2 years agoFix new rubocop warnings
Tom Hughes [Tue, 14 Jun 2022 18:04:39 +0000 (19:04 +0100)]
Fix new rubocop warnings

2 years agoUpdate bundle
Tom Hughes [Tue, 14 Jun 2022 18:02:40 +0000 (19:02 +0100)]
Update bundle

2 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 13 Jun 2022 11:16:18 +0000 (13:16 +0200)]
Localisation updates from https://translatewiki.net.

2 years agoRemove duplicate keys from en locale data
Anton Khorev [Sat, 11 Jun 2022 00:26:39 +0000 (03:26 +0300)]
Remove duplicate keys from en locale data

2 years agoMerge remote-tracking branch 'upstream/pull/3568'
Tom Hughes [Fri, 10 Jun 2022 15:46:24 +0000 (16:46 +0100)]
Merge remote-tracking branch 'upstream/pull/3568'

2 years agoMargins for 'comment from' / 'reported by' lines on issues page
Anton Khorev [Fri, 10 Jun 2022 14:22:15 +0000 (17:22 +0300)]
Margins for 'comment from' / 'reported by' lines on issues page

2 years agoAdd validation for relation member roles
Tom Hughes [Thu, 9 Jun 2022 18:11:59 +0000 (19:11 +0100)]
Add validation for relation member roles

Fixes #3563

2 years agoMerge remote-tracking branch 'upstream/pull/3566'
Tom Hughes [Thu, 9 Jun 2022 18:20:49 +0000 (19:20 +0100)]
Merge remote-tracking branch 'upstream/pull/3566'

2 years agoWrap issue comment rich text in div
Anton Khorev [Thu, 9 Jun 2022 13:37:20 +0000 (16:37 +0300)]
Wrap issue comment rich text in div

2 years agoWrap issue report rich text in div
Anton Khorev [Thu, 9 Jun 2022 00:46:12 +0000 (03:46 +0300)]
Wrap issue report rich text in div

2 years agoMerge remote-tracking branch 'upstream/pull/3565'
Tom Hughes [Thu, 9 Jun 2022 18:18:53 +0000 (19:18 +0100)]
Merge remote-tracking branch 'upstream/pull/3565'

2 years agoUpdate copyright notice
Dermot McNally [Thu, 12 May 2022 15:19:42 +0000 (16:19 +0100)]
Update copyright notice

Updated in accordance with LWG decision to better reflect updated
guidance, including providing a link to the Attribution Guidelines.

Closes #3565

2 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 9 Jun 2022 11:15:14 +0000 (13:15 +0200)]
Localisation updates from https://translatewiki.net.

2 years agoMerge remote-tracking branch 'upstream/pull/3564'
Tom Hughes [Wed, 8 Jun 2022 12:29:21 +0000 (13:29 +0100)]
Merge remote-tracking branch 'upstream/pull/3564'

2 years agoRename id_oauth_application to id_application in settings
Tom Hughes [Wed, 8 Jun 2022 12:28:07 +0000 (13:28 +0100)]
Rename id_oauth_application to id_application in settings

2 years agoBump qs from 6.10.3 to 6.10.5
dependabot[bot] [Mon, 6 Jun 2022 23:00:42 +0000 (23:00 +0000)]
Bump qs from 6.10.3 to 6.10.5

Bumps [qs](https://github.com/ljharb/qs) from 6.10.3 to 6.10.5.
- [Release notes](https://github.com/ljharb/qs/releases)
- [Changelog](https://github.com/ljharb/qs/blob/main/CHANGELOG.md)
- [Commits](https://github.com/ljharb/qs/compare/v6.10.3...v6.10.5)

---
updated-dependencies:
- dependency-name: qs
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2 years agoMerge remote-tracking branch 'upstream/pull/3561'
Tom Hughes [Mon, 6 Jun 2022 17:32:43 +0000 (18:32 +0100)]
Merge remote-tracking branch 'upstream/pull/3561'

2 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 6 Jun 2022 11:16:18 +0000 (13:16 +0200)]
Localisation updates from https://translatewiki.net.

2 years agoUpdate bundle
Tom Hughes [Sun, 5 Jun 2022 18:47:56 +0000 (19:47 +0100)]
Update bundle

2 years agoMerge remote-tracking branch 'upstream/pull/3557'
Tom Hughes [Sun, 5 Jun 2022 18:44:55 +0000 (19:44 +0100)]
Merge remote-tracking branch 'upstream/pull/3557'

2 years agoMerge remote-tracking branch 'upstream/pull/3562'
Tom Hughes [Sun, 5 Jun 2022 18:44:04 +0000 (19:44 +0100)]
Merge remote-tracking branch 'upstream/pull/3562'

2 years agoBump eslint from 8.16.0 to 8.17.0
dependabot[bot] [Fri, 3 Jun 2022 23:00:53 +0000 (23:00 +0000)]
Bump eslint from 8.16.0 to 8.17.0

Bumps [eslint](https://github.com/eslint/eslint) from 8.16.0 to 8.17.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.16.0...v8.17.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
2 years agoUpdate to iD v2.21.0
Martin Raifer [Fri, 3 Jun 2022 13:14:53 +0000 (15:14 +0200)]
Update to iD v2.21.0

major changes in this release:
* dropped support for Internet Explorer 11
* switched authentication to OAuth 2

for further changes please refer to https://github.com/openstreetmap/iD/blob/release/CHANGELOG.md#2210

2 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 2 Jun 2022 11:14:47 +0000 (13:14 +0200)]
Localisation updates from https://translatewiki.net.

2 years agoFix highway crossing in nominatim description terms
Sarah Hoffmann [Mon, 30 May 2022 12:57:28 +0000 (14:57 +0200)]
Fix highway crossing in nominatim description terms

The entry is syntactically wrong. The description terms expect a list of values for each key.

Given that 'crossing' is not a main tag, the key shouldn't be featured in the list at all. I've added highway=crossing instead.

2 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 30 May 2022 11:13:17 +0000 (13:13 +0200)]
Localisation updates from https://translatewiki.net.

2 years agoUpdate bundle
Tom Hughes [Sun, 29 May 2022 09:57:39 +0000 (10:57 +0100)]
Update bundle

2 years agoSet a timeout on HTTP requests made by the server
Tom Hughes [Sun, 29 May 2022 09:54:39 +0000 (10:54 +0100)]
Set a timeout on HTTP requests made by the server

2 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 26 May 2022 11:14:22 +0000 (13:14 +0200)]
Localisation updates from https://translatewiki.net.

2 years agoUpdate bundle
Tom Hughes [Wed, 25 May 2022 17:02:58 +0000 (18:02 +0100)]
Update bundle

2 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 23 May 2022 11:13:26 +0000 (13:13 +0200)]
Localisation updates from https://translatewiki.net.

2 years agoMerge remote-tracking branch 'upstream/pull/3554'
Tom Hughes [Sun, 22 May 2022 17:32:22 +0000 (18:32 +0100)]
Merge remote-tracking branch 'upstream/pull/3554'

2 years agoMerge remote-tracking branch 'upstream/pull/3556'
Tom Hughes [Sun, 22 May 2022 17:31:39 +0000 (18:31 +0100)]
Merge remote-tracking branch 'upstream/pull/3556'

2 years agoBump eslint from 8.15.0 to 8.16.0
dependabot[bot] [Fri, 20 May 2022 23:00:43 +0000 (23:00 +0000)]
Bump eslint from 8.15.0 to 8.16.0

Bumps [eslint](https://github.com/eslint/eslint) from 8.15.0 to 8.16.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.15.0...v8.16.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
2 years agoDrop AOL and Wordpress login links
Tom Hughes [Fri, 20 May 2022 17:23:51 +0000 (18:23 +0100)]
Drop AOL and Wordpress login links

Fixes #3555

2 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 19 May 2022 11:25:56 +0000 (13:25 +0200)]
Localisation updates from https://translatewiki.net.

2 years agoAdd "garden" to map key
Frederik Ramm [Wed, 18 May 2022 13:46:24 +0000 (15:46 +0200)]
Add "garden" to map key

Make map key list "common, meadow, garden" instead of just "common, meadow".

This is in response to a DWG ticket ( #2022051810000111) where a resident complained that their private garden was "listed as 'common, meadow' " in OSM because they consulted the map key. Listing "garden" along these should clear up that misunderstanding.

2 years agoFix new rubocop warnings
Tom Hughes [Mon, 16 May 2022 18:16:53 +0000 (19:16 +0100)]
Fix new rubocop warnings

2 years agoUpdate bundle
Tom Hughes [Mon, 16 May 2022 18:14:05 +0000 (19:14 +0100)]
Update bundle

2 years agoMerge remote-tracking branch 'upstream/pull/3549'
Tom Hughes [Mon, 16 May 2022 18:13:28 +0000 (19:13 +0100)]
Merge remote-tracking branch 'upstream/pull/3549'

2 years agoMerge remote-tracking branch 'upstream/pull/3548'
Tom Hughes [Mon, 16 May 2022 18:08:16 +0000 (19:08 +0100)]
Merge remote-tracking branch 'upstream/pull/3548'