diff --git a/.github/workflows/npm-audit-fix.yml b/.github/workflows/npm-audit-fix.yml index 558018ca842..2c6730d475d 100644 --- a/.github/workflows/npm-audit-fix.yml +++ b/.github/workflows/npm-audit-fix.yml @@ -18,7 +18,7 @@ jobs: strategy: fail-fast: false matrix: - branches: ['main', 'master', 'stable28', 'stable27', 'stable26'] + branches: ['main', 'master', 'stable29', 'stable28', 'stable27'] name: npm-audit-fix-${{ matrix.branches }} diff --git a/.github/workflows/update-nextcloud-ocp.yml b/.github/workflows/update-nextcloud-ocp.yml index 1095685f5f8..ab035c059f8 100644 --- a/.github/workflows/update-nextcloud-ocp.yml +++ b/.github/workflows/update-nextcloud-ocp.yml @@ -17,7 +17,7 @@ jobs: strategy: fail-fast: false matrix: - branches: ["main", "master", "stable28", "stable27", "stable26"] + branches: ['main', 'master', 'stable29', 'stable28', 'stable27'] name: update-nextcloud-ocp-${{ matrix.branches }} diff --git a/appinfo/info.xml b/appinfo/info.xml index 04e8bc8c18e..579d81d50f8 100644 --- a/appinfo/info.xml +++ b/appinfo/info.xml @@ -11,7 +11,7 @@ - **💾 Open format:** Files are saved as [Markdown](https://en.wikipedia.org/wiki/Markdown), so you can edit them from any other text app too. - **✊ Strong foundation:** We use [🐈 tiptap](https://tiptap.scrumpy.io) which is based on [🦉 ProseMirror](https://prosemirror.net) – huge thanks to them! ]]> - 3.10.0 + 4.0.0 agpl Julius Härtl Text @@ -27,7 +27,7 @@ https://raw.githubusercontent.com/nextcloud/text/main/img/screenshots/screenshot2.png https://raw.githubusercontent.com/nextcloud/text/main/img/screenshots/screenshot3.gif - + OCA\Text\Cron\Cleanup diff --git a/package-lock.json b/package-lock.json index 8111861d7d7..2f694d227f0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@nextcloud/text", - "version": "3.10.0", + "version": "4.0.0", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@nextcloud/text", - "version": "3.10.0", + "version": "4.0.0", "license": "agpl", "dependencies": { "@hedgedoc/markdown-it-task-lists": "^2.0.1", diff --git a/package.json b/package.json index 405d7347fa5..63bc5eee0dd 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "@nextcloud/text", "description": "Collaborative document editing", - "version": "3.10.0", + "version": "4.0.0", "authors": [ { "name": "Julius Härtl", diff --git a/renovate.json b/renovate.json index 324a71f358e..a578d72e344 100644 --- a/renovate.json +++ b/renovate.json @@ -86,7 +86,7 @@ }, { "matchUpdateTypes": ["major"], - "matchBaseBranches": ["stable28", "stable27", "stable26"], + "matchBaseBranches": ["stable29", "stable28", "stable27", "stable26"], "enabled": false }, {