Merge branch 'main' into custom-summary-prompt

Signed-off-by: astkwcz <135839164+astkwcz@users.noreply.github.com>

Author: astkwcz

.github/actions-lock.txt

@@ -5,28 +5,28 @@ fe1239ed98a163abbdea3e0490c85458 appstore-build-publish.yml
 c68267e33681e70e0d90b8d7c58da269 command-openapi.yml
 e6351c608939c31ae1e32923aa82aa10 dependabot-approve-merge.yml
 2581a67c5bcdcd570427e6d51db767d7 fixup.yml
-985f3ac7d51405c1601c742832a14120 lint-eslint.yml
+dc0ae733f35c60274937c2647c027d46 lint-eslint.yml
 43fd0c5fb704cabc5f11cdfaf513236d lint-info-xml.yml
 4b40dd0073e16f74dd04e6d49dcc043d lint-php-cs.yml
 cfb31e47b6e9ab65e76c89b028754a4e lint-php.yml
 ab3a506506b1d7c1cea9593ecfd84366 lint-stylelint.yml
-3b1f38e378f8e764b0b3c560a8cfe1cd node-test.yml
+d5f511793e785e83842609afc0317b24 node-test.yml
 03759c9dc0fa748cb927b9f9cadf2925 node.yml
 65678bf15deefb099dea5410459a7c17 openapi.yml
-076e72a19e7bdf35ac5b2abee0198c43 phpunit-mariadb.yml
-8fab08ac7da700ee304af0bf3c18b3a3 phpunit-mysql.yml
-bbe9834ddb89207caf5e19d79ebb3672 phpunit-oci.yml
-256bf1dead4ef8479e9ce7433f871548 phpunit-pgsql.yml
-4ca2c2c4b1a73182667bab908e57c185 phpunit-sqlite.yml
+43fe311fa443cc05bca150d30148e656 phpunit-mariadb.yml
+6d20bb9054bf13310aaa1bf98025b3d9 phpunit-mysql.yml
+a9366230d0b876662fb0ab124ba586af phpunit-oci.yml
+33e50146debe0922d4e176f22d949aa1 phpunit-pgsql.yml
+869cf6703da576578e5d1774aa87d837 phpunit-sqlite.yml
 d1821b8a816578070ed8fd018f321f6d pr-feedback.yml
 6dc046dfbca5dc65d938265c518fcac4 psalm.yml
 2dbec18233063b42f4d8e03bbb43671c reuse.yml
 a3440826636c0fd7c2d20b1de50363da update-nextcloud-ocp-approve-merge.yml
-f5632e6d28c6afca9d4d46131fb48d57 update-nextcloud-ocp.yml
+1919e2ff468e875aeeae5fd088d4ce1f update-nextcloud-ocp.yml
 22604c31b526de270a080eb19967a638 update-stable-titles.yml
-97773e8d73758d9f1af50f7c8b82aef3 lint-typescript.yml
-94c65e30a77686c079c6dfa54a008440 sync-workflow-templates.yml
+c5147997c7fb8ecbcd23c69705bddc86 lint-typescript.yml
+b47a9fe981a7435caea92db33f5ad121 sync-workflow-templates.yml
 e456e5920f7020b8fef59329ab6ce54e ai-policy.yml
-28dcf55e283b85c292fea0d0b2a15a8a npm-build.yml
-aff9f466debc652013b43d1a11b32a0b npm-audit-fix.yml
+ab958fa2b07234fceab6b6d836fb7f19 npm-build.yml
+0dc931ec237a235370e224282608b20e npm-audit-fix.yml
 6aa9eaa284ed1800168c96b97e90d582 rector-apply.yml

.github/dependabot.yml

@@ -15,6 +15,24 @@ updates:
   cooldown:
     default-days: 4
 
+- package-ecosystem: composer
+  target-branch: stable35
+  directory: "/"
+  commit-message:
+    prefix: "build"
+    include: "scope"
+  versioning-strategy: "increase"
+  ignore:
+    - dependency-name: "*"
+      update-types: ["version-update:semver-major", "version-update:semver-minor"]
+  schedule:
+    interval: weekly
+    day: saturday
+    time: "03:00"
+    timezone: Europe/Berlin
+  cooldown:
+    default-days: 4
+
 - package-ecosystem: composer
   target-branch: stable34
   directory: "/"
@@ -127,6 +145,31 @@ updates:
     exclude:
       - "@nextcloud/*"
 
