diff --git a/.github/workflows/npm-audit-fix.yml b/.github/workflows/npm-audit-fix.yml index 4d29049376a..8979803bbca 100644 --- a/.github/workflows/npm-audit-fix.yml +++ b/.github/workflows/npm-audit-fix.yml @@ -26,6 +26,7 @@ jobs: matrix: branches: - ${{ github.event.repository.default_branch }} + - 'stable35' - 'stable34' - 'stable33' - 'stable32' diff --git a/.github/workflows/update-nextcloud-ocp.yml b/.github/workflows/update-nextcloud-ocp.yml index ba9f3d70f36..b457fc71189 100644 --- a/.github/workflows/update-nextcloud-ocp.yml +++ b/.github/workflows/update-nextcloud-ocp.yml @@ -26,6 +26,7 @@ jobs: matrix: branches: - ${{ github.event.repository.default_branch }} + - 'stable35' - 'stable34' - 'stable33' - 'stable32' diff --git a/appinfo/info.xml b/appinfo/info.xml index 6dc7cdd8b44..604ff48992a 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! ]]> - 9.0.0-dev.0 + 10.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/composer.lock b/composer.lock index e33ca046020..eb71c9ea7c1 100644 --- a/composer.lock +++ b/composer.lock @@ -297,12 +297,12 @@ "source": { "type": "git", "url": "https://github.com/nextcloud-deps/ocp.git", - "reference": "72acc73d21a11608d3028b26f0c10e4be622b10c" + "reference": "ddc90a88f4ec0166a1c0384cf6d0370e3dc53898" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nextcloud-deps/ocp/zipball/72acc73d21a11608d3028b26f0c10e4be622b10c", - "reference": "72acc73d21a11608d3028b26f0c10e4be622b10c", + "url": "https://api.github.com/repos/nextcloud-deps/ocp/zipball/ddc90a88f4ec0166a1c0384cf6d0370e3dc53898", + "reference": "ddc90a88f4ec0166a1c0384cf6d0370e3dc53898", "shasum": "" }, "require": { @@ -314,7 +314,8 @@ "psr/log": "^3.0.2", "symfony/polyfill-intl-normalizer": "^1.38", "symfony/polyfill-php84": "^1.38", - "symfony/polyfill-php85": "^1.41" + "symfony/polyfill-php85": "^1.41", + "symfony/polyfill-php86": "^1.41" }, "default-branch": true, "type": "library", @@ -342,7 +343,7 @@ "issues": "https://github.com/nextcloud-deps/ocp/issues", "source": "https://github.com/nextcloud-deps/ocp/tree/master" }, - "time": "2026-08-15T00:35:30+00:00" + "time": "2026-08-26T00:37:28+00:00" }, { "name": "nikic/php-parser", @@ -3463,16 +3464,16 @@ }, { "name": "symfony/polyfill-intl-normalizer", - "version": "v1.38.0", + "version": "v1.42.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-normalizer.git", - "reference": "2d446c214bdbe5b71bde5011b060a05fece3ae6b" + "reference": "aa20edea75bd9c48cfecc8360922e5a6e5c44502" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/2d446c214bdbe5b71bde5011b060a05fece3ae6b", - "reference": "2d446c214bdbe5b71bde5011b060a05fece3ae6b", + "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/aa20edea75bd9c48cfecc8360922e5a6e5c44502", + "reference": "aa20edea75bd9c48cfecc8360922e5a6e5c44502", "shasum": "" }, "require": { @@ -3524,7 +3525,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.38.0" + "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.42.0" }, "funding": [ { @@ -3544,7 +3545,7 @@ "type": "tidelift" } ], - "time": "2026-05-25T13:48:31+00:00" + "time": "2026-08-07T06:33:24+00:00" }, { "name": "symfony/polyfill-php84", @@ -3706,6 +3707,86 @@ ], "time": "2026-07-01T12:47:55+00:00" }, + { + "name": "symfony/polyfill-php86", + "version": "v1.41.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/polyfill-php86.git", + "reference": "6bc356ed3d8dbfeea8f0de235e34d670704e880e" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/polyfill-php86/zipball/6bc356ed3d8dbfeea8f0de235e34d670704e880e", + "reference": "6bc356ed3d8dbfeea8f0de235e34d670704e880e", + "shasum": "" + }, + "require": { + "php": ">=7.2" + }, + "type": "library", + "extra": { + "thanks": { + "url": "https://github.com/symfony/polyfill", + "name": "symfony/polyfill" + } + }, + "autoload": { + "files": [ + "bootstrap.php" + ], + "psr-4": { + "Symfony\\Polyfill\\Php86\\": "" + }, + "classmap": [ + "Resources/stubs" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony polyfill backporting some PHP 8.6+ features to lower PHP versions", + "homepage": "https://symfony.com", + "keywords": [ + "compatibility", + "polyfill", + "portable", + "shim" + ], + "support": { + "source": "https://github.com/symfony/polyfill-php86/tree/v1.41.0" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://github.com/nicolas-grekas", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2026-07-02T13:42:24+00:00" + }, { "name": "theseer/tokenizer", "version": "1.3.1", diff --git a/package-lock.json b/package-lock.json index fa07e9a5a5f..4125d213f7f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "text", - "version": "9.0.0-dev.0", + "version": "10.0.0-dev.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "text", - "version": "9.0.0-dev.0", + "version": "10.0.0-dev.0", "license": "AGPL-3.0-or-later", "dependencies": { "@floating-ui/dom": "^1.8.0", diff --git a/package.json b/package.json index 987f3bbea47..0cbef1abda6 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "text", - "version": "9.0.0-dev.0", + "version": "10.0.0-dev.0", "description": "Collaborative document editing", "license": "AGPL-3.0-or-later", "type": "module", diff --git a/renovate.json b/renovate.json index 16bc9b89f95..63bb097c59e 100644 --- a/renovate.json +++ b/renovate.json @@ -9,7 +9,7 @@ "minimumReleaseAge": "4 days", "rebaseWhen": "conflicted", "ignoreUnstable": false, - "baseBranchPatterns": ["main", "stable34", "stable33", "stable32"], + "baseBranchPatterns": ["main", "stable35", "stable34", "stable33", "stable32"], "enabledManagers": ["npm"], "ignoreDeps": ["node", "npm"], "packageRules": [ @@ -52,12 +52,12 @@ }, { "matchUpdateTypes": ["major"], - "matchBaseBranches": ["stable34", "stable33", "stable32"], + "matchBaseBranches": ["stable35", "stable34", "stable33", "stable32"], "enabled": false }, { "matchUpdateTypes": ["major", "minor"], - "matchBaseBranches": ["stable34", "stable33", "stable32"], + "matchBaseBranches": ["stable35", "stable34", "stable33", "stable32"], "enabled": false }, { @@ -67,7 +67,7 @@ "@nextcloud/cypress", "@cypress/{/,}**" ], - "matchBaseBranches": ["stable34", "stable33", "stable32"], + "matchBaseBranches": ["stable35", "stable34", "stable33", "stable32"], "enabled": false }, {