diff --git a/.github/workflows/nighlty-ci-release-2.yml b/.github/workflows/nighlty-ci-release-2.yml index 4a343d1ea..623aec414 100644 --- a/.github/workflows/nighlty-ci-release-2.yml +++ b/.github/workflows/nighlty-ci-release-2.yml @@ -1,7 +1,7 @@ # SPDX-FileCopyrightText: 2026 Jankari Tech Pvt. Ltd. # SPDX-License-Identifier: AGPL-3.0-or-later -name: Nightly CI (Release 2.11) +name: Nightly CI (Release 2.12) # workflow can be scheduled ONLY from DEFAULT branch # > This event will only trigger a workflow run if the workflow file is on the default branch. @@ -15,7 +15,7 @@ jobs: uses: ./.github/workflows/nightly-shared.yaml secrets: inherit with: - branch: release/2.11 + branch: release/2.12 nextcloud_versions: '31 32' php_versions: '8.2 8.3 8.4' app_upgrade_nc_versions: '31 32' diff --git a/.github/workflows/nighty-ci-release-3.yml b/.github/workflows/nighty-ci-release-3.yml index 9bb73f10e..ec7f6123e 100644 --- a/.github/workflows/nighty-ci-release-3.yml +++ b/.github/workflows/nighty-ci-release-3.yml @@ -1,7 +1,7 @@ # SPDX-FileCopyrightText: 2026 Jankari Tech Pvt. Ltd. # SPDX-License-Identifier: AGPL-3.0-or-later -name: Nightly CI (Release 3.1) +name: Nightly CI (Release 3.2) # workflow can be scheduled ONLY from DEFAULT branch # > This event will only trigger a workflow run if the workflow file is on the default branch. @@ -15,7 +15,7 @@ jobs: uses: ./.github/workflows/nightly-shared.yaml secrets: inherit with: - branch: release/3.1 + branch: release/3.2 nextcloud_versions: '33 34' php_versions: '8.3 8.4 8.5' app_upgrade_nc_versions: '33 34' diff --git a/.tx/backport b/.tx/backport index bc2df9dc5..0cce2ca91 100644 --- a/.tx/backport +++ b/.tx/backport @@ -1,3 +1,2 @@ -release/2.11 release/2.12 -release/3.1 +release/3.2 diff --git a/CHANGELOG.md b/CHANGELOG.md index 6281eb052..8457ee9c0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,6 +15,17 @@ and this project adheres to [Semantic Versioning](http://semver.org/). ### Added +### Fixed + +### Changed +- Make OAuth2 Client class usage compatible with older Nextcloud versions [#1148](https://github.com/nextcloud/integration_openproject/pull/1148) + +### Removed + +## 3.2.0 - 2026-09-10 + +### Added + - Show new OpenProject work package display ID if available [#1071](https://github.com/nextcloud/integration_openproject/pull/1071) - Improve integration setup error messages [#1118](https://github.com/nextcloud/integration_openproject/pull/1118) @@ -30,7 +41,6 @@ and this project adheres to [Semantic Versioning](http://semver.org/). - Update npm dependencies [#1123](https://github.com/nextcloud/integration_openproject/pull/1123) - Migrate to Vue 3 and @nextcloud/vue v9 [#1152](https://github.com/nextcloud/integration_openproject/pull/1152) -- Make OAuth2 Client class usage compatible with older Nextcloud versions [#1148](https://github.com/nextcloud/integration_openproject/pull/1148) ### Removed diff --git a/appinfo/info.xml b/appinfo/info.xml index cb967de4a..dfcc3a29e 100644 --- a/appinfo/info.xml +++ b/appinfo/info.xml @@ -33,7 +33,7 @@ On the OpenProject end, users are able to: For more information on how to set up and use the OpenProject application, please refer to [integration setup guide](https://www.openproject.org/docs/system-admin-guide/integrations/nextcloud/) for administrators and [the user guide](https://www.openproject.org/docs/user-guide/nextcloud-integration/). ]]> - 3.2.0-dev + 3.3.0-dev agpl Julien Veyssier OpenProject diff --git a/docs/release.md b/docs/release.md index ffec1745d..82377260d 100644 --- a/docs/release.md +++ b/docs/release.md @@ -19,10 +19,11 @@ On the release branch: 3. Update the version in: - [appinfo/info.xml](../appinfo/info.xml) - [package.json](../package.json) + - `package-lock.json` (use `npm install` command) 4. Update the minimum and maximum nexcloud version support in: - [appinfo/info.xml](../appinfo/info.xml) - [shared workflow CI](../.github/workflows/shared_workflow.yml) - - [nighlty ci release branch](../.github/workflows/nighlty-ci-release-branch.yml) + - [nightly ci release branch](../.github/workflows/nighlty-ci-release-branch.yml) - [release CI](../.github/workflows/release.yml) 5. Add the new release branch in `.tx/backport` to allow transifex commits. 6. Update `CHANGELOG.md` with the changes and the version to be released. @@ -37,11 +38,12 @@ On the current release branch: 1. Update the patch version in: - [appinfo/info.xml](../appinfo/info.xml) - [package.json](../package.json) + - `package-lock.json` (use `npm install` command) 2. Update `CHANGELOG.md` with the changes and the version to be released. 3. Update the minimum and maximum nexcloud version support in: - [appinfo/info.xml](../appinfo/info.xml) - [shared workflow CI](../.github/workflows/shared_workflow.yml) - - [nighlty ci release branch](../.github/workflows/nighlty-ci-release-branch.yml) + - [nightly ci release branch](../.github/workflows/nighlty-ci-release-branch.yml) - [release CI](../.github/workflows/release.yml) 4. Perform confirmatory testing (Changelogs) - by the OpenProject team. 5. Perform [smoke testing](testing/smoke_testing.md) - by the OpenProject team. diff --git a/package-lock.json b/package-lock.json index 9eb6508c2..2717a66e4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "integration_openproject", - "version": "3.2.0-dev", + "version": "3.3.0-dev", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "integration_openproject", - "version": "3.2.0-dev", + "version": "3.3.0-dev", "license": "AGPL-3.0-or-later", "dependencies": { "@nextcloud/auth": "^2.6.0", @@ -3488,6 +3488,7 @@ }, "node_modules/@parcel/watcher": { "version": "2.6.0", + "dev": true, "hasInstallScript": true, "license": "MIT", "optional": true, @@ -3525,6 +3526,7 @@ "cpu": [ "x64" ], + "dev": true, "license": "MIT", "optional": true, "os": [ @@ -3544,6 +3546,7 @@ "cpu": [ "x64" ], + "dev": true, "license": "MIT", "optional": true, "os": [ @@ -3560,6 +3563,7 @@ }, "node_modules/@parcel/watcher/node_modules/picomatch": { "version": "4.0.5", + "dev": true, "license": "MIT", "optional": true, "peer": true, @@ -3752,6 +3756,7 @@ "cpu": [ "x64" ], + "dev": true, "license": "MIT", "optional": true, "os": [ @@ -3765,6 +3770,7 @@ "cpu": [ "x64" ], + "dev": true, "license": "MIT", "optional": true, "os": [ @@ -6927,6 +6933,7 @@ }, "node_modules/detect-libc": { "version": "2.1.2", + "dev": true, "license": "Apache-2.0", "optional": true, "peer": true, @@ -9182,7 +9189,7 @@ }, "node_modules/immutable": { "version": "5.1.9", - "devOptional": true, + "dev": true, "license": "MIT", "peer": true }, @@ -9418,7 +9425,7 @@ }, "node_modules/is-extglob": { "version": "2.1.1", - "devOptional": true, + "dev": true, "license": "MIT", "engines": { "node": ">=0.10.0" @@ -9449,7 +9456,7 @@ }, "node_modules/is-glob": { "version": "4.0.3", - "devOptional": true, + "dev": true, "license": "MIT", "dependencies": { "is-extglob": "^2.1.1" @@ -11163,6 +11170,7 @@ }, "node_modules/node-addon-api": { "version": "7.1.1", + "dev": true, "license": "MIT", "optional": true, "peer": true @@ -12766,7 +12774,7 @@ }, "node_modules/sass": { "version": "1.101.3", - "devOptional": true, + "dev": true, "license": "MIT", "peer": true, "dependencies": { @@ -15278,6 +15286,7 @@ "cpu": [ "x64" ], + "dev": true, "license": "MIT", "optional": true, "os": [ diff --git a/package.json b/package.json index 791702e4d..185195982 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "integration_openproject", - "version": "3.2.0-dev", + "version": "3.3.0-dev", "description": "OpenProject Integration", "directories": { "test": "tests"