+- package-ecosystem: npm
+  target-branch: stable35
+  directory: "/"
+  commit-message:
+    prefix: "build"
+    include: "scope"
+  versioning-strategy: "increase"
+  open-pull-requests-limit: 10
+  schedule:
+    interval: weekly
+    day: saturday
+    time: "03:00"
+    timezone: Europe/Berlin
+  ignore:
+    - dependency-name: "*"
+      update-types: ["version-update:semver-major"]
+  groups:
+    vueuse:
+      patterns:
+        - "@vueuse/*"
+  cooldown:
+    default-days: 4
+    exclude:
+      - "@nextcloud/*"
+
 - package-ecosystem: npm
   target-branch: stable34
   directory: "/"

.github/workflows/integration-federation.yml

@@ -60,11 +60,11 @@ jobs:
             host-circles-versions: 'master'
             host-notifications-versions: 'master'
             remote-db: 'mysql'
-            remote-server-versions: 'stable34'
-            remote-spreed-versions: 'stable34'
+            remote-server-versions: 'stable35'
+            remote-spreed-versions: 'stable35'
             remote-guests-versions: 'main'
-            remote-circles-versions: 'stable34'
-            remote-notifications-versions: 'stable34'
+            remote-circles-versions: 'stable35'
+            remote-notifications-versions: 'stable35'
           - test-suite: 'federation'
             php-versions: '8.3'
             host-db: 'pgsql'
@@ -74,19 +74,19 @@ jobs:
             host-circles-versions: 'master'
             host-notifications-versions: 'master'
             remote-db: 'mysql'
-            remote-server-versions: 'stable34'
-            remote-spreed-versions: 'stable34'
+            remote-server-versions: 'stable35'
+            remote-spreed-versions: 'stable35'
             remote-guests-versions: 'main'
-            remote-circles-versions: 'stable34'
-            remote-notifications-versions: 'stable34'
+            remote-circles-versions: 'stable35'
+            remote-notifications-versions: 'stable35'
           - test-suite: 'federation'
             php-versions: '8.3'
             host-db: 'oci'
-            host-server-versions: 'stable34'
-            host-spreed-versions: 'stable34'
+            host-server-versions: 'stable35'
+            host-spreed-versions: 'stable35'
             host-guests-versions: 'main'
-            host-circles-versions: 'stable34'
-            host-notifications-versions: 'stable34'
+            host-circles-versions: 'stable35'
+            host-notifications-versions: 'stable35'
             remote-db: 'mysql'
             remote-server-versions: 'master'
             remote-spreed-versions: ${{ github.event.pull_request.head.sha }}

.github/workflows/npm-audit-fix.yml

@@ -26,6 +26,7 @@ jobs:
       matrix:
         branches:
           - ${{ github.event.repository.default_branch }}
+          - 'stable35'
           - 'stable34'
           - 'stable33'
           - 'stable32'

.github/workflows/sync-workflow-templates.yml

@@ -26,6 +26,7 @@ jobs:
       matrix:
         branches:
           - ${{ github.event.repository.default_branch }}
+          - 'stable35'
           - 'stable34'
           - 'stable33'
           - 'stable32'

.github/workflows/update-nextcloud-ocp.yml

@@ -29,6 +29,7 @@ jobs:
       matrix:
         branches:
           - ${{ github.event.repository.default_branch }}
+          - 'stable35'
           - 'stable34'
           - 'stable33'
           - 'stable32'

LICENSES/LicenseRef-NextcloudTrademarks.txt

@@ -6,4 +6,4 @@ and our products: “Nextcloud Files”; “Nextcloud Groupware” and “Nextcl
 This set of marks is collectively referred to as the “Nextcloud marks.”
 
 Use of Nextcloud logos and other marks is only permitted under the guidelines provided by the Nextcloud GmbH.
-A copy can be found at https://discord.com/branding
+A copy can be found at https://nextcloud.com/trademarks/

appinfo/info.xml

@@ -18,7 +18,7 @@
 * 🌉 **Sync with other chat solutions** With [Matterbridge](https://github.com/42wim/matterbridge/) being integrated in Talk, you can easily sync a lot of other chat solutions to Nextcloud Talk and vice-versa.
 ]]></description>
 
-	<version>25.0.0-alpha.1</version>
+	<version>26.0.0-dev.0</version>
 	<licence>AGPL-3.0-or-later</licence>
 
 	<author>Christian Lorang</author>
@@ -61,7 +61,7 @@
 	<screenshot>https://raw.githubusercontent.com/nextcloud/spreed/main/docs/video-verfication.png</screenshot>
 
 	<dependencies>
-		<nextcloud min-version="35" max-version="35" />
+		<nextcloud min-version="36" max-version="36" />
 	</dependencies>
 
 	<background-jobs>

composer.json

@@ -43,7 +43,7 @@
 	},
 	"require": {
 		"bamarni/composer-bin-plugin": "^1.9",
-		"cuyz/valinor": "^2.5",
+		"cuyz/valinor": "^2.6",
 		"cweagans/composer-patches": "^2.0.0",
 		"firebase/php-jwt": "^7.0"
 	},