diff --git a/.github/workflows/cypress-e2e.yml b/.github/workflows/cypress-e2e.yml index dfc187633f5..acc56a43a11 100644 --- a/.github/workflows/cypress-e2e.yml +++ b/.github/workflows/cypress-e2e.yml @@ -161,7 +161,7 @@ jobs: php occ user:add --password-from-env user2 php occ app:enable viewer php occ app:enable text - php occ app:enable assistant + php occ app:enable assistant --force php occ app:enable testing php occ app:list php occ background:cron diff --git a/.github/workflows/npm-audit-fix.yml b/.github/workflows/npm-audit-fix.yml index 0e7ba4b5d98..a45455b78b1 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', 'stable29', 'stable28', 'stable27'] + branches: ['main', 'master', 'stable30', 'stable29', 'stable28'] name: npm-audit-fix-${{ matrix.branches }} diff --git a/.github/workflows/update-nextcloud-ocp.yml b/.github/workflows/update-nextcloud-ocp.yml index f129d214f7a..79da75a55bb 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', 'stable29', 'stable28', 'stable27'] + branches: ['main', 'master', 'stable30', 'stable29', 'stable28'] name: update-nextcloud-ocp-${{ matrix.branches }} diff --git a/appinfo/info.xml b/appinfo/info.xml index 23631049590..426667b1469 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! ]]> - 4.1.0 + 5.0.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 d1184d50aa1..4f7578c31b9 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "text", - "version": "4.0.0", + "version": "5.0.0", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "text", - "version": "4.0.0", + "version": "5.0.0", "license": "agpl", "dependencies": { "@hedgedoc/markdown-it-task-lists": "^2.0.1", diff --git a/package.json b/package.json index c0e3c4d1841..ead7f9b82e2 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "text", "description": "Collaborative document editing", - "version": "4.0.0", + "version": "5.0.0", "authors": [ { "name": "Julius Härtl", diff --git a/renovate.json b/renovate.json index f17ab0a55d1..c5f29d76942 100644 --- a/renovate.json +++ b/renovate.json @@ -14,6 +14,7 @@ "ignoreUnstable": false, "baseBranches": [ "main", + "stable30", "stable29", "stable28" ], @@ -85,7 +86,7 @@ }, { "matchUpdateTypes": ["major"], - "matchBaseBranches": ["stable29", "stable28", "stable27", "stable26"], + "matchBaseBranches": ["stable30", "stable29", "stable28", "stable27", "stable26"], "enabled": false }, {