diff --git a/.github/workflows/npm-audit-fix.yml b/.github/workflows/npm-audit-fix.yml index a029ad3521c..a2a3e633e4c 100644 --- a/.github/workflows/npm-audit-fix.yml +++ b/.github/workflows/npm-audit-fix.yml @@ -21,7 +21,7 @@ jobs: strategy: fail-fast: false matrix: - branches: ['main', 'master', 'stable30', 'stable29'] + branches: ['main', 'master', 'stable31', 'stable30', 'stable29'] name: npm-audit-fix-${{ matrix.branches }} diff --git a/.github/workflows/update-nextcloud-ocp.yml b/.github/workflows/update-nextcloud-ocp.yml index 7cb73ad9bf0..b3464b04a16 100644 --- a/.github/workflows/update-nextcloud-ocp.yml +++ b/.github/workflows/update-nextcloud-ocp.yml @@ -20,7 +20,7 @@ jobs: strategy: fail-fast: false matrix: - branches: ['main', 'master', 'stable30', 'stable29'] + branches: ['main', 'master', 'stable31', 'stable30', 'stable29'] name: update-nextcloud-ocp-${{ matrix.branches }} diff --git a/appinfo/info.xml b/appinfo/info.xml index 426667b1469..9aea8854d0a 100644 --- a/appinfo/info.xml +++ b/appinfo/info.xml @@ -15,7 +15,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! ]]> - 5.0.0 + 6.0.0-dev.0 agpl Julius Härtl Text @@ -31,7 +31,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 bac89d53bd7..b6f58cb8e43 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "text", - "version": "5.0.0", + "version": "6.0.0-dev.0", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "text", - "version": "5.0.0", + "version": "6.0.0-dev.0", "license": "AGPL-3.0-or-later", "dependencies": { "@mdi/svg": "^7.4.47", diff --git a/package.json b/package.json index 7021affbf80..9f112a853cf 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "text", "description": "Collaborative document editing", - "version": "5.0.0", + "version": "6.0.0-dev.0", "authors": [ { "name": "Julius Härtl", diff --git a/renovate.json b/renovate.json index 7e3b6b09b80..1639c1c7ba5 100644 --- a/renovate.json +++ b/renovate.json @@ -19,6 +19,7 @@ "ignoreUnstable": false, "baseBranches": [ "main", + "stable31", "stable30", "stable29" ], @@ -94,6 +95,7 @@ "major" ], "matchBaseBranches": [ + "stable31", "stable30", "stable29", "stable28", @@ -125,6 +127,7 @@ "@cypress/{/,}**" ], "matchBaseBranches": [ + "stable31", "stable30", "stable29", "stable28",