fix: use array_key_exists instead of isset in di container

Signed-off-by: Robin Appelman <robin@icewind.nl>
chore: rebuild autoloader
2025-06-24 16:12:06 +02:00 · 2025-06-24 16:12:06 +02:00 · 2025-06-24 16:12:05 +02:00 · 2025-06-24 16:12:05 +02:00 · 2025-06-24 16:12:04 +02:00 · 2025-06-24 16:12:04 +02:00
5836 changed files with 192116 additions and 123919 deletions
@@ -13,10 +13,6 @@ indent_style = tab
 insert_final_newline = true
 trim_trailing_whitespace = true

-[*.feature]
-indent_size = 2
-indent_style = space
-
 [*.yml]
 indent_size = 2
 indent_style = space
@@ -15,3 +15,5 @@ af6de04e9e141466dc229e444ff3f146f4a34765
 9836e9b16484582d309c8437ab46d82e34956941
 # Automated refactorings
 49dd79eabb2b8902559a7a4e8f8fcad54f46b604
+# @nextcloud/vue import paths
+b06f5ba4c47450f355a8903c1a93ac68e8c6cfc2
@@ -1,7 +1,30 @@
+# Fallback owners for code review - ensure all PRs have someone assigned for review.
+# (the last match will used so this is only used if there is no more specific code owner below)
+
+# Backend
+# is the first and gets everything to make things easier from matching syntax
+*                                             @nextcloud/server-backend
+
+# Frontend
+# this will override the backend code owners if needed
+/__mocks__                                    @nextcloud/server-frontend
+/__tests__                                    @nextcloud/server-frontend
+/cypress                                      @nextcloud/server-frontend
+**/css                                        @nextcloud/server-frontend
+**/js                                         @nextcloud/server-frontend
+**/src                                        @nextcloud/server-frontend
+*.js                                          @nextcloud/server-frontend
+*.ts                                          @nextcloud/server-frontend
+
+# dependency management
+package.json                                  @nextcloud/server-dependabot @nextcloud/server-frontend
+package-lock.json                             @nextcloud/server-dependabot
+/dist                                         @nextcloud/server-dependabot
+
 # App maintainers
 /apps/admin_audit/appinfo/info.xml            @luka-nextcloud @blizzz
-/apps/cloud_federation_api/appinfo/info.xml   @mejo-
-/apps/comments/appinfo/info.xml               @edward-ly @Pytal
+/apps/cloud_federation_api/appinfo/info.xml   @nfebe @mejo-
+/apps/comments/appinfo/info.xml               @edward-ly @sorbaugh
 /apps/contactsinteraction/appinfo/info.xml    @kesselb @SebastianKrupinski
 /apps/contactsinteraction/lib                 @kesselb @SebastianKrupinski
 /apps/contactsinteraction/tests               @kesselb @SebastianKrupinski
@@ -12,21 +35,21 @@
 /apps/dav/tests/unit/CardDAV                  @hamza221 @SebastianKrupinski
 /apps/encryption/appinfo/info.xml             @come-nc @icewind1991
 /apps/federatedfilesharing/appinfo/info.xml   @icewind1991 @danxuliu
-/apps/federation/appinfo/info.xml             @nfebe
-/apps/files/appinfo/info.xml                  @skjnldsv @Pytal @ArtificialOwl @come-nc @artonge @icewind1991 @szaimen @susnux @nfebe
+/apps/federation/appinfo/info.xml             @nfebe @sorbaugh
+/apps/files/appinfo/info.xml                  @skjnldsv @ArtificialOwl @come-nc @artonge @icewind1991 @szaimen @susnux @nfebe
 /apps/files_external/appinfo/info.xml         @icewind1991 @artonge
-/apps/files_reminders/appinfo/info.xml        @Pytal
+/apps/files_reminders/appinfo/info.xml        @skjnldsv @sorbaugh
 /apps/files_sharing/appinfo/info.xml          @skjnldsv @come-nc
-/apps/files_trashbin/appinfo/info.xml         @Pytal @icewind1991
+/apps/files_trashbin/appinfo/info.xml         @icewind1991 @sorbaugh
 /apps/files_versions/appinfo/info.xml         @artonge @icewind1991
 /apps/oauth2/appinfo/info.xml                 @julien-nc @ChristophWurst
 /apps/provisioning_api/appinfo/info.xml       @provokateurin @nickvergessen
-/apps/settings/appinfo/info.xml               @Pytal @JuliaKirschenheuter
-/apps/sharebymail/appinfo/info.xml            @Altahrim
+/apps/settings/appinfo/info.xml               @JuliaKirschenheuter @sorbaugh
+/apps/sharebymail/appinfo/info.xml            @Altahrim @skjnldsv
 /apps/systemtags/appinfo/info.xml             @Antreesy @marcelklehr
 /apps/theming/appinfo/info.xml                @skjnldsv @juliusknorr
 /apps/twofactor_backupcodes/appinfo/info.xml  @st3iny @miaulalala @ChristophWurst
-/apps/updatenotification/appinfo/info.xml     @Pytal @JuliaKirschenheuter
+/apps/updatenotification/appinfo/info.xml     @JuliaKirschenheuter @sorbaugh
 /apps/user_ldap/appinfo/info.xml              @come-nc @blizzz
 /apps/user_status/appinfo/info.xml            @Antreesy @nickvergessen
 /apps/weather_status/appinfo/info.xml         @julien-nc @juliusknorr
@@ -34,14 +57,14 @@
 /apps/workflowengine/appinfo/info.xml         @blizzz @juliusknorr

 # Frontend expertise
-/apps/files/src*                  @skjnldsv
-/apps/files_external/src*         @skjnldsv
-/apps/files_reminders/src*        @skjnldsv
-/apps/files_sharing/src/actions*  @skjnldsv
-/apps/files_trashbin/src*         @skjnldsv
+/apps/files/src*                    @skjnldsv @nextcloud/server-frontend
+/apps/files_external/src*           @skjnldsv @nextcloud/server-frontend
+/apps/files_reminders/src*          @skjnldsv @nextcloud/server-frontend
+/apps/files_sharing/src/actions*    @skjnldsv @nextcloud/server-frontend
+/apps/files_trashbin/src*           @skjnldsv @nextcloud/server-frontend

 # Security team
-/build/psalm-baseline-security.xml  @nickvergessen
+/build/psalm-baseline-security.xml  @nickvergessen @nextcloud/server-backend
 /resources/codesigning              @mgallien @miaulalala @nickvergessen
 /resources/config/ca-bundle.crt     @miaulalala @nickvergessen

@@ -53,32 +76,28 @@

 # Limit login to IP
 # Watch login routes for https://github.com/nextcloud/limit_login_to_ip
-/core/routes.php	@Altahrim
+/core/routes.php                    @Altahrim @nextcloud/server-backend

 # OpenAPI
-openapi*.json           @provokateurin
-ResponseDefinitions.php @provokateurin
+openapi*.json                       @provokateurin @nextcloud/server-backend
+ResponseDefinitions.php             @provokateurin @nextcloud/server-backend

 # Talk team
-/lib/private/Comments               @nickvergessen
-/lib/private/Federation             @nickvergessen
-/lib/private/Talk                   @nickvergessen
-/lib/public/Comments                @nickvergessen
-/lib/public/Federation              @nickvergessen
-/lib/public/OCM                     @nickvergessen
-/lib/public/Talk                    @nickvergessen
-/lib/public/UserStatus              @nickvergessen
+/lib/private/Comments               @nickvergessen @nextcloud/talk-backend
+/lib/private/Federation             @nickvergessen @nextcloud/talk-backend @nextcloud/server-backend
+/lib/private/Talk                   @nickvergessen @nextcloud/talk-backend
+/lib/public/Comments                @nickvergessen @nextcloud/talk-backend
+/lib/public/Federation              @nickvergessen @nextcloud/talk-backend @nextcloud/server-backend
+/lib/public/OCM                     @nickvergessen @nextcloud/talk-backend @nextcloud/server-backend
+/lib/public/Talk                    @nickvergessen @nextcloud/talk-backend
+/lib/public/UserStatus              @nickvergessen @nextcloud/talk-backend

 # Groupware
 /build/integration/dav_features/caldav.feature   @st3iny @SebastianKrupinski @tcitworld
 /build/integration/dav_features/carddav.feature  @hamza221 @SebastianKrupinski
-/lib/private/Calendar                            @st3iny @SebastianKrupinski @tcitworld
-/lib/private/Contacts                            @hamza221 @SebastianKrupinski
 /lib/public/Calendar                             @st3iny @SebastianKrupinski @tcitworld
 /lib/public/Contacts                             @hamza221 @SebastianKrupinski

 # Personal interest
-*/Activity/*                        @nickvergessen
-*/Notifications/*                   @nickvergessen
-/lib/private/Profiler               @CarlSchwan
-/lib/public/Profiler                @CarlSchwan
+*/Activity/*                                     @nickvergessen @nextcloud/server-backend
+*/Notifications/*                                @nickvergessen @nextcloud/talk-backend
@@ -70,9 +70,9 @@ body:
        Select Nextcloud Server version.
        _Versions not listed here are not maintained and not supported anymore_
      options:
-        - "28"
        - "29"
        - "30"
+        - "31"
        - "master"
    validations:
      required: true
@@ -95,10 +95,10 @@ body:
        Select PHP engine version serving Nextcloud Server.
        _Describe in the "Additional info" section if you chose "Other"._
      options:
+        - "PHP 8.4"
        - "PHP 8.3"
        - "PHP 8.2"
        - "PHP 8.1"
-        - "PHP 8.0"
        - "Other"
  - type: dropdown
    id: webserver
@@ -132,8 +132,8 @@ body:
      description: |
        Select if bug is present after an update or on a fresh install.
      options:
-        - "Updated from a MINOR version (ex. 28.0.1 to 28.0.2)"
-        - "Upgraded to a MAJOR version (ex. 28 to 29)"
+        - "Updated from a MINOR version (ex. 32.0.1 to 32.0.2)"
+        - "Upgraded to a MAJOR version (ex. 31 to 32)"
        - "Fresh Nextcloud Server install"
  - type: dropdown
    id: encryption
@@ -1,230 +1,8 @@
 # SPDX-FileCopyrightText: 2020 Nextcloud GmbH and Nextcloud contributors
 # SPDX-License-Identifier: AGPL-3.0-or-later
+
 version: 2
 updates:
-# Linting and coding style
- package-ecosystem: composer
-  directory: "/"
-  schedule:
-    interval: weekly
-    day: saturday
-    time: "03:00"
-    timezone: Europe/Paris
-  labels:
-    - "3. to review"
-    - "feature: dependencies"
-  reviewers:
-    - "nextcloud/server-dependabot"
-
-# cs-fixer
- package-ecosystem: composer
-  directory: "/vendor-bin/cs-fixer"
-  schedule:
-    interval: weekly
-    day: saturday
-    time: "04:10"
-    timezone: Europe/Copenhagen
-  labels:
-    - "3. to review"
-    - "feature: dependencies"
-  reviewers:
-    - "nextcloud/server-dependabot"
-
-# openapi-extractor
- package-ecosystem: composer
-  directory: "/vendor-bin/openapi-extractor"
-  schedule:
-    interval: weekly
-    day: saturday
-    time: "04:20"
-    timezone: Europe/Brussels
-  labels:
-    - "3. to review"
-    - "feature: dependencies"
-  reviewers:
-    - "nextcloud/server-dependabot"
-    - "provokateurin"
-
-# psalm
- package-ecosystem: composer
-  directory: "/vendor-bin/psalm"
-  schedule:
-    interval: weekly
-    day: saturday
-    time: "04:30"
-    timezone: Europe/Madrid
-  labels:
-    - "3. to review"
-    - "feature: dependencies"
-  reviewers:
-    - "nextcloud/server-dependabot"
-
-# phpunit
- package-ecosystem: composer
-  directory: "/vendor-bin/phpunit"
-  schedule:
-    interval: weekly
-    day: saturday
-    time: "04:40"
-    timezone: Europe/Madrid
-  labels:
-    - "3. to review"
-    - "feature: dependencies"
-  reviewers:
-    - "nextcloud/server-dependabot"
-
-# Main master npm
- package-ecosystem: npm
-  directory: "/"
-  schedule:
-    interval: weekly
-    day: saturday
-    time: "03:00"
-    timezone: Europe/Paris
-  open-pull-requests-limit: 10
-  labels:
-    - "3. to review"
-    - "feature: dependencies"
-  reviewers:
-    - "nextcloud/server-dependabot"
-  # Disable automatic rebasing because without a build CI will likely fail anyway
-  rebase-strategy: "disabled"
-
-# Testing master npm
- package-ecosystem: npm
-  directory: "/build"
-  schedule:
-    interval: weekly
-    day: saturday
-    time: "03:00"
-    timezone: Europe/Paris
-  labels:
-    - "3. to review"
-    - "feature: dependencies"
-
-# Testing master composer
- package-ecosystem: composer
-  directory: "/build/integration"
-  schedule:
-    interval: weekly
-    day: saturday
-    time: "03:00"
-    timezone: Europe/Paris
-  labels:
-    - "3. to review"
-    - "feature: dependencies"
-
- package-ecosystem: npm
-  directory: "/"
-  schedule:
-    interval: weekly
-    day: saturday
-    time: "03:00"
-    timezone: Europe/Paris
-  target-branch: stable28
-  labels:
-    - "3. to review"
-    - "feature: dependencies"
-  reviewers:
-    - "nextcloud/server-dependabot"
-  ignore:
-    - dependency-name: "*"
-      update-types: ["version-update:semver-major", "version-update:semver-minor"]
-  # Disable automatic rebasing because without a build CI will likely fail anyway
-  rebase-strategy: "disabled"
-
- package-ecosystem: npm
-  directory: "/"
-  schedule:
-    interval: weekly
-    day: saturday
-    time: "03:00"
-    timezone: Europe/Paris
-  target-branch: stable29
-  labels:
-    - "3. to review"
-    - "feature: dependencies"
-  reviewers:
-    - "nextcloud/server-dependabot"
-  ignore:
-    - dependency-name: "*"
-      update-types: ["version-update:semver-major", "version-update:semver-minor"]
-  # Disable automatic rebasing because without a build CI will likely fail anyway
-  rebase-strategy: "disabled"
-
- package-ecosystem: npm
-  directory: "/"
-  schedule:
-    interval: weekly
-    day: saturday
-    time: "03:00"
-    timezone: Europe/Paris
-  target-branch: stable30
-  labels:
-    - "3. to review"
-    - "feature: dependencies"
-  reviewers:
-    - "nextcloud/server-dependabot"
-  ignore:
-    - dependency-name: "*"
-      update-types: ["version-update:semver-major", "version-update:semver-minor"]
-  # Disable automatic rebasing because without a build CI will likely fail anyway
-  rebase-strategy: "disabled"
-
- package-ecosystem: composer
-  directory: "/build/integration"
-  schedule:
-    interval: weekly
-    day: saturday
-    time: "03:00"
-    timezone: Europe/Paris
-  target-branch: stable28
-  labels:
-    - "3. to review"
-    - "feature: dependencies"
-  reviewers:
-    - "nextcloud/server-dependabot"
-  ignore:
-    # ignore all GitHub linguist patch updates
-    - dependency-name: "*"
-      update-types: ["version-update:semver-major", "version-update:semver-minor", "version-update:semver-patch"]
-
- package-ecosystem: composer
-  directory: "/build/integration"
-  schedule:
-    interval: weekly
-    day: saturday
-    time: "03:00"
-    timezone: Europe/Paris
-  target-branch: stable29
-  labels:
-    - "3. to review"
-    - "feature: dependencies"
-  reviewers:
-    - "nextcloud/server-dependabot"
-  ignore:
-    # ignore all GitHub linguist patch updates
-    - dependency-name: "*"
-      update-types: ["version-update:semver-major", "version-update:semver-minor", "version-update:semver-patch"]
-
- package-ecosystem: composer
-  directory: "/build/integration"
-  schedule:
-    interval: weekly
-    day: saturday
-    time: "03:00"
-    timezone: Europe/Paris
-  target-branch: stable30
-  labels:
-    - "3. to review"
-    - "feature: dependencies"
-  reviewers:
-    - "nextcloud/server-dependabot"
-  ignore:
-    # ignore all GitHub linguist patch updates
-    - dependency-name: "*"
-      update-types: ["version-update:semver-major", "version-update:semver-minor", "version-update:semver-patch"]
-
 # GitHub Actions
 - package-ecosystem: "github-actions"
  directory: "/"
@@ -238,6 +16,127 @@ updates:
  labels:
    - "3. to review"
    - "feature: dependencies"
-  reviewers:
-    - "nextcloud/server-dependabot"

+# Main composer (linting, testing, openapi)
+- package-ecosystem: composer
+  directories:
+    - "/"
+    - "/build/integration"
+    - "/vendor-bin/cs-fixer"
+    - "/vendor-bin/openapi-extractor"
+    - "/vendor-bin/phpunit"
+    - "/vendor-bin/psalm"
+    - "/vendor-bin/rector"
+  schedule:
+    interval: weekly
+    day: saturday
+    time: "03:00"
+    timezone: Europe/Paris
+  labels:
+    - "3. to review"
+    - "feature: dependencies"
+
+# Main master npm frontend dependencies
+- package-ecosystem: npm
+  directory: "/"
+  schedule:
+    interval: weekly
+    day: saturday
+    time: "03:00"
+    timezone: Europe/Paris
+  open-pull-requests-limit: 20
+  labels:
+    - "3. to review"
+    - "feature: dependencies"
+  # Disable automatic rebasing because without a build CI will likely fail anyway
+  rebase-strategy: "disabled"
+
+# Latest stable release
+# Composer dependencies for linting and testing
+- package-ecosystem: composer
+  target-branch: stable31
+  directories:
+    - "/"
+    - "/build/integration"
+    - "/vendor-bin/cs-fixer"
+    - "/vendor-bin/openapi-extractor"
+    - "/vendor-bin/phpunit"
+    - "/vendor-bin/psalm"
+  schedule:
+    interval: weekly
+    day: saturday
+    time: "03:30"
+    timezone: Europe/Paris
+  labels:
+    - "3. to review"
+    - "feature: dependencies"
+  ignore:
+    # only patch updates on stable branches
+    - dependency-name: "*"
+      update-types: ["version-update:semver-major", "version-update:semver-minor"]
+
+# Latest stable branch
+# frontend dependencies
+- package-ecosystem: npm
+  target-branch: stable31
+  directory: "/"
+  schedule:
+    interval: weekly
+    day: saturday
+    time: "03:30"
+    timezone: Europe/Paris
+  open-pull-requests-limit: 20
+  labels:
+    - "3. to review"
+    - "feature: dependencies"
+  # Disable automatic rebasing because without a build CI will likely fail anyway
+  rebase-strategy: "disabled"
+  ignore:
+    # no major updates on stable branches
+    - dependency-name: "*"
+      update-types: ["version-update:semver-major"]
+
+# Older stable releases
+
+# Composer dependencies for linting and testing
+- package-ecosystem: composer
+  target-branch: stable30
+  directories:
+    - "/"
+    - "/build/integration"
+    - "/vendor-bin/cs-fixer"
+    - "/vendor-bin/openapi-extractor"
+    - "/vendor-bin/phpunit"
+    - "/vendor-bin/psalm"
+  schedule:
+    interval: weekly
+    day: saturday
+    time: "04:00"
+    timezone: Europe/Paris
+  labels:
+    - "3. to review"
+    - "feature: dependencies"
+  ignore:
+    # only patch updates on stable branches
+    - dependency-name: "*"
+      update-types: ["version-update:semver-major", "version-update:semver-minor"]
+
+# frontend dependencies
+- package-ecosystem: npm
+  target-branch: stable30
+  directory: "/"
+  schedule:
+    interval: weekly
+    day: saturday
+    time: "04:00"
+    timezone: Europe/Paris
+  open-pull-requests-limit: 20
+  labels:
+    - "3. to review"
+    - "feature: dependencies"
+  # Disable automatic rebasing because without a build CI will likely fail anyway
+  rebase-strategy: "disabled"
+  ignore:
+    # no major updates on stable branches
+    - dependency-name: "*"
+      update-types: ["version-update:semver-major"]
@@ -21,5 +21,3 @@
 - [ ] Screenshots before/after for front-end changes
 - [ ] Documentation ([manuals](https://github.com/nextcloud/documentation/) or wiki) has been updated or is not required
 - [ ] [Backports requested](https://github.com/nextcloud/backportbot/#usage) where applicable (ex: critical bugfixes)
- [ ] [Labels added](https://github.com/nextcloud/server/labels) where applicable (ex: bug/enhancement, `3. to review`, feature component)
- [ ] [Milestone added](https://github.com/nextcloud/server/milestones) for target branch/version (ex: 32.x for `stable32`)
@@ -36,6 +36,7 @@ jobs:
              - 'composer.json'
              - 'composer.lock'
              - '**.php'
+              - build/autoloaderchecker.sh

  autoloader:
    runs-on: ubuntu-latest
@@ -57,7 +58,7 @@ jobs:
          submodules: true

      - name: Set up php ${{ matrix.php-versions }}
-        uses: shivammathur/setup-php@c541c155eee45413f5b09a52248675b1a2575231 #v2.31.1
+        uses: shivammathur/setup-php@cf4cade2721270509d5b1c766ab3549210a39a2a #v2.33.0
        with:
          php-version: ${{ matrix.php-versions }}
          extensions: bz2, ctype, curl, dom, fileinfo, gd, iconv, intl, json, libxml, mbstring, openssl, pcntl, posix, session, simplexml, xmlreader, xmlwriter, zip, zlib, sqlite, pdo_sqlite
@@ -66,9 +67,6 @@ jobs:
        env:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

-      - name: Set up dependencies
-        run: composer i
-
      - name: Check auto loaders
        run: bash ./build/autoloaderchecker.sh

@@ -89,7 +87,7 @@ jobs:
          submodules: true

      - name: Set up php ${{ matrix.php-versions }}
-        uses: shivammathur/setup-php@9e72090525849c5e82e596468b86eb55e9cc5401 #v2.32.0
+        uses: shivammathur/setup-php@cf4cade2721270509d5b1c766ab3549210a39a2a #v2.33.0
        with:
          php-version: ${{ matrix.php-versions }}
          extensions: bz2, ctype, curl, dom, fileinfo, gd, iconv, intl, json, libxml, mbstring, openssl, pcntl, posix, session, simplexml, xmlreader, xmlwriter, zip, zlib, sqlite, pdo_sqlite
@@ -110,6 +108,9 @@ jobs:
      - name: Check that all and only expected files are included
        run: php ./build/files-checker.php

+      - name: Check that all shipped apps are linted by psalm
+        run: sh ./build/psalm-checker.sh
+
  summary:
    permissions:
      contents: none
@@ -102,11 +102,56 @@ jobs:
      matrix:
        # Run multiple copies of the current job in parallel
        # Please increase the number or runners as your tests suite grows (0 based index for e2e tests)
-        containers: ['component', '0', '1', '2', '3', '4', '5', '6', '7']
+        containers: ['component', 'setup', '0', '1', '2', '3', '4', '5', '6', '7']
        # Hack as strategy.job-total includes the component and GitHub does not allow math expressions
        # Always align this number with the total of e2e runners (max. index + 1)
        total-containers: [8]

+    services:
+      mysql:
+        # Only start mysql if we are running the setup tests
+        image: ${{matrix.containers == 'setup' && 'ghcr.io/nextcloud/continuous-integration-mysql-8.4:latest' || ''}}
+        ports:
+          - '3306/tcp'
+        env:
+          MYSQL_ROOT_PASSWORD: rootpassword
+          MYSQL_USER: oc_autotest
+          MYSQL_PASSWORD: nextcloud
+          MYSQL_DATABASE: oc_autotest
+        options: --health-cmd="mysqladmin ping" --health-interval 5s --health-timeout 2s --health-retries 10
+
+      mariadb:
+        # Only start mariadb if we are running the setup tests
+        image: ${{matrix.containers == 'setup' && 'mariadb:11.4' || ''}}
+        ports:
+          - '3306/tcp'
+        env:
+          MYSQL_ROOT_PASSWORD: rootpassword
+          MYSQL_USER: oc_autotest
+          MYSQL_PASSWORD: nextcloud
+          MYSQL_DATABASE: oc_autotest
+        options: --health-cmd="mariadb-admin ping" --health-interval 5s --health-timeout 2s --health-retries 5
+
+      postgres:
+        # Only start postgres if we are running the setup tests
+        image: ${{matrix.containers == 'setup' && 'ghcr.io/nextcloud/continuous-integration-postgres-17:latest' || ''}}
+        ports:
+          - '5432/tcp'
+        env:
+          POSTGRES_USER: root
+          POSTGRES_PASSWORD: rootpassword
+          POSTGRES_DB: nextcloud
+        options: --mount type=tmpfs,destination=/var/lib/postgresql/data --health-cmd pg_isready --health-interval 5s --health-timeout 2s --health-retries 5
+
+      oracle:
+        # Only start oracle if we are running the setup tests
+        image: ${{matrix.containers == 'setup' && 'ghcr.io/gvenzl/oracle-free:23' || ''}}
+        ports:
+          - '1521'
+        env:
+          ORACLE_PASSWORD: oracle
+        options:  --health-cmd healthcheck.sh --health-interval 20s --health-timeout 10s --health-retries 10
+
    name: runner ${{ matrix.containers }}

    steps:
@@ -129,7 +174,7 @@ jobs:
        run: ./node_modules/cypress/bin/cypress install

      - name: Run ${{ matrix.containers == 'component' && 'component' || 'E2E' }} cypress tests
-        uses: cypress-io/github-action@f1f0912d392f0d06bdd01fb9ebe3b3299e5806fb # v6.7.7
+        uses: cypress-io/github-action@be1bab96b388bbd9ce3887e397d373c8557e15af # v6.9.2
        with:
          # We already installed the dependencies in the init job
          install: false
@@ -149,6 +194,7 @@ jobs:
          CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_RECORD_KEY }}
          SPLIT: ${{ matrix.total-containers }}
          SPLIT_INDEX: ${{ matrix.containers == 'component' && 0 || matrix.containers }}
+          SETUP_TESTING: ${{ matrix.containers == 'setup' && 'true' || '' }}

      - name: Upload snapshots and videos
        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
@@ -43,7 +43,6 @@ jobs:
    if: ${{ github.repository_owner != 'nextcloud-gmbh' && needs.changes.outputs.src != 'false' }}

    strategy:
-      # do not stop on another job's failure
      fail-fast: false
      matrix:
        php-versions: ['8.1', '8.4']
@@ -72,7 +71,7 @@ jobs:
          if [[ "${{ matrix.ftpd }}" == 'pure-ftpd' ]]; then docker run --name ftp -d --net host -e "PUBLICHOST=localhost" -e FTP_USER_NAME=test -e FTP_USER_PASS=test -e FTP_USER_HOME=/home/test -v /tmp/ftp:/home/test -v /tmp/ftp:/etc/pure-ftpd/passwd stilliard/pure-ftpd; fi

      - name: Set up php ${{ matrix.php-versions }}
-        uses: shivammathur/setup-php@c541c155eee45413f5b09a52248675b1a2575231 #v2.31.1
+        uses: shivammathur/setup-php@cf4cade2721270509d5b1c766ab3549210a39a2a #v2.33.0
        with:
          php-version: ${{ matrix.php-versions }}
          # https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html#prerequisites-for-manual-installation
@@ -100,7 +99,8 @@ jobs:
      - name: PHPUnit
        run: composer run test:files_external -- \
          apps/files_external/tests/Storage/FtpTest.php \
-          ${{ matrix.coverage && ' --coverage-clover ./clover.xml' || '' }}
+          --log-junit junit.xml \
+          ${{ matrix.coverage && '--coverage-clover ./clover.xml' || '' }}

      - name: Upload code coverage
        if: ${{ !cancelled() && matrix.coverage }}
@@ -109,6 +109,12 @@ jobs:
          files: ./clover.xml
          flags: phpunit-files-external-ftp

+      - name: Upload test results
+        if: ${{ !cancelled() }}
+        uses: codecov/test-results-action@47f89e9acb64b76debcd5ea40642d25a4adced9f # v1.1.1
+        with:
+          flags: phpunit-files-external-ftp
+
      - name: ftpd logs
        if: always()
        run: |
@@ -43,13 +43,14 @@ jobs:
    if: ${{ github.repository_owner != 'nextcloud-gmbh' && needs.changes.outputs.src != 'false' }}

    strategy:
+      fail-fast: false
      matrix:
        php-versions: ['8.1', '8.2', '8.4']
        include:
          - php-versions: '8.3'
            coverage: ${{ github.event_name != 'pull_request' }}

-    name: php${{ matrix.php-versions }}-s3
+    name: php${{ matrix.php-versions }}-s3-minio

    services:
      minio:
@@ -69,7 +70,7 @@ jobs:
          submodules: true

      - name: Set up php ${{ matrix.php-versions }}
-        uses: shivammathur/setup-php@c541c155eee45413f5b09a52248675b1a2575231 #v2.31.1
+        uses: shivammathur/setup-php@cf4cade2721270509d5b1c766ab3549210a39a2a #v2.33.0
        with:
          php-version: ${{ matrix.php-versions }}
          # https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html#prerequisites-for-manual-installation
@@ -108,6 +109,17 @@ jobs:
          files: ./clover.xml
          flags: phpunit-files-external-s3

+      - name: Upload test results
+        if: ${{ !cancelled() }}
+        uses: codecov/test-results-action@47f89e9acb64b76debcd5ea40642d25a4adced9f # v1.1.1
+        with:
+          flags: phpunit-files-external-s3
+
+      - name: Nextcloud logs
+        if: always()
+        run: |
+          cat data/nextcloud.log
+
      - name: S3 logs
        if: always()
        run: |
@@ -125,9 +137,9 @@ jobs:
        php-versions: ['8.1', '8.2', '8.4']
        include:
          - php-versions: '8.3'
-            coverage: true
+            coverage: ${{ github.event_name != 'pull_request' }}

-    name: php${{ matrix.php-versions }}-s3
+    name: php${{ matrix.php-versions }}-s3-localstack

    services:
      localstack:
@@ -146,7 +158,7 @@ jobs:
          submodules: true

      - name: Set up php ${{ matrix.php-versions }}
-        uses: shivammathur/setup-php@c541c155eee45413f5b09a52248675b1a2575231 #v2.31.1
+        uses: shivammathur/setup-php@cf4cade2721270509d5b1c766ab3549210a39a2a #v2.33.0
        with:
          php-version: ${{ matrix.php-versions }}
          # https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html#prerequisites-for-manual-installation
@@ -178,6 +190,12 @@ jobs:
          files: ./clover.xml
          flags: phpunit-files-external-s3

+      - name: Upload test results
+        if: ${{ !cancelled() }}
+        uses: codecov/test-results-action@47f89e9acb64b76debcd5ea40642d25a4adced9f # v1.1.1
+        with:
+          flags: phpunit-files-external-s3
+
      - name: S3 logs
        if: always()
        run: |
@@ -43,7 +43,6 @@ jobs:
    if: ${{ github.repository_owner != 'nextcloud-gmbh' && needs.changes.outputs.src != 'false' }}

    strategy:
-      # do not stop on another job's failure
      fail-fast: false
      matrix:
        php-versions: ['8.1', '8.4']
@@ -68,7 +67,7 @@ jobs:
          if [[ '${{ matrix.sftpd }}' == 'openssh' ]]; then docker run -p 2222:22 --name sftp -d -v /tmp/sftp:/home/test atmoz/sftp 'test:test:::data'; fi

      - name: Set up php ${{ matrix.php-versions }}
-        uses: shivammathur/setup-php@c541c155eee45413f5b09a52248675b1a2575231 #v2.31.1
+        uses: shivammathur/setup-php@cf4cade2721270509d5b1c766ab3549210a39a2a #v2.33.0
        with:
          php-version: ${{ matrix.php-versions }}
          # https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html#prerequisites-for-manual-installation
@@ -89,7 +88,8 @@ jobs:
        run: composer run test:files_external -- \
          apps/files_external/tests/Storage/SftpTest.php \
          apps/files_external/tests/Storage/SFTP_KeyTest.php \
-          ${{ matrix.coverage && ' --coverage-clover ./clover.xml' || '' }}
+          --log-junit junit.xml \
+          ${{ matrix.coverage && '--coverage-clover ./clover.xml' || '' }}

      - name: Upload code coverage
        if: ${{ !cancelled() && matrix.coverage }}
@@ -98,6 +98,12 @@ jobs:
          files: ./clover.xml
          flags: phpunit-files-external-sftp

+      - name: Upload test results
+        if: ${{ !cancelled() }}
+        uses: codecov/test-results-action@47f89e9acb64b76debcd5ea40642d25a4adced9f # v1.1.1
+        with:
+          flags: phpunit-files-external-sftp
+
      - name: sftpd logs
        if: always()
        run: |
@@ -43,6 +43,7 @@ jobs:
    if: ${{ github.repository_owner != 'nextcloud-gmbh' && needs.changes.outputs.src != 'false' }}

    strategy:
+      fail-fast: false
      matrix:
        php-versions: ['8.1']
        include:
@@ -65,7 +66,7 @@ jobs:
          submodules: true

      - name: Set up php ${{ matrix.php-versions }}
-        uses: shivammathur/setup-php@c541c155eee45413f5b09a52248675b1a2575231 #v2.31.1
+        uses: shivammathur/setup-php@cf4cade2721270509d5b1c766ab3549210a39a2a #v2.33.0
        with:
          php-version: ${{ matrix.php-versions }}
          # https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html#prerequisites-for-manual-installation
@@ -92,9 +93,10 @@ jobs:
          apps/files_external/tests/env/wait-for-connection 127.0.0.1 445 60

      - name: PHPUnit
-        run: composer run test:files_external -- --verbose \
+        run: composer run test:files_external -- \
          apps/files_external/tests/Storage/SmbTest.php \
-          ${{ matrix.coverage && ' --coverage-clover ./clover.xml' || '' }}
+          --log-junit junit.xml \
+          ${{ matrix.coverage && '--coverage-clover ./clover.xml' || '' }}

      - name: Upload code coverage
        if: ${{ !cancelled() && matrix.coverage }}
@@ -103,6 +105,12 @@ jobs:
          files: ./clover.xml
          flags: phpunit-files-external-smb

+      - name: Upload test results
+        if: ${{ !cancelled() }}
+        uses: codecov/test-results-action@47f89e9acb64b76debcd5ea40642d25a4adced9f # v1.1.1
+        with:
+          flags: phpunit-files-external-smb
+
  files-external-smb-summary:
    runs-on: ubuntu-latest-low
    needs: [changes, files-external-smb]
@@ -43,6 +43,7 @@ jobs:
    if: ${{ github.repository_owner != 'nextcloud-gmbh' && needs.changes.outputs.src != 'false' }}

    strategy:
+      fail-fast: false
      matrix:
        php-versions: ['8.1', '8.2', '8.3', '8.4']
        include:
@@ -65,7 +66,7 @@ jobs:
          submodules: true

      - name: Set up php ${{ matrix.php-versions }}
-        uses: shivammathur/setup-php@c541c155eee45413f5b09a52248675b1a2575231 #v2.31.1
+        uses: shivammathur/setup-php@cf4cade2721270509d5b1c766ab3549210a39a2a #v2.33.0
        with:
          php-version: ${{ matrix.php-versions }}
          # https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html#prerequisites-for-manual-installation
@@ -89,9 +90,10 @@ jobs:
          curl -f -m 1 --retry-connrefused --retry 10 --retry-delay 10 http://test:pass@localhost:8081/webdav/

      - name: PHPUnit
-        run: composer run test:files_external -- --verbose \
+        run: composer run test:files_external -- \
          apps/files_external/tests/Storage/WebdavTest.php \
-          ${{ matrix.coverage && ' --coverage-clover ./clover.xml' || '' }}
+          --log-junit junit.xml \
+          ${{ matrix.coverage && '--coverage-clover ./clover.xml' || '' }}

      - name: Upload code coverage
        if: ${{ !cancelled() && matrix.coverage }}
@@ -100,6 +102,12 @@ jobs:
          files: ./clover.xml
          flags: phpunit-files-external-webdav

+      - name: Upload test results
+        if: ${{ !cancelled() }}
+        uses: codecov/test-results-action@47f89e9acb64b76debcd5ea40642d25a4adced9f # v1.1.1
+        with:
+          flags: phpunit-files-external-webdav
+
  files-external-webdav-summary:
    runs-on: ubuntu-latest-low
    needs: [changes, files-external-webdav-apache]
@@ -42,6 +42,7 @@ jobs:
    if: ${{ github.repository_owner != 'nextcloud-gmbh' && needs.changes.outputs.src != 'false' }}

    strategy:
+      fail-fast: false
      matrix:
        php-versions: ['8.1', '8.2', '8.3', '8.4']
        include:
@@ -58,7 +59,7 @@ jobs:
          submodules: true

      - name: Set up php ${{ matrix.php-versions }}
-        uses: shivammathur/setup-php@c541c155eee45413f5b09a52248675b1a2575231 #v2.31.1
+        uses: shivammathur/setup-php@cf4cade2721270509d5b1c766ab3549210a39a2a #v2.33.0
        with:
          php-version: ${{ matrix.php-versions }}
          # https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html#prerequisites-for-manual-installation
@@ -79,7 +80,8 @@ jobs:

      - name: PHPUnit
        run: composer run test:files_external -- \
-          ${{ matrix.coverage && ' --coverage-clover ./clover.xml' || '' }}
+          --log-junit junit.xml \
+          ${{ matrix.coverage && '--coverage-clover ./clover.xml' || '' }}

      - name: Upload code coverage
        if: ${{ !cancelled() && matrix.coverage }}
@@ -88,6 +90,12 @@ jobs:
          files: ./clover.xml
          flags: phpunit-files-external-generic

+      - name: Upload test results
+        if: ${{ !cancelled() }}
+        uses: codecov/test-results-action@47f89e9acb64b76debcd5ea40642d25a4adced9f # v1.1.1
+        with:
+          flags: phpunit-files-external-generic
+
  files-external-summary:
    runs-on: ubuntu-latest-low
    needs: [changes, files-external-generic ]
@@ -43,7 +43,6 @@ jobs:
    if: needs.changes.outputs.src != 'false' && github.repository_owner != 'nextcloud-gmbh'

    strategy:
-      # do not stop on another job's failure
      fail-fast: false
      matrix:
        php-versions: ['8.1']
@@ -60,7 +59,7 @@ jobs:
            submodules: true

        - name: Set up php ${{ matrix.php-versions }}
-          uses: shivammathur/setup-php@c541c155eee45413f5b09a52248675b1a2575231 #v2.31.1
+          uses: shivammathur/setup-php@cf4cade2721270509d5b1c766ab3549210a39a2a #v2.33.0
          with:
            php-version: ${{ matrix.php-versions }}
            # https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html#prerequisites-for-manual-installation
@@ -71,7 +70,7 @@ jobs:
            GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

        - name: Set up Python
-          uses: LizardByte/setup-python-action@f4367d0377eceec7e5e26da8f3863dd365b95a94 # v2025.426.160528
+          uses: LizardByte/setup-python-action@6fe61189717d4cb073a3219e234749125f53b5c2 # v2025.530.174035
          with:
            python-version: '2.7'

@@ -43,7 +43,6 @@ jobs:
    if: needs.changes.outputs.src != 'false' && github.repository_owner != 'nextcloud-gmbh'

    strategy:
-      # do not stop on another job's failure
      fail-fast: false
      matrix:
        php-versions: ['8.1']
@@ -59,7 +58,7 @@ jobs:
            submodules: true

        - name: Set up php ${{ matrix.php-versions }}
-          uses: shivammathur/setup-php@c541c155eee45413f5b09a52248675b1a2575231 #v2.31.1
+          uses: shivammathur/setup-php@cf4cade2721270509d5b1c766ab3549210a39a2a #v2.33.0
          with:
            php-version: ${{ matrix.php-versions }}
            # https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html#prerequisites-for-manual-installation
@@ -43,7 +43,6 @@ jobs:
    if: needs.changes.outputs.src != 'false' && github.repository_owner != 'nextcloud-gmbh'

    strategy:
-      # do not stop on another job's failure
      fail-fast: false
      matrix:
        php-versions: ['8.1']
@@ -66,15 +66,15 @@ jobs:
          - 'openldap_numerical_features'
          - 'ldap_features'
          - 'remoteapi_features'
+          - 'routing_features'
          - 'setup_features'
          - 'sharees_features'
          - 'sharing_features'
-          - 'theming_features'
          - 'videoverification_features'

        php-versions: ['8.1']
-        spreed-versions: ['stable31']
-        activity-versions: ['stable31']
+        spreed-versions: ['main']
+        activity-versions: ['master']

    services:
      redis:
@@ -164,7 +164,7 @@ jobs:
      - name: Print logs
        if: always()
        run: |
-          cat data/nextcloud.log
+          cat $(./occ log:file |grep "Log file"|cut -d" " -f3)
          docker ps -a
          docker ps -aq | while read container ; do IMAGE=$(docker inspect --format='{{.Config.Image}}' $container); echo $IMAGE; docker logs $container; echo "\n\n" ; done

@@ -110,6 +110,10 @@ jobs:
        with:
          files: ./coverage/lcov.info

+      - name: Upload test results
+        if: ${{ !cancelled() }}
+        uses: codecov/test-results-action@47f89e9acb64b76debcd5ea40642d25a4adced9f # v1.1.1
+
  jsunit:
    runs-on: ubuntu-latest
    needs: [versions, changes]
@@ -47,6 +47,7 @@ jobs:
    if: ${{ github.repository_owner != 'nextcloud-gmbh' && needs.changes.outputs.src != 'false' }}

    strategy:
+      fail-fast: false
      matrix:
        php-versions: ['8.1', '8.2']
        include:
@@ -98,14 +99,14 @@ jobs:
          cp tests/redis.config.php config/
          cp tests/preseed-config.php config/config.php
          ./occ maintenance:install --verbose --database=sqlite --database-name=nextcloud --database-host=127.0.0.1 --database-user=root --database-pass=rootpassword --admin-user admin --admin-pass password
-          php -f tests/enable_all.php | grep -i -C9999 error && echo "Error during app setup" && exit 1 || exit 0
+          php -f tests/enable_all.php

      - name: PHPUnit
        env:
          OBJECT_STORE: azure
          OBJECT_STORE_KEY: nextcloud
          OBJECT_STORE_SECRET: bmV4dGNsb3Vk
-        run: composer run test -- --group PRIMARY-azure ${{ matrix.coverage && ' --coverage-clover ./clover.xml' || '' }}
+        run: composer run test -- --group PRIMARY-azure --log-junit junit.xml ${{ matrix.coverage && '--coverage-clover ./clover.xml' || '' }}

      - name: Upload code coverage
        if: ${{ !cancelled() && matrix.coverage }}
@@ -114,6 +115,12 @@ jobs:
          files: ./clover.xml
          flags: phpunit-azure

+      - name: Upload test results
+        if: ${{ !cancelled() }}
+        uses: codecov/test-results-action@47f89e9acb64b76debcd5ea40642d25a4adced9f # v1.1.1
+        with:
+          flags: phpunit-azure
+
      - name: Azurite logs
        if: always()
        run: |
@@ -47,6 +47,7 @@ jobs:
    if: ${{ github.repository_owner != 'nextcloud-gmbh' && needs.changes.outputs.src != 'false' }}

    strategy:
+      fail-fast: false
      matrix:
        php-versions: ['8.1', '8.2']
        include:
@@ -99,7 +100,7 @@ jobs:
          cp tests/redis.config.php config/
          cp tests/preseed-config.php config/config.php
          ./occ maintenance:install --verbose --database=sqlite --database-name=nextcloud --database-host=127.0.0.1 --database-user=root --database-pass=rootpassword --admin-user admin --admin-pass password
-          php -f tests/enable_all.php | grep -i -C9999 error && echo "Error during app setup" && exit 1 || exit 0
+          php -f tests/enable_all.php

      - name: Wait for S3
        run: |
@@ -111,7 +112,7 @@ jobs:
          OBJECT_STORE: s3
          OBJECT_STORE_KEY: nextcloud
          OBJECT_STORE_SECRET: bWluaW8tc2VjcmV0LWtleS1uZXh0Y2xvdWQ=
-        run: composer run test -- --group PRIMARY-s3 ${{ matrix.coverage && ' --coverage-clover ./clover.xml' || '' }}
+        run: composer run test -- --group PRIMARY-s3 --log-junit junit.xml ${{ matrix.coverage && '--coverage-clover ./clover.xml' || '' }}

      - name: Upload code coverage
        if: ${{ !cancelled() && matrix.coverage }}
@@ -120,6 +121,12 @@ jobs:
          files: ./clover.xml
          flags: phpunit-s3

+      - name: Upload test results
+        if: ${{ !cancelled() }}
+        uses: codecov/test-results-action@47f89e9acb64b76debcd5ea40642d25a4adced9f # v1.1.1
+        with:
+          flags: phpunit-s3
+
      - name: S3 logs
        if: always()
        run: |
@@ -47,6 +47,7 @@ jobs:
    if: ${{ github.repository_owner != 'nextcloud-gmbh' && needs.changes.outputs.src != 'false' }}

    strategy:
+      fail-fast: false
      matrix:
        php-versions: ['8.1', '8.2']
        include:
@@ -95,13 +96,13 @@ jobs:
          cp tests/redis.config.php config/
          cp tests/preseed-config.php config/config.php
          ./occ maintenance:install --verbose --database=sqlite --database-name=nextcloud --database-host=127.0.0.1 --database-user=root --database-pass=rootpassword --admin-user admin --admin-pass password
-          php -f tests/enable_all.php | grep -i -C9999 error && echo "Error during app setup" && exit 1 || exit 0
+          php -f tests/enable_all.php

      - name: PHPUnit
        env:
          OBJECT_STORE: swift
          OBJECT_STORE_SECRET: veryfast
-        run: composer run test -- --group PRIMARY-swift ${{ matrix.coverage && ' --coverage-clover ./clover.xml' || '' }}
+        run: composer run test -- --group PRIMARY-swift --log-junit junit.xml ${{ matrix.coverage && '--coverage-clover ./clover.xml' || '' }}

      - name: Upload code coverage
        if: ${{ !cancelled() && matrix.coverage }}
@@ -110,6 +111,12 @@ jobs:
          files: ./clover.xml
          flags: phpunit-swift

+      - name: Upload test results
+        if: ${{ !cancelled() }}
+        uses: codecov/test-results-action@47f89e9acb64b76debcd5ea40642d25a4adced9f # v1.1.1
+        with:
+          flags: phpunit-swift
+
      - name: Swift logs
        if: always()
        run: |
@@ -71,7 +71,7 @@ jobs:
            curl -s -u test:test -T README.md http://localhost:8080/remote.php/dav/files/test/new_file.txt
            curl -s -u test:test -X DELETE http://localhost:8080/remote.php/dav/files/test/new_file.txt
          output: before.json
-          profiler-branch: stable31
+          profiler-branch: master

      - name: Apply PR # zizmor: ignore[template-injection]
        run: |
@@ -93,7 +93,7 @@ jobs:
            curl -s -u test:test -T README.md http://localhost:8080/remote.php/dav/files/test/new_file.txt
            curl -s -u test:test -X DELETE http://localhost:8080/remote.php/dav/files/test/new_file.txt
          output: after.json
-          profiler-branch: stable31
+          profiler-branch: master
          compare-with: before.json

      - name: Upload profiles
@@ -7,6 +7,7 @@ on:
    paths:
      - 'version.php'
      - '.github/workflows/phpunit-32bits.yml'
+      - 'tests/phpunit-autotest.xml'
  workflow_dispatch:
  schedule:
    - cron: "15 1 * * 1-6"
@@ -27,6 +28,7 @@ jobs:
    container: shivammathur/node:latest-i386

    strategy:
+      fail-fast: false
      matrix:
        php-versions: ['8.1','8.3']

@@ -46,7 +48,7 @@ jobs:
        uses: shivammathur/setup-php@cf4cade2721270509d5b1c766ab3549210a39a2a #v2.33.0
        with:
          php-version: ${{ matrix.php-versions }}
-          extensions: ctype, curl, dom, fileinfo, gd, imagick, intl, json, mbstring, openssl, pdo_sqlite, posix, sqlite, xml, zip, apcu
+          extensions: bz2, ctype, curl, dom, fileinfo, gd, iconv, imagick, intl, json, libxml, mbstring, openssl, pcntl, posix, redis, session, simplexml, xmlreader, xmlwriter, zip, zlib, sqlite, pdo_sqlite, apcu, ldap
          coverage: none
          ini-file: development
          ini-values:
@@ -54,14 +56,16 @@ jobs:
        env:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

+      - name: Set up dependencies
+        run: composer i
+
      - name: Set up Nextcloud
        env:
          DB_PORT: 4444
        run: |
-          composer install
          mkdir data
          ./occ maintenance:install --verbose --database=sqlite --database-name=nextcloud --database-host=127.0.0.1 --database-port=$DB_PORT --database-user=autotest --database-pass=rootpassword --admin-user admin --admin-pass admin
-          php -f index.php
+          php -f tests/enable_all.php

      - name: PHPUnit
        run: composer run test -- --exclude-group PRIMARY-azure,PRIMARY-s3,PRIMARY-swift,Memcached,Redis,RoutingWeirdness
@@ -57,6 +57,7 @@ jobs:
    if: needs.changes.outputs.src != 'false'

    strategy:
+      fail-fast: false
      matrix:
        php-versions: ['8.1']
        mariadb-versions: ['10.3', '10.6', '10.11', '11.4']
@@ -121,10 +122,10 @@ jobs:
          cp tests/redis.config.php config/
          cp tests/preseed-config.php config/config.php
          ./occ maintenance:install --verbose --database=mysql --database-name=nextcloud --database-host=127.0.0.1 --database-port=$DB_PORT --database-user=root --database-pass=rootpassword --admin-user admin --admin-pass admin
-          php -f tests/enable_all.php | grep -i -C9999 error && echo "Error during app setup" && exit 1 || exit 0
+          php -f tests/enable_all.php

      - name: PHPUnit
-        run: composer run test:db ${{ matrix.coverage && ' -- --coverage-clover ./clover.db.xml' || '' }}
+        run: composer run test:db -- --log-junit junit.xml ${{ matrix.coverage && '--coverage-clover ./clover.db.xml' || '' }}

      - name: Upload db code coverage
        if: ${{ !cancelled() && matrix.coverage }}
@@ -133,6 +134,12 @@ jobs:
          files: ./clover.db.xml
          flags: phpunit-mariadb

+      - name: Upload test results
+        if: ${{ !cancelled() }}
+        uses: codecov/test-results-action@47f89e9acb64b76debcd5ea40642d25a4adced9f # v1.1.1
+        with:
+          flags: phpunit-mariadb
+
  summary:
    permissions:
      contents: none
@@ -54,6 +54,7 @@ jobs:
    if: needs.changes.outputs.src != 'false'

    strategy:
+      fail-fast: false
      matrix:
        php-versions: ['8.1', '8.3', '8.4']
        include:
@@ -95,10 +96,10 @@ jobs:
          mkdir data
          cp tests/preseed-config.php config/config.php
          ./occ maintenance:install --verbose --database=sqlite --database-name=nextcloud --database-user=root --database-pass=rootpassword --admin-user admin --admin-pass admin
-          php -f tests/enable_all.php | grep -i -C9999 error && echo "Error during app setup" && exit 1 || exit 0
+          php -f tests/enable_all.php

      - name: PHPUnit memcached tests
-        run: composer run test -- --group Memcache,Memcached ${{ matrix.coverage && '--coverage-clover ./clover.xml' || '' }}
+        run: composer run test -- --group Memcache,Memcached --log-junit junit.xml ${{ matrix.coverage && '--coverage-clover ./clover.xml' || '' }}

      - name: Upload code coverage
        if: ${{ !cancelled() && matrix.coverage }}
@@ -107,6 +108,12 @@ jobs:
          files: ./clover.xml
          flags: phpunit-memcached

+      - name: Upload test results
+        if: ${{ !cancelled() }}
+        uses: codecov/test-results-action@47f89e9acb64b76debcd5ea40642d25a4adced9f # v1.1.1
+        with:
+          flags: phpunit-memcached
+
      - name: Print logs
        if: always()
        run: |
@@ -54,6 +54,7 @@ jobs:
    if: needs.changes.outputs.src != 'false'

    strategy:
+      fail-fast: false
      matrix:
        php-versions: ['8.1']
        mysql-versions: ['8.4']
@@ -153,10 +154,10 @@ jobs:
          cp tests/redis.config.php config/
          cp tests/preseed-config.php config/config.php
          ./occ maintenance:install --verbose --database=mysql --database-name=nextcloud --database-host=127.0.0.1 --database-port=$DB_PORT --database-user=root --database-pass=rootpassword --admin-user admin --admin-pass admin
-          php -f tests/enable_all.php | grep -i -C9999 error && echo "Error during app setup" && exit 1 || exit 0
+          php -f tests/enable_all.php

      - name: PHPUnit
-        run: composer run test:db ${{ matrix.coverage && ' -- --coverage-clover ./clover.db.xml' || '' }}
+        run: composer run test:db -- --log-junit junit.xml ${{ matrix.coverage && '--coverage-clover ./clover.db.xml' || '' }}

      - name: Upload db code coverage
        if: ${{ !cancelled() && matrix.coverage }}
@@ -165,6 +166,12 @@ jobs:
          files: ./clover.db.xml
          flags: phpunit-mysql

+      - name: Upload test results
+        if: ${{ !cancelled() }}
+        uses: codecov/test-results-action@47f89e9acb64b76debcd5ea40642d25a4adced9f # v1.1.1
+        with:
+          flags: phpunit-mysql
+
      - name: Print logs
        if: always()
        run: |
@@ -57,6 +57,7 @@ jobs:
    if: needs.changes.outputs.src != 'false'

    strategy:
+      fail-fast: false
      matrix:
        php-versions: ['8.1']
        mysql-versions: ['8.0', '8.4']
@@ -121,10 +122,10 @@ jobs:
          cp tests/redis.config.php config/
          cp tests/preseed-config.php config/config.php
          ./occ maintenance:install --verbose --database=mysql --database-name=nextcloud --database-host=127.0.0.1 --database-port=$DB_PORT --database-user=root --database-pass=rootpassword --admin-user admin --admin-pass admin
-          php -f tests/enable_all.php | grep -i -C9999 error && echo "Error during app setup" && exit 1 || exit 0
+          php -f tests/enable_all.php

      - name: PHPUnit
-        run: composer run test:db ${{ matrix.coverage && ' -- --coverage-clover ./clover.db.xml' || '' }}
+        run: composer run test:db -- --log-junit junit.xml ${{ matrix.coverage && '--coverage-clover ./clover.db.xml' || '' }}

      - name: Upload db code coverage
        if: ${{ !cancelled() && matrix.coverage }}
@@ -133,6 +134,12 @@ jobs:
          files: ./clover.db.xml
          flags: phpunit-mysql

+      - name: Upload test results
+        if: ${{ !cancelled() }}
+        uses: codecov/test-results-action@47f89e9acb64b76debcd5ea40642d25a4adced9f # v1.1.1
+        with:
+          flags: phpunit-mysql
+
      - name: Print logs
        if: always()
        run: |
@@ -57,6 +57,7 @@ jobs:
    if: needs.changes.outputs.src != 'false'

    strategy:
+      fail-fast: false
      matrix:
        php-versions: ['8.1', '8.3', '8.4']
        include:
@@ -101,10 +102,10 @@ jobs:
          cp tests/redis.config.php config/
          cp tests/preseed-config.php config/config.php
          ./occ maintenance:install --verbose --database=sqlite --database-name=nextcloud --database-user=root --database-pass=rootpassword --admin-user admin --admin-pass admin
-          php -f tests/enable_all.php | grep -i -C9999 error && echo "Error during app setup" && exit 1 || exit 0
+          php -f tests/enable_all.php

      - name: PHPUnit nodb testsuite
-        run: composer run test -- --exclude-group DB,SLOWDB ${{ matrix.coverage && ' --coverage-clover ./clover.nodb.xml' || '' }}
+        run: composer run test -- --exclude-group DB,SLOWDB --log-junit junit.xml ${{ matrix.coverage && '--coverage-clover ./clover.nodb.xml' || '' }}

      - name: Upload nodb code coverage
        if: ${{ !cancelled() && matrix.coverage }}
@@ -113,6 +114,12 @@ jobs:
          files: ./clover.nodb.xml
          flags: phpunit-nodb

+      - name: Upload test results
+        if: ${{ !cancelled() }}
+        uses: codecov/test-results-action@47f89e9acb64b76debcd5ea40642d25a4adced9f # v1.1.1
+        with:
+          flags: phpunit-nodb
+
      - name: Print logs
        if: always()
        run: |
@@ -47,7 +47,6 @@ jobs:
    if: ${{ github.repository_owner != 'nextcloud-gmbh' && needs.changes.outputs.src != 'false' }}

    strategy:
-      # do not stop on another job's failure
      fail-fast: false
      matrix:
        php-versions: ['8.1']
@@ -96,7 +95,7 @@ jobs:
          cp tests/redis.config.php config/
          cp tests/preseed-config.php config/config.php
          ./occ maintenance:install --verbose --database=sqlite --database-name=nextcloud --database-host=127.0.0.1 --database-user=root --database-pass=rootpassword --admin-user admin --admin-pass password
-          php -f tests/enable_all.php | grep -i -C9999 error && echo "Error during app setup" && exit 1 || exit 0
+          php -f tests/enable_all.php

      - name: Wait for S3
        run: |
@@ -126,10 +126,10 @@ jobs:
          cp tests/redis.config.php config/
          cp tests/preseed-config.php config/config.php
          ./occ maintenance:install --verbose --database=oci --database-name=${{ matrix.oracle-versions < 23 && 'XE' || 'FREE'  }} --database-host=127.0.0.1 --database-port=1521 --database-user=system --database-pass=oracle --admin-user admin --admin-pass admin
-          php -f tests/enable_all.php | grep -i -C9999 error && echo "Error during app setup" && exit 1 || exit 0
+          php -f tests/enable_all.php

      - name: PHPUnit
-        run: composer run test:db ${{ matrix.coverage && ' -- --coverage-clover ./clover.db.xml' || '' }}
+        run: composer run test:db -- --log-junit junit.xml ${{ matrix.coverage && '--coverage-clover ./clover.db.xml' || '' }}

      - name: Upload db code coverage
        if: ${{ !cancelled() && matrix.coverage }}
@@ -138,6 +138,12 @@ jobs:
          files: ./clover.db.xml
          flags: phpunit-oci

+      - name: Upload test results
+        if: ${{ !cancelled() }}
+        uses: codecov/test-results-action@47f89e9acb64b76debcd5ea40642d25a4adced9f # v1.1.1
+        with:
+          flags: phpunit-oci
+
      - name: Run repair steps
        run: |
          ./occ maintenance:repair --include-expensive
@@ -57,6 +57,7 @@ jobs:
    if: needs.changes.outputs.src != 'false'

    strategy:
+      fail-fast: false
      matrix:
        php-versions: ['8.1']
        # To keep the matrix smaller we ignore PostgreSQL versions in between as we already test the minimum and the maximum
@@ -116,10 +117,10 @@ jobs:
          cp tests/redis.config.php config/
          cp tests/preseed-config.php config/config.php
          ./occ maintenance:install --verbose --database=pgsql --database-name=nextcloud --database-host=127.0.0.1 --database-port=$DB_PORT --database-user=root --database-pass=rootpassword --admin-user admin --admin-pass admin
-          php -f tests/enable_all.php | grep -i -C9999 error && echo "Error during app setup" && exit 1 || exit 0
+          php -f tests/enable_all.php

      - name: PHPUnit database tests
-        run: composer run test:db ${{ matrix.coverage && ' -- --coverage-clover ./clover.db.xml' || '' }}
+        run: composer run test:db -- --log-junit junit.xml ${{ matrix.coverage && '--coverage-clover ./clover.db.xml' || '' }}

      - name: Upload db code coverage
        if: ${{ !cancelled() && matrix.coverage }}
@@ -128,6 +129,12 @@ jobs:
          files: ./clover.db.xml
          flags: phpunit-postgres

+      - name: Upload test results
+        if: ${{ !cancelled() }}
+        uses: codecov/test-results-action@47f89e9acb64b76debcd5ea40642d25a4adced9f # v1.1.1
+        with:
+          flags: phpunit-postgres
+
      - name: Run repair steps
        run: |
          ./occ maintenance:repair --include-expensive
@@ -57,6 +57,7 @@ jobs:
    if: needs.changes.outputs.src != 'false'

    strategy:
+      fail-fast: false
      matrix:
        php-versions: ['8.2', '8.3', '8.4']
        include:
@@ -99,13 +100,13 @@ jobs:
          cp tests/redis.config.php config/
          cp tests/preseed-config.php config/config.php
          ./occ maintenance:install --verbose --database=sqlite --database-name=nextcloud --database-user=root --database-pass=rootpassword --admin-user admin --admin-pass admin
-          php -f tests/enable_all.php | grep -i -C9999 error && echo "Error during app setup" && exit 1 || exit 0
+          php -f tests/enable_all.php

      - name: Nextcloud debug information
        run: ./occ app:list && echo "======= System config =======" && ./occ config:list system

      - name: PHPUnit database tests
-        run: composer run test:db ${{ matrix.coverage && ' -- --coverage-clover ./clover.db.xml' || '' }}
+        run: composer run test:db -- --log-junit junit.xml ${{ matrix.coverage && '--coverage-clover ./clover.db.xml' || '' }}

      - name: Upload db code coverage
        if: ${{ !cancelled() && matrix.coverage }}
@@ -114,6 +115,12 @@ jobs:
          files: ./clover.db.xml
          flags: phpunit-sqlite

+      - name: Upload test results
+        if: ${{ !cancelled() }}
+        uses: codecov/test-results-action@47f89e9acb64b76debcd5ea40642d25a4adced9f # v1.1.1
+        with:
+          flags: phpunit-sqlite
+
      - name: Print logs
        if: always()
        run: |
@@ -51,5 +51,5 @@ jobs:
            (If you believe you should not receive this message, you can add yourself to the [blocklist](https://github.com/nextcloud/.github/blob/master/non-community-usernames.txt).)
          days-before-feedback: 14
          start-date: '2024-04-30'
-          exempt-authors: '${{ steps.blocklist.outputs.blocklist }},${{ steps.scrape.outputs.users }},nextcloud-command,nextcloud-android-bot'
+          exempt-authors: '${{ steps.blocklist.outputs.blocklist }},${{ steps.scrape.outputs.users }}'
          exempt-bots: true
@@ -17,7 +17,7 @@ jobs:
    strategy:
      fail-fast: false
      matrix:
-        branches: ['master', 'stable30', 'stable29',  'stable28',  'stable27', 'stable26', 'stable25', 'stable24', 'stable23', 'stable22']
+        branches: ['master', 'stable31', 'stable30', 'stable29',  'stable28',  'stable27', 'stable26', 'stable25', 'stable24', 'stable23', 'stable22']

    name: update-ca-certificate-bundle-${{ matrix.branches }}

@@ -17,7 +17,7 @@ jobs:
    strategy:
      fail-fast: false
      matrix:
-        branches: ['master', 'stable30', 'stable29',  'stable28',  'stable27', 'stable26', 'stable25', 'stable24', 'stable23', 'stable22']
+        branches: ['master', 'stable31', 'stable30', 'stable29',  'stable28',  'stable27', 'stable26', 'stable25', 'stable24', 'stable23', 'stable22']

    name: update-code-signing-crl-${{ matrix.branches }}

@@ -0,0 +1,127 @@
+# SPDX-FileCopyrightText: 2022 Nextcloud GmbH and Nextcloud contributors
+# SPDX-License-Identifier: MIT
+name: Update min supported desktop version
+
+on:
+  workflow_dispatch:
+  schedule:
+    - cron: "0 0 * * 1"
+
+permissions:
+  contents: read
+
+jobs:
+  update-minimum-supported-desktop-version:
+    runs-on: ubuntu-latest-low
+
+    steps:
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        with:
+          persist-credentials: false
+          submodules: true
+
+      - name: Download desktop client version file from 5 years ago
+        id: download
+        run: |
+          # Create a temporary directory for the downloaded file
+          mkdir -p tmp
+
+          # Download the version file from the provided URL
+          VERSION_FILE_URL="https://github.com/nextcloud/desktop/raw/@%7B5.years.ago%7D/VERSION.cmake"
+
+          # Download the file using curl
+          curl -s -L "$VERSION_FILE_URL" -o tmp/VERSION.cmake
+
+          if [ ! -f "tmp/VERSION.cmake" ]; then
+            echo "Failed to download VERSION.cmake file"
+            exit 1
+          fi
+
+          echo "VERSION_FILE=tmp/VERSION.cmake" >> $GITHUB_OUTPUT
+          echo "Downloaded version file to tmp/VERSION.cmake"
+
+      - name: Extract version info
+        id: extract-version
+        run: |
+          # Path to the downloaded version file
+          VERSION_FILE="${{ steps.download.outputs.VERSION_FILE }}"
+
+          # Extract major, minor, patch versions
+          MAJOR=$(grep "VERSION_MAJOR" $VERSION_FILE | grep -o '[0-9]\+')
+          MINOR=$(grep "VERSION_MINOR" $VERSION_FILE | grep -o '[0-9]\+')
+          PATCH=$(grep "VERSION_PATCH" $VERSION_FILE | grep -o '[0-9]\+')
+
+          # Construct the version string
+          VERSION="$MAJOR.$MINOR.$PATCH"
+
+          # Validate format: xx.xx.xx where each x is a digit
+          if ! [[ "$VERSION" =~ ^[0-9]+\.[0-9]+\.[0-9]+$ ]]; then
+            echo "Error: Extracted version '$VERSION' does not match required format (xx.xx.xx)"
+            exit 1
+          fi
+
+          rm -rf tmp
+
+          echo "VERSION=$VERSION" >> $GITHUB_OUTPUT
+          echo "Extracted Version: $VERSION"
+
+      - name: Update files with new version ${{ steps.extract-version.outputs.VERSION }}
+        id: update-files
+        run: |
+          VERSION="${{ steps.extract-version.outputs.VERSION }}"
+
+          # Define the files to update
+          DAV_FILE="apps/dav/lib/Connector/Sabre/BlockLegacyClientPlugin.php"
+          CONFIG_FILE="config/config.sample.php"
+
+          # Check if files exist
+          if [ ! -f "$DAV_FILE" ]; then
+            echo "Error: DAV file not found at $DAV_FILE"
+            exit 1
+          fi
+
+          if [ ! -f "$CONFIG_FILE" ]; then
+            echo "Error: Config file not found at $CONFIG_FILE"
+            exit 1
+          fi
+
+          # Update the DAV file - replace the version in the specific line
+          sed -i "s/\('minimum\.supported\.desktop\.version', '\)[0-9]\+\.[0-9]\+\.[0-9]\+'/\1$VERSION'/g" "$DAV_FILE"
+          echo "Updated $DAV_FILE"
+
+          # Update the config sample file
+          PREV_VERSION=$(grep "'minimum.supported.desktop.version'" "$CONFIG_FILE" | grep -o '[0-9]\+\.[0-9]\+\.[0-9]\+')
+          sed -i "s/Defaults to \`\`$PREV_VERSION\`\`/Defaults to \`\`$VERSION\`\`/" "$CONFIG_FILE"
+          sed -i "s/'minimum\.supported\.desktop\.version' => '[0-9]\+\.[0-9]\+\.[0-9]\+'/'minimum.supported.desktop.version' => '$VERSION'/g" "$CONFIG_FILE"
+          echo "Updated $CONFIG_FILE"
+
+          # Check if any changes were made
+          if [ -n "$(git diff "$DAV_FILE" "$CONFIG_FILE")" ]; then
+            echo "CHANGES_MADE=true" >> $GITHUB_OUTPUT
+            echo "Changes were made to the files"
+            git diff "$DAV_FILE" "$CONFIG_FILE"
+          else
+            echo "CHANGES_MADE=false" >> $GITHUB_OUTPUT
+            echo "No changes were needed (versions might already be up to date)"
+          fi
+
+      - name: Create Pull Request
+        uses: peter-evans/create-pull-request@271a8d0340265f705b14b6d32b9829c1cb33d45e
+        if: steps.update-files.outputs.CHANGES_MADE == 'true'
+        with:
+          token: ${{ secrets.COMMAND_BOT_PAT }}
+          commit-message: "chore: Update minimum supported desktop version"
+          committer: GitHub <noreply@github.com>
+          author: nextcloud-command <nextcloud-command@users.noreply.github.com>
+          signoff: true
+          branch: "automated/noid/${{ matrix.branches }}-update-min-supported-desktop-version"
+          title: "chore: Update minimum supported desktop version to ${{ steps.extract-version.outputs.VERSION }}"
+          base: "master"
+          body: |
+            Auto-generated update of the minimum supported desktop version using last supported version.
+            https://github.com/nextcloud/desktop/blob/@%7B5.years.ago%7D/VERSION.cmake
+          labels: |
+            client: 💻 desktop
+            automated
+            3. to review
+          reviewers: tobiasKaminsky, camilasan, claucambra
@@ -137,7 +137,6 @@ nbproject
 # nodejs
 /build/bin
 /build/lib/
-/build/jsdocs/
 /build/integration/output/
 /build/integration/phpserver.log
 /npm-debug.log
@@ -153,6 +152,7 @@ Vagrantfile
 # Tests - auto-generated files
 /data-autotest
 /results.sarif
+/tests/.phpunit.cache
 /tests/.phpunit.result.cache
 /tests/coverage*
 /tests/css
@@ -1,42 +0,0 @@
-# SPDX-FileCopyrightText: 2016-2024 Nextcloud GmbH and Nextcloud contributors
-# SPDX-FileCopyrightText: 2016 ownCloud, Inc.
-# SPDX-License-Identifier: AGPL-3.0-only
-before_commands:
-  - 'git submodule update --init --recursive'
-
-build:
-    nodes:
-        analysis:
-            tests:
-                override:
-                    - php-scrutinizer-run
-
-checks:
-    php:
-        excluded_dependencies:
-            - etsy/phan
-
-filter:
-    excluded_paths:
-        - '3rdparty/*'
-        - 'apps/*/3rdparty/*'
-        - 'apps/*/vendor/*'
-        - 'l10n/*'
-        - 'core/l10n/*'
-        - 'apps/*/l10n/*'
-        - 'apps/*/tests/*'
-        - 'lib/l10n/*'
-        - 'core/vendor/*'
-        - 'core/js/tests/lib/*.js'
-        - 'core/js/tests/specs/*.js'
-        - 'core/js/jquery-showpassword.js'
-        - 'core/js/jquery-tipsy.js'
-        - 'core/js/placeholders.js'
-        - 'settings/l10n/*'
-        - 'tests/*'
-        - 'build/*'
-        - 'lib/composer/*'
-
-imports:
-    - javascript
-    - php
@@ -67,7 +67,7 @@
 - Bernhard Posselt <dev@bernhard-posselt.com>
 - Bernhard Reiter <ockham@raz.or.at>
 - Bill McGonigle <bill-github.com@bfccomputing.com>
- - Birk Borkason <daniel.niccoli@gmail.com>
+ - Daniel Niccoli <daniel.niccoli@gmail.com>
 - Bjoern Schiessle <bjoern@schiessle.org>
 - Björn Schießle <bjoern@schiessle.org>
 - Bjørn Forsman <bjorn.forsman@gmail.com>
@@ -559,6 +559,7 @@
 - fnuesse <felix.nuesse@t-online.de>
 - fnuesse <fnuesse@techfak.uni-bielefeld.de>
 - greta <gretadoci@gmail.com>
+ - Hector Valcarcel <hmvalcarcel@gmail.com>
 - helix84 <helix84@centrum.sk>
 - hkjolhede <hkjolhede@gmail.com>
 - hoellen <dev@hoellen.eu>
@@ -619,7 +620,6 @@
 - szaimen <szaimen@e.mail.de>
 - tbartenstein <tbartenstein@users.noreply.github.com>
 - tbelau666 <thomas.belau@gmx.de>
- - TechnicalSuwako <suwako@076.moe>
 - tgrant <tom.grant760@gmail.com>
 - timm2k <timm2k@gmx.de>
 - tux-rampage <tux-rampage@users.noreply.github.com>
@@ -0,0 +1,117 @@
+GNU GENERAL PUBLIC LICENSE
+Version 2, June 1991
+
+Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+
+Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed.
+
+Preamble
+
+The licenses for most software are designed to take away your freedom to share and change it. By contrast, the GNU General Public License is intended to guarantee your freedom to share and change free software--to make sure the software is free for all its users. This General Public License applies to most of the Free Software Foundation's software and to any other program whose authors commit to using it. (Some other Free Software Foundation software is covered by the GNU Lesser General Public License instead.) You can apply it to your programs, too.
+
+When we speak of free software, we are referring to freedom, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for this service if you wish), that you receive source code or can get it if you want it, that you can change the software or use pieces of it in new free programs; and that you know you can do these things.
+
+To protect your rights, we need to make restrictions that forbid anyone to deny you these rights or to ask you to surrender the rights. These restrictions translate to certain responsibilities for you if you distribute copies of the software, or if you modify it.
+
+For example, if you distribute copies of such a program, whether gratis or for a fee, you must give the recipients all the rights that you have. You must make sure that they, too, receive or can get the source code. And you must show them these terms so they know their rights.
+
+We protect your rights with two steps: (1) copyright the software, and (2) offer you this license which gives you legal permission to copy, distribute and/or modify the software.
+
+Also, for each author's protection and ours, we want to make certain that everyone understands that there is no warranty for this free software. If the software is modified by someone else and passed on, we want its recipients to know that what they have is not the original, so that any problems introduced by others will not reflect on the original authors' reputations.
+
+Finally, any free program is threatened constantly by software patents. We wish to avoid the danger that redistributors of a free program will individually obtain patent licenses, in effect making the program proprietary. To prevent this, we have made it clear that any patent must be licensed for everyone's free use or not licensed at all.
+
+The precise terms and conditions for copying, distribution and modification follow.
+
+TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+0. This License applies to any program or other work which contains a notice placed by the copyright holder saying it may be distributed under the terms of this General Public License. The "Program", below, refers to any such program or work, and a "work based on the Program" means either the Program or any derivative work under copyright law: that is to say, a work containing the Program or a portion of it, either verbatim or with modifications and/or translated into another language. (Hereinafter, translation is included without limitation in the term "modification".) Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not covered by this License; they are outside its scope. The act of running the Program is not restricted, and the output from the Program is covered only if its contents constitute a work based on the Program (independent of having been made by running the Program). Whether that is true depends on what the Program does.
+
+1. You may copy and distribute verbatim copies of the Program's source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice and disclaimer of warranty; keep intact all the notices that refer to this License and to the absence of any warranty; and give any other recipients of the Program a copy of this License along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and you may at your option offer warranty protection in exchange for a fee.
+
+2. You may modify your copy or copies of the Program or any portion of it, thus forming a work based on the Program, and copy and distribute such modifications or work under the terms of Section 1 above, provided that you also meet all of these conditions:
+
+     a) You must cause the modified files to carry prominent notices stating that you changed the files and the date of any change.
+
+     b) You must cause any work that you distribute or publish, that in whole or in part contains or is derived from the Program or any part thereof, to be licensed as a whole at no charge to all third parties under the terms of this License.
+
+     c) If the modified program normally reads commands interactively when run, you must cause it, when started running for such interactive use in the most ordinary way, to print or display an announcement including an appropriate copyright notice and a notice that there is no warranty (or else, saying that you provide a warranty) and that users may redistribute the program under these conditions, and telling the user how to view a copy of this License. (Exception: if the Program itself is interactive but does not normally print such an announcement, your work based on the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Program, and can be reasonably considered independent and separate works in themselves, then this License, and its terms, do not apply to those sections when you distribute them as separate works. But when you distribute the same sections as part of a whole which is a work based on the Program, the distribution of the whole must be on the terms of this License, whose permissions for other licensees extend to the entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest your rights to work written entirely by you; rather, the intent is to exercise the right to control the distribution of derivative or collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program with the Program (or with a work based on the Program) on a volume of a storage or distribution medium does not bring the other work under the scope of this License.
+
+3. You may copy and distribute the Program (or a work based on it, under Section 2) in object code or executable form under the terms of Sections 1 and 2 above provided that you also do one of the following:
+
+     a) Accompany it with the complete corresponding machine-readable source code, which must be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or,
+
+     b) Accompany it with a written offer, valid for at least three years, to give any third party, for a charge no more than your cost of physically performing source distribution, a complete machine-readable copy of the corresponding source code, to be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or,
+
+     c) Accompany it with the information you received as to the offer to distribute corresponding source code. (This alternative is allowed only for noncommercial distribution and only if you received the program in object code or executable form with such an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for making modifications to it. For an executable work, complete source code means all the source code for all modules it contains, plus any associated interface definition files, plus the scripts used to control compilation and installation of the executable. However, as a special exception, the source code distributed need not include anything that is normally distributed (in either source or binary form) with the major components (compiler, kernel, and so on) of the operating system on which the executable runs, unless that component itself accompanies the executable.
+
+If distribution of executable or object code is made by offering access to copy from a designated place, then offering equivalent access to copy the source code from the same place counts as distribution of the source code, even though third parties are not compelled to copy the source along with the object code.
+
+4. You may not copy, modify, sublicense, or distribute the Program except as expressly provided under this License. Any attempt otherwise to copy, modify, sublicense or distribute the Program is void, and will automatically terminate your rights under this License. However, parties who have received copies, or rights, from you under this License will not have their licenses terminated so long as such parties remain in full compliance.
+
+5. You are not required to accept this License, since you have not signed it. However, nothing else grants you permission to modify or distribute the Program or its derivative works. These actions are prohibited by law if you do not accept this License. Therefore, by modifying or distributing the Program (or any work based on the Program), you indicate your acceptance of this License to do so, and all its terms and conditions for copying, distributing or modifying the Program or works based on it.
+
+6. Each time you redistribute the Program (or any work based on the Program), the recipient automatically receives a license from the original licensor to copy, distribute or modify the Program subject to these terms and conditions. You may not impose any further restrictions on the recipients' exercise of the rights granted herein. You are not responsible for enforcing compliance by third parties to this License.
+
+7. If, as a consequence of a court judgment or allegation of patent infringement or for any other reason (not limited to patent issues), conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot distribute so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not distribute the Program at all. For example, if a patent license would not permit royalty-free redistribution of the Program by all those who receive copies directly or indirectly through you, then the only way you could satisfy both it and this License would be to refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under any particular circumstance, the balance of the section is intended to apply and the section as a whole is intended to apply in other circumstances.
+
+It is not the purpose of this section to induce you to infringe any patents or other property right claims or to contest validity of any such claims; this section has the sole purpose of protecting the integrity of the free software distribution system, which is implemented by public license practices. Many people have made generous contributions to the wide range of software distributed through that system in reliance on consistent application of that system; it is up to the author/donor to decide if he or she is willing to distribute software through any other system and a licensee cannot impose that choice.
+
+This section is intended to make thoroughly clear what is believed to be a consequence of the rest of this License.
+
+8. If the distribution and/or use of the Program is restricted in certain countries either by patents or by copyrighted interfaces, the original copyright holder who places the Program under this License may add an explicit geographical distribution limitation excluding those countries, so that distribution is permitted only in or among countries not thus excluded. In such case, this License incorporates the limitation as if written in the body of this License.
+
+9. The Free Software Foundation may publish revised and/or new versions of the General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns.
+
+Each version is given a distinguishing version number. If the Program specifies a version number of this License which applies to it and "any later version", you have the option of following the terms and conditions either of that version or of any later version published by the Free Software Foundation. If the Program does not specify a version number of this License, you may choose any version ever published by the Free Software Foundation.
+
+10. If you wish to incorporate parts of the Program into other free programs whose distribution conditions are different, write to the author to ask for permission. For software which is copyrighted by the Free Software Foundation, write to the Free Software Foundation; we sometimes make exceptions for this. Our decision will be guided by the two goals of preserving the free status of all derivatives of our free software and of promoting the sharing and reuse of software generally.
+
+NO WARRANTY
+
+11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+END OF TERMS AND CONDITIONS
+
+How to Apply These Terms to Your New Programs
+
+If you develop a new program, and you want it to be of the greatest possible use to the public, the best way to achieve this is to make it free software which everyone can redistribute and change under these terms.
+
+To do so, attach the following notices to the program. It is safest to attach them to the start of each source file to most effectively convey the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found.
+
+     one line to give the program's name and an idea of what it does. Copyright (C) yyyy name of author
+
+     This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.
+
+     This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+
+     You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this when it starts in an interactive mode:
+
+     Gnomovision version 69, Copyright (C) year name of author Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate parts of the General Public License. Of course, the commands you use may be called something other than `show w' and `show c'; they could even be mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your school, if any, to sign a "copyright disclaimer" for the program, if necessary. Here is a sample; alter the names:
+
+     Yoyodyne, Inc., hereby disclaims all copyright interest in the program `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+signature of Ty Coon, 1 April 1989 Ty Coon, President of Vice
@@ -5,14 +5,13 @@
 -->
 # Nextcloud Server ☁
 [![REUSE status](https://api.reuse.software/badge/github.com/nextcloud/server)](https://api.reuse.software/info/github.com/nextcloud/server)
-[![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/nextcloud/server/badges/quality-score.png?b=stable31)](https://scrutinizer-ci.com/g/nextcloud/server/?branch=stable31)
-[![codecov](https://codecov.io/gh/nextcloud/server/branch/stable31/graph/badge.svg)](https://codecov.io/gh/nextcloud/server)
+[![codecov](https://codecov.io/gh/nextcloud/server/branch/master/graph/badge.svg)](https://codecov.io/gh/nextcloud/server)
 [![CII Best Practices](https://bestpractices.coreinfrastructure.org/projects/209/badge)](https://bestpractices.coreinfrastructure.org/projects/209)
 [![Design](https://contribute.design/api/shield/nextcloud/server)](https://contribute.design/nextcloud/server)

 **A safe home for all your data.**

-![](https://raw.githubusercontent.com/nextcloud/screenshots/stable31/nextcloud-hub-files-25-preview.png)
+![](https://raw.githubusercontent.com/nextcloud/screenshots/master/nextcloud-hub-files-25-preview.png)

 ## Why is this so awesome? 🤩

@@ -59,7 +58,7 @@ There are many ways to contribute, of which development is only one! Find out [h

 Third-party components are handled as git submodules which have to be initialized first. So aside from the regular git checkout invoking `git submodule update --init` or a similar command is needed, for details see Git documentation.

-Several apps that are included by default in regular releases such as [First run wizard](https://github.com/nextcloud/firstrunwizard) or [Activity](https://github.com/nextcloud/activity) are missing in `stable31` and have to be installed manually by cloning them into the `apps` subfolder.
+Several apps that are included by default in regular releases such as [First run wizard](https://github.com/nextcloud/firstrunwizard) or [Activity](https://github.com/nextcloud/activity) are missing in `master` and have to be installed manually by cloning them into the `apps` subfolder.

 Otherwise, git checkouts can be handled the same as release archives, by using the `stable*` branches. Note they should never be used on production systems.

@@ -14,5 +14,4 @@ export default {
 	get: async () => ({ status: 200, data: {} }),
 	delete: async () => ({ status: 200, data: {} }),
 	post: async () => ({ status: 200, data: {} }),
-	head: async () => ({ status: 200, data: {} }),
 }
@@ -2,13 +2,7 @@
 * SPDX-FileCopyrightText: 2024 Nextcloud GmbH and Nextcloud contributors
 * SPDX-License-Identifier: AGPL-3.0-or-later
 */
-window.OC = {
-	config: {
-		version: '31.0.0',
-	},
-	...window.OC,
-}
-
+window.OC = { ...window.OC }
 window.OCA = { ...window.OCA }
 window.OCP = { ...window.OCP }

@@ -10,7 +10,7 @@
 	<name>Auditing / Logging</name>
 	<summary>Provides logging abilities for Nextcloud such as logging file accesses or otherwise sensitive actions.</summary>
 	<description>Provides logging abilities for Nextcloud such as logging file accesses or otherwise sensitive actions.</description>
-	<version>1.21.0</version>
+	<version>1.22.0</version>
 	<licence>agpl</licence>
 	<author>Nextcloud</author>
 	<namespace>AdminAudit</namespace>
@@ -20,7 +20,7 @@
 	<category>monitoring</category>
 	<bugs>https://github.com/nextcloud/server/issues</bugs>
 	<dependencies>
-		<nextcloud min-version="31" max-version="31"/>
+		<nextcloud min-version="32" max-version="32"/>
 	</dependencies>
 	<background-jobs>
 		<job>OCA\AdminAudit\BackgroundJobs\Rotate</job>
@@ -1,7 +0,0 @@
-OC.L10N.register(
-    "admin_audit",
-    {
-    "Auditing / Logging" : "Аўдыт / Журнал",
-    "Provides logging abilities for Nextcloud such as logging file accesses or otherwise sensitive actions." : "Прадастаўляе магчымасці вядзення журнала дзенняў для Nextcloud, такіх як доступ да файлаў або іншых канфідэнцыйных дзеянняў."
-},
-"nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);");
@@ -1,5 +0,0 @@
-{ "translations": {
-    "Auditing / Logging" : "Аўдыт / Журнал",
-    "Provides logging abilities for Nextcloud such as logging file accesses or otherwise sensitive actions." : "Прадастаўляе магчымасці вядзення журнала дзенняў для Nextcloud, такіх як доступ да файлаў або іншых канфідэнцыйных дзеянняў."
-},"pluralForm" :"nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);"
-}
@@ -2,6 +2,6 @@ OC.L10N.register(
    "admin_audit",
    {
    "Auditing / Logging" : "Ekzamenado / Protokolado",
-    "Provides logging abilities for Nextcloud such as logging file accesses or otherwise sensitive actions." : "Ebligas protokoladon, ekzemple protokolado de aliroj al dosieroj aŭ aliaj delikataj agoj."
+    "Provides logging abilities for Nextcloud such as logging file accesses or otherwise sensitive actions." : "Provizi protokolado-kapablojn por Nextcloud, kiel ekzemple protokolado de aliroj al dosieroj aŭ aliaj delikataj agoj."
 },
 "nplurals=2; plural=(n != 1);");
@@ -1,5 +1,5 @@
 { "translations": {
    "Auditing / Logging" : "Ekzamenado / Protokolado",
-    "Provides logging abilities for Nextcloud such as logging file accesses or otherwise sensitive actions." : "Ebligas protokoladon, ekzemple protokolado de aliroj al dosieroj aŭ aliaj delikataj agoj."
+    "Provides logging abilities for Nextcloud such as logging file accesses or otherwise sensitive actions." : "Provizi protokolado-kapablojn por Nextcloud, kiel ekzemple protokolado de aliroj al dosieroj aŭ aliaj delikataj agoj."
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
@@ -1,7 +1,7 @@
 OC.L10N.register(
    "admin_audit",
    {
-    "Auditing / Logging" : "حسابرسی / گزارش‌گیری",
-    "Provides logging abilities for Nextcloud such as logging file accesses or otherwise sensitive actions." : "قابلیت‌های گزارش‌گیری مانند ثبت گزارش دسترسی به پرونده‌ها یا اقدامات حساس دیگر را برای نکست‌کلود فراهم می‌کند."
+    "Auditing / Logging" : "حسابرسی / ورود به سیستم",
+    "Provides logging abilities for Nextcloud such as logging file accesses or otherwise sensitive actions." : "قابلیت‌های ثبت‌نام را برای نکست‌کلود فراهم می‌کند، مانند ثبت دسترسی به فایل‌ها یا اقدامات حساس دیگر."
 },
 "nplurals=2; plural=(n > 1);");
@@ -1,5 +1,5 @@
 { "translations": {
-    "Auditing / Logging" : "حسابرسی / گزارش‌گیری",
-    "Provides logging abilities for Nextcloud such as logging file accesses or otherwise sensitive actions." : "قابلیت‌های گزارش‌گیری مانند ثبت گزارش دسترسی به پرونده‌ها یا اقدامات حساس دیگر را برای نکست‌کلود فراهم می‌کند."
+    "Auditing / Logging" : "حسابرسی / ورود به سیستم",
+    "Provides logging abilities for Nextcloud such as logging file accesses or otherwise sensitive actions." : "قابلیت‌های ثبت‌نام را برای نکست‌کلود فراهم می‌کند، مانند ثبت دسترسی به فایل‌ها یا اقدامات حساس دیگر."
 },"pluralForm" :"nplurals=2; plural=(n > 1);"
 }
@@ -37,11 +37,8 @@ class Action {
 					);
 				} else {
 					$this->logger->critical(
-						sprintf(
-							'$params["' . $element . '"] was missing. Transferred value: %s',
-							print_r($params, true)
-						),
-						['app' => 'admin_audit']
+						'$params["' . $element . '"] was missing. Transferred value: {params}',
+						['app' => 'admin_audit', 'params' => $params]
 					);
 				}
 				return;
@@ -10,7 +10,6 @@ namespace OCA\AdminAudit\Actions;
 use OC\Files\Node\NonExistingFile;
 use OCP\Files\Events\Node\BeforeNodeDeletedEvent;
 use OCP\Files\Events\Node\BeforeNodeReadEvent;
-use OCP\Files\Events\Node\BeforeNodeRenamedEvent;
 use OCP\Files\Events\Node\NodeCopiedEvent;
 use OCP\Files\Events\Node\NodeCreatedEvent;
 use OCP\Files\Events\Node\NodeRenamedEvent;
@@ -26,9 +25,6 @@ use Psr\Log\LoggerInterface;
 * @package OCA\AdminAudit\Actions
 */
 class Files extends Action {
-
-	private array $renamedNodes = [];
-
 	/**
 	 * Logs file read actions
 	 */
@@ -52,31 +48,16 @@ class Files extends Action {
 		);
 	}

-	/**
-	 * Logs rename actions of files
-	 */
-	public function beforeRename(BeforeNodeRenamedEvent $event): void {
-		try {
-			$source = $event->getSource();
-			$this->renamedNodes[$source->getId()] = $source;
-		} catch (InvalidPathException|NotFoundException $e) {
-			Server::get(LoggerInterface::class)->error(
-				'Exception thrown in file rename: ' . $e->getMessage(), ['app' => 'admin_audit', 'exception' => $e]
-			);
-			return;
-		}
-	}
-
 	/**
 	 * Logs rename actions of files
 	 */
 	public function afterRename(NodeRenamedEvent $event): void {
 		try {
 			$target = $event->getTarget();
-			$originalSource = $this->renamedNodes[$target->getId()] ?? $event->getSource();
+			$source = $event->getSource();
 			$params = [
 				'newid' => $target->getId(),
-				'oldpath' => $originalSource->getPath(),
+				'oldpath' => $source->getPath(),
 				'newpath' => $target->getPath(),
 			];
 		} catch (InvalidPathException|NotFoundException $e) {
@@ -8,16 +8,6 @@ declare(strict_types=1);
 namespace OCA\AdminAudit\Actions;

 class Versions extends Action {
-	public function rollback(array $params): void {
-		$this->log('Version "%s" of "%s" was restored.',
-			[
-				'version' => $params['revision'],
-				'path' => $params['path']
-			],
-			['version', 'path']
-		);
-	}
-
 	public function delete(array $params): void {
 		$this->log('Version "%s" was deleted.',
 			['path' => $params['path']],
@@ -27,6 +27,7 @@ use OCA\AdminAudit\Listener\GroupManagementEventListener;
 use OCA\AdminAudit\Listener\SecurityEventListener;
 use OCA\AdminAudit\Listener\SharingEventListener;
 use OCA\AdminAudit\Listener\UserManagementEventListener;
+use OCA\Files_Versions\Events\VersionRestoredEvent;
 use OCP\App\Events\AppDisableEvent;
 use OCP\App\Events\AppEnableEvent;
 use OCP\App\Events\AppUpdateEvent;
@@ -41,7 +42,6 @@ use OCP\Console\ConsoleEvent;
 use OCP\EventDispatcher\IEventDispatcher;
 use OCP\Files\Events\Node\BeforeNodeDeletedEvent;
 use OCP\Files\Events\Node\BeforeNodeReadEvent;
-use OCP\Files\Events\Node\BeforeNodeRenamedEvent;
 use OCP\Files\Events\Node\NodeCopiedEvent;
 use OCP\Files\Events\Node\NodeCreatedEvent;
 use OCP\Files\Events\Node\NodeRenamedEvent;
@@ -110,6 +110,7 @@ class Application extends App implements IBootstrap {

 		// File events
 		$context->registerEventListener(BeforePreviewFetchedEvent::class, FileEventListener::class);
+		$context->registerEventListener(VersionRestoredEvent::class, FileEventListener::class);

 		// Security events
 		$context->registerEventListener(TwoFactorProviderChallengePassed::class, SecurityEventListener::class);
@@ -168,13 +169,6 @@ class Application extends App implements IBootstrap {
 	private function fileHooks(IAuditLogger $logger, IEventDispatcher $eventDispatcher): void {
 		$fileActions = new Files($logger);

-		$eventDispatcher->addListener(
-			BeforeNodeRenamedEvent::class,
-			function (BeforeNodeRenamedEvent $event) use ($fileActions): void {
-				$fileActions->beforeRename($event);
-			}
-		);
-
 		$eventDispatcher->addListener(
 			NodeRenamedEvent::class,
 			function (NodeRenamedEvent $event) use ($fileActions): void {
@@ -220,7 +214,6 @@ class Application extends App implements IBootstrap {

 	private function versionsHooks(IAuditLogger $logger): void {
 		$versionsActions = new Versions($logger);
-		Util::connectHook('\OCP\Versions', 'rollback', $versionsActions, 'rollback');
 		Util::connectHook('\OCP\Versions', 'delete', $versionsActions, 'delete');
 	}

@@ -10,6 +10,7 @@ declare(strict_types=1);
 namespace OCA\AdminAudit\Listener;

 use OCA\AdminAudit\Actions\Action;
+use OCA\Files_Versions\Events\VersionRestoredEvent;
 use OCP\EventDispatcher\Event;
 use OCP\EventDispatcher\IEventListener;
 use OCP\Files\InvalidPathException;
@@ -19,12 +20,14 @@ use OCP\Server;
 use Psr\Log\LoggerInterface;

 /**
- * @template-implements IEventListener<BeforePreviewFetchedEvent>
+ * @template-implements IEventListener<BeforePreviewFetchedEvent|VersionRestoredEvent>
 */
 class FileEventListener extends Action implements IEventListener {
 	public function handle(Event $event): void {
 		if ($event instanceof BeforePreviewFetchedEvent) {
 			$this->beforePreviewFetched($event);
+		} elseif ($event instanceof VersionRestoredEvent) {
+			$this->versionRestored($event);
 		}
 	}

@@ -54,4 +57,18 @@ class FileEventListener extends Action implements IEventListener {
 			return;
 		}
 	}
+
+	/**
+	 * Logs when a version is restored
+	 */
+	private function versionRestored(VersionRestoredEvent $event): void {
+		$version = $event->getVersion();
+		$this->log('Version "%s" of "%s" was restored.',
+			[
+				'version' => $version->getRevisionId(),
+				'path' => $version->getVersionPath()
+			],
+			['version', 'path']
+		);
+	}
 }
@@ -9,7 +9,7 @@
 	<name>Cloud Federation API</name>
 	<summary>Enable clouds to communicate with each other and exchange data</summary>
 	<description>The Cloud Federation API enables various Nextcloud instances to communicate with each other and to exchange data.</description>
-	<version>1.14.0</version>
+	<version>1.16.0</version>
 	<licence>agpl</licence>
 	<author>Bjoern Schiessle</author>
 	<namespace>CloudFederationAPI</namespace>
@@ -19,6 +19,6 @@
 	<category>integration</category>
 	<bugs>https://github.com/nextcloud/server/issues</bugs>
 	<dependencies>
-		<nextcloud min-version="31" max-version="31"/>
+		<nextcloud min-version="32" max-version="32"/>
 	</dependencies>
 </info>
@@ -20,11 +20,11 @@ return [
 			'verb' => 'POST',
 			'root' => '/ocm',
 		],
-		//		[
-		//			'name' => 'RequestHandler#inviteAccepted',
-		//			'url' => '/invite-accepted',
-		//			'verb' => 'POST',
-		//			'root' => '/ocm',
-		//		]
+		[
+			'name' => 'RequestHandler#inviteAccepted',
+			'url' => '/invite-accepted',
+			'verb' => 'POST',
+			'root' => '/ocm',
+		]
 	],
 ];
@@ -11,5 +11,9 @@ return array(
    'OCA\\CloudFederationAPI\\Capabilities' => $baseDir . '/../lib/Capabilities.php',
    'OCA\\CloudFederationAPI\\Config' => $baseDir . '/../lib/Config.php',
    'OCA\\CloudFederationAPI\\Controller\\RequestHandlerController' => $baseDir . '/../lib/Controller/RequestHandlerController.php',
+    'OCA\\CloudFederationAPI\\Db\\FederatedInvite' => $baseDir . '/../lib/Db/FederatedInvite.php',
+    'OCA\\CloudFederationAPI\\Db\\FederatedInviteMapper' => $baseDir . '/../lib/Db/FederatedInviteMapper.php',
+    'OCA\\CloudFederationAPI\\Events\\FederatedInviteAcceptedEvent' => $baseDir . '/../lib/Events/FederatedInviteAcceptedEvent.php',
+    'OCA\\CloudFederationAPI\\Migration\\Version1016Date202502262004' => $baseDir . '/../lib/Migration/Version1016Date202502262004.php',
    'OCA\\CloudFederationAPI\\ResponseDefinitions' => $baseDir . '/../lib/ResponseDefinitions.php',
 );
@@ -26,6 +26,10 @@ class ComposerStaticInitCloudFederationAPI
        'OCA\\CloudFederationAPI\\Capabilities' => __DIR__ . '/..' . '/../lib/Capabilities.php',
        'OCA\\CloudFederationAPI\\Config' => __DIR__ . '/..' . '/../lib/Config.php',
        'OCA\\CloudFederationAPI\\Controller\\RequestHandlerController' => __DIR__ . '/..' . '/../lib/Controller/RequestHandlerController.php',
+        'OCA\\CloudFederationAPI\\Db\\FederatedInvite' => __DIR__ . '/..' . '/../lib/Db/FederatedInvite.php',
+        'OCA\\CloudFederationAPI\\Db\\FederatedInviteMapper' => __DIR__ . '/..' . '/../lib/Db/FederatedInviteMapper.php',
+        'OCA\\CloudFederationAPI\\Events\\FederatedInviteAcceptedEvent' => __DIR__ . '/..' . '/../lib/Events/FederatedInviteAcceptedEvent.php',
+        'OCA\\CloudFederationAPI\\Migration\\Version1016Date202502262004' => __DIR__ . '/..' . '/../lib/Migration/Version1016Date202502262004.php',
        'OCA\\CloudFederationAPI\\ResponseDefinitions' => __DIR__ . '/..' . '/../lib/ResponseDefinitions.php',
    );

@@ -1,8 +0,0 @@
-OC.L10N.register(
-    "cloud_federation_api",
-    {
-    "Cloud Federation API" : "API de Federação Cloud",
-    "Enable clouds to communicate with each other and exchange data" : "Enable clouds to communicate with each other and exchange data",
-    "The Cloud Federation API enables various Nextcloud instances to communicate with each other and to exchange data." : "The Cloud Federation API enables various Nextcloud instances to communicate with each other and to exchange data."
-},
-"nplurals=3; plural=(n == 0 || n == 1) ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;");
@@ -1,6 +0,0 @@
-{ "translations": {
-    "Cloud Federation API" : "API de Federação Cloud",
-    "Enable clouds to communicate with each other and exchange data" : "Enable clouds to communicate with each other and exchange data",
-    "The Cloud Federation API enables various Nextcloud instances to communicate with each other and to exchange data." : "The Cloud Federation API enables various Nextcloud instances to communicate with each other and to exchange data."
-},"pluralForm" :"nplurals=3; plural=(n == 0 || n == 1) ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;"
-}
@@ -1,8 +0,0 @@
-OC.L10N.register(
-    "cloud_federation_api",
-    {
-    "Cloud Federation API" : "API ya Shirikisho la Cloud",
-    "Enable clouds to communicate with each other and exchange data" : "Washa clouds kuwasiliana na kubadilishana data",
-    "The Cloud Federation API enables various Nextcloud instances to communicate with each other and to exchange data." : "API ya Shirikisho la Cloud huwezesha matukio mbalimbali ya Nextcloud kuwasiliana na kubadilishana data."
-},
-"nplurals=2; plural=(n != 1);");
@@ -1,6 +0,0 @@
-{ "translations": {
-    "Cloud Federation API" : "API ya Shirikisho la Cloud",
-    "Enable clouds to communicate with each other and exchange data" : "Washa clouds kuwasiliana na kubadilishana data",
-    "The Cloud Federation API enables various Nextcloud instances to communicate with each other and to exchange data." : "API ya Shirikisho la Cloud huwezesha matukio mbalimbali ya Nextcloud kuwasiliana na kubadilishana data."
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-}
@@ -6,43 +6,73 @@ declare(strict_types=1);
 * SPDX-FileCopyrightText: 2017 Nextcloud GmbH and Nextcloud contributors
 * SPDX-License-Identifier: AGPL-3.0-or-later
 */
+
 namespace OCA\CloudFederationAPI;

-use OC\OCM\OCMDiscoveryService;
+use NCU\Security\Signature\Exceptions\IdentityNotFoundException;
+use NCU\Security\Signature\Exceptions\SignatoryException;
+use OC\OCM\OCMSignatoryManager;
 use OCP\Capabilities\ICapability;
 use OCP\Capabilities\IInitialStateExcludedCapability;
+use OCP\IAppConfig;
+use OCP\IURLGenerator;
 use OCP\OCM\Exceptions\OCMArgumentException;
+use OCP\OCM\ICapabilityAwareOCMProvider;
+use Psr\Log\LoggerInterface;

 class Capabilities implements ICapability, IInitialStateExcludedCapability {
+	public const API_VERSION = '1.1.0';
+
 	public function __construct(
-		private readonly OCMDiscoveryService $ocmDiscoveryService,
+		private IURLGenerator $urlGenerator,
+		private IAppConfig $appConfig,
+		private ICapabilityAwareOCMProvider $provider,
+		private readonly OCMSignatoryManager $ocmSignatoryManager,
+		private readonly LoggerInterface $logger,
 	) {
 	}

 	/**
 	 * Function an app uses to return the capabilities
 	 *
-	 * @return array{
-	 *     ocm: array{
-	 *     	   apiVersion: '1.0-proposal1',
-	 *         enabled: bool,
-	 *         endPoint: string,
-	 *         publicKey?: array{
-	 *             keyId: string,
-	 *             publicKeyPem: string,
-	 *         },
-	 *         resourceTypes: list<array{
-	 *             name: string,
-	 *             shareTypes: list<string>,
-	 *             protocols: array<string, string>
-	 *         }>,
-	 *         version: string
-	 *     }
-	 * }
+	 * @return array<string, array<string, mixed>>
 	 * @throws OCMArgumentException
 	 */
 	public function getCapabilities() {
-		$provider = $this->ocmDiscoveryService->getLocalOCMProvider(false);
-		return ['ocm' => $provider->jsonSerialize()];
+		$url = $this->urlGenerator->linkToRouteAbsolute('cloud_federation_api.requesthandlercontroller.addShare');
+		$pos = strrpos($url, '/');
+		if ($pos === false) {
+			throw new OCMArgumentException('generated route should contain a slash character');
+		}
+
+		$this->provider->setEnabled(true);
+		$this->provider->setApiVersion(self::API_VERSION);
+		$this->provider->setCapabilities(['/invite-accepted', '/notifications', '/shares']);
+
+		$this->provider->setEndPoint(substr($url, 0, $pos));
+
+		$resource = $this->provider->createNewResourceType();
+		$resource->setName('file')
+			->setShareTypes(['user', 'group'])
+			->setProtocols(['webdav' => '/public.php/webdav/']);
+
+		$this->provider->addResourceType($resource);
+
+		// Adding a public key to the ocm discovery
+		try {
+			if (!$this->appConfig->getValueBool('core', OCMSignatoryManager::APPCONFIG_SIGN_DISABLED, lazy: true)) {
+				/**
+				 * @experimental 31.0.0
+				 * @psalm-suppress UndefinedInterfaceMethod
+				 */
+				$this->provider->setSignatory($this->ocmSignatoryManager->getLocalSignatory());
+			} else {
+				$this->logger->debug('ocm public key feature disabled');
+			}
+		} catch (SignatoryException|IdentityNotFoundException $e) {
+			$this->logger->warning('cannot generate local signatory', ['exception' => $e]);
+		}
+
+		return ['ocm' => $this->provider->jsonSerialize()];
 	}
 }
@@ -1,8 +1,10 @@
 <?php
+
 /**
 * SPDX-FileCopyrightText: 2018 Nextcloud GmbH and Nextcloud contributors
 * SPDX-License-Identifier: AGPL-3.0-or-later
 */
+
 namespace OCA\CloudFederationAPI\Controller;

 use NCU\Federation\ISignedCloudFederationProvider;
@@ -15,15 +17,20 @@ use NCU\Security\Signature\IIncomingSignedRequest;
 use NCU\Security\Signature\ISignatureManager;
 use OC\OCM\OCMSignatoryManager;
 use OCA\CloudFederationAPI\Config;
+use OCA\CloudFederationAPI\Db\FederatedInviteMapper;
+use OCA\CloudFederationAPI\Events\FederatedInviteAcceptedEvent;
 use OCA\CloudFederationAPI\ResponseDefinitions;
 use OCA\FederatedFileSharing\AddressHandler;
 use OCP\AppFramework\Controller;
+use OCP\AppFramework\Db\DoesNotExistException;
 use OCP\AppFramework\Http;
 use OCP\AppFramework\Http\Attribute\BruteForceProtection;
 use OCP\AppFramework\Http\Attribute\NoCSRFRequired;
 use OCP\AppFramework\Http\Attribute\OpenAPI;
 use OCP\AppFramework\Http\Attribute\PublicPage;
 use OCP\AppFramework\Http\JSONResponse;
+use OCP\AppFramework\Utility\ITimeFactory;
+use OCP\EventDispatcher\IEventDispatcher;
 use OCP\Federation\Exceptions\ActionNotSupportedException;
 use OCP\Federation\Exceptions\AuthenticationFailedException;
 use OCP\Federation\Exceptions\BadRequestException;
@@ -61,12 +68,15 @@ class RequestHandlerController extends Controller {
 		private IURLGenerator $urlGenerator,
 		private ICloudFederationProviderManager $cloudFederationProviderManager,
 		private Config $config,
+		private IEventDispatcher $dispatcher,
+		private FederatedInviteMapper $federatedInviteMapper,
 		private readonly AddressHandler $addressHandler,
 		private readonly IAppConfig $appConfig,
 		private ICloudFederationFactory $factory,
 		private ICloudIdManager $cloudIdManager,
 		private readonly ISignatureManager $signatureManager,
 		private readonly OCMSignatoryManager $signatoryManager,
+		private ITimeFactory $timeFactory,
 	) {
 		parent::__construct($appName, $request);
 	}
@@ -107,7 +117,8 @@ class RequestHandlerController extends Controller {
 		}

 		// check if all required parameters are set
-		if ($shareWith === null ||
+		if (
+			$shareWith === null ||
 			$name === null ||
 			$providerId === null ||
 			$resourceType === null ||
@@ -213,6 +224,101 @@ class RequestHandlerController extends Controller {
 		return new JSONResponse($responseData, Http::STATUS_CREATED);
 	}

+	/**
+	 * Inform the sender that an invitation was accepted to start sharing
+	 *
+	 * Inform about an accepted invitation so the user on the sender provider's side
+	 * can initiate the OCM share creation. To protect the identity of the parties,
+	 * for shares created following an OCM invitation, the user id MAY be hashed,
+	 * and recipients implementing the OCM invitation workflow MAY refuse to process
+	 * shares coming from unknown parties.
+	 * @link https://cs3org.github.io/OCM-API/docs.html?branch=v1.1.0&repo=OCM-API&user=cs3org#/paths/~1invite-accepted/post
+	 *
+	 * @param string $recipientProvider The address of the recipent's provider
+	 * @param string $token The token used for the invitation
+	 * @param string $userId The userId of the recipient at the recipient's provider
+	 * @param string $email The email address of the recipient
+	 * @param string $name The display name of the recipient
+	 *
+	 * @return JSONResponse<Http::STATUS_OK, array{userID: string, email: string, name: string}, array{}>|JSONResponse<Http::STATUS_FORBIDDEN|Http::STATUS_BAD_REQUEST|Http::STATUS_CONFLICT, array{message: string, error: true}, array{}>
+	 *
+	 * Note: Not implementing 404 Invitation token does not exist, instead using 400
+	 * 200: Invitation accepted
+	 * 400: Invalid token
+	 * 403: Invitation token does not exist
+	 * 409: User is already known by the OCM provider
+	 */
+	#[PublicPage]
+	#[NoCSRFRequired]
+	#[BruteForceProtection(action: 'inviteAccepted')]
+	public function inviteAccepted(string $recipientProvider, string $token, string $userId, string $email, string $name): JSONResponse {
+		$this->logger->debug('Processing share invitation for ' . $userId . ' with token ' . $token . ' and email ' . $email . ' and name ' . $name);
+
+		$updated = $this->timeFactory->getTime();
+
+		if ($token === '') {
+			$response = new JSONResponse(['message' => 'Invalid or non existing token', 'error' => true], Http::STATUS_BAD_REQUEST);
+			$response->throttle();
+			return $response;
+		}
+
+		try {
+			$invitation = $this->federatedInviteMapper->findByToken($token);
+		} catch (DoesNotExistException) {
+			$response = ['message' => 'Invalid or non existing token', 'error' => true];
+			$status = Http::STATUS_BAD_REQUEST;
+			$response = new JSONResponse($response, $status);
+			$response->throttle();
+			return $response;
+		}
+
+		if ($invitation->isAccepted() === true) {
+			$response = ['message' => 'Invite already accepted', 'error' => true];
+			$status = Http::STATUS_CONFLICT;
+			return new JSONResponse($response, $status);
+		}
+
+		if ($invitation->getExpiredAt() !== null && $updated > $invitation->getExpiredAt()) {
+			$response = ['message' => 'Invitation expired', 'error' => true];
+			$status = Http::STATUS_BAD_REQUEST;
+			return new JSONResponse($response, $status);
+		}
+		$localUser = $this->userManager->get($invitation->getUserId());
+		if ($localUser === null) {
+			$response = ['message' => 'Invalid or non existing token', 'error' => true];
+			$status = Http::STATUS_BAD_REQUEST;
+			$response = new JSONResponse($response, $status);
+			$response->throttle();
+			return $response;
+		}
+
+		$sharedFromEmail = $localUser->getEMailAddress();
+		if ($sharedFromEmail === null) {
+			$response = ['message' => 'Invalid or non existing token', 'error' => true];
+			$status = Http::STATUS_BAD_REQUEST;
+			$response = new JSONResponse($response, $status);
+			$response->throttle();
+			return $response;
+		}
+		$sharedFromDisplayName = $localUser->getDisplayName();
+
+		$response = ['userID' => $localUser->getUID(), 'email' => $sharedFromEmail, 'name' => $sharedFromDisplayName];
+		$status = Http::STATUS_OK;
+
+		$invitation->setAccepted(true);
+		$invitation->setRecipientEmail($email);
+		$invitation->setRecipientName($name);
+		$invitation->setRecipientProvider($recipientProvider);
+		$invitation->setRecipientUserId($userId);
+		$invitation->setAcceptedAt($updated);
+		$invitation = $this->federatedInviteMapper->update($invitation);
+
+		$event = new FederatedInviteAcceptedEvent($invitation);
+		$this->dispatcher->dispatchTyped($event);
+
+		return new JSONResponse($response, $status);
+	}
+
 	/**
 	 * Send a notification about an existing share
 	 *
@@ -233,7 +339,8 @@ class RequestHandlerController extends Controller {
 	#[BruteForceProtection(action: 'receiveFederatedShareNotification')]
 	public function receiveNotification($notificationType, $resourceType, $providerId, ?array $notification) {
 		// check if all required parameters are set
-		if ($notificationType === null ||
+		if (
+			$notificationType === null ||
 			$resourceType === null ||
 			$providerId === null ||
 			!is_array($notification)
@@ -0,0 +1,62 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * SPDX-FileCopyrightText: 2025 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+namespace OCA\CloudFederationAPI\Db;
+
+use OCP\AppFramework\Db\Entity;
+use OCP\DB\Types;
+
+/**
+ * @method bool isAccepted()
+ * @method void setAccepted(bool $accepted)
+ * @method int|null getAcceptedAt()
+ * @method void setAcceptedAt(int $acceptedAt)
+ * @method int|null getCreatedAt()
+ * @method void setCreatedAt(int $createdAt)
+ * @method int|null getExpiredAt()
+ * @method void setExpiredAt(int $expiredAt)
+ * @method string|null getRecipientEmail()
+ * @method void setRecipientEmail(string $recipientEmail)
+ * @method string|null getRecipientName()
+ * @method void setRecipientName(string $recipientName)
+ * @method string|null getRecipientProvider()
+ * @method void setRecipientProvider(string $recipientProvider)
+ * @method string|null getRecipientUserId()
+ * @method void setRecipientUserId(string $recipientUserId)
+ * @method string getToken()
+ * @method void setToken(string $token)
+ * @method string|null getUserId()
+ * @method void setUserId(string $userId)
+ */
+
+class FederatedInvite extends Entity {
+	protected bool $accepted = false;
+	protected ?int $acceptedAt = 0;
+	protected int $createdAt = 0;
+	protected ?int $expiredAt = 0;
+	protected ?string $recipientEmail = null;
+	protected ?string $recipientName = null;
+	protected ?string $recipientProvider = null;
+	protected ?string $recipientUserId = null;
+	protected string $token = '';
+	protected string $userId = '';
+
+	public function __construct() {
+		$this->addType('accepted', Types::BOOLEAN);
+		$this->addType('acceptedAt', Types::BIGINT);
+		$this->addType('createdAt', Types::BIGINT);
+		$this->addType('expiredAt', Types::BIGINT);
+		$this->addType('recipientEmail', Types::STRING);
+		$this->addType('recipientName', Types::STRING);
+		$this->addType('recipientProvider', Types::STRING);
+		$this->addType('recipientUserId', Types::STRING);
+		$this->addType('token', Types::STRING);
+		$this->addType('userId', Types::STRING);
+	}
+}
@@ -0,0 +1,33 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * SPDX-FileCopyrightText: 2025 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+namespace OCA\CloudFederationAPI\Db;
+
+use OCP\AppFramework\Db\QBMapper;
+use OCP\IDBConnection;
+
+/**
+ * @template-extends QBMapper<FederatedInvite>
+ */
+class FederatedInviteMapper extends QBMapper {
+	public const TABLE_NAME = 'federated_invites';
+
+	public function __construct(IDBConnection $db) {
+		parent::__construct($db, self::TABLE_NAME);
+	}
+
+	public function findByToken(string $token): FederatedInvite {
+		$qb = $this->db->getQueryBuilder();
+		$qb->select('*')
+			->from('federated_invites')
+			->where($qb->expr()->eq('token', $qb->createNamedParameter($token)));
+		return $this->findEntity($qb);
+	}
+
+}
@@ -0,0 +1,24 @@
+<?php
+
+declare(strict_types=1);
+/**
+ * SPDX-FileCopyrightText: 2025 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+namespace OCA\CloudFederationAPI\Events;
+
+use OCA\CloudFederationAPI\Db\FederatedInvite;
+use OCP\EventDispatcher\Event;
+
+class FederatedInviteAcceptedEvent extends Event {
+	public function __construct(
+		private FederatedInvite $invitation,
+	) {
+		parent::__construct();
+	}
+
+	public function getInvitation(): FederatedInvite {
+		return $this->invitation;
+	}
+}
@@ -0,0 +1,89 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * SPDX-FileCopyrightText: 2025 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+namespace OCA\CloudFederationAPI\Migration;
+
+use Closure;
+use OCP\DB\ISchemaWrapper;
+use OCP\DB\Types;
+use OCP\Migration\IOutput;
+use OCP\Migration\SimpleMigrationStep;
+
+class Version1016Date202502262004 extends SimpleMigrationStep {
+	/**
+	 * @param IOutput $output
+	 * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
+	 * @param array $options
+	 * @return null|ISchemaWrapper
+	 */
+	public function changeSchema(IOutput $output, Closure $schemaClosure, array $options) {
+		/** @var ISchemaWrapper $schema */
+		$schema = $schemaClosure();
+		$table_name = 'federated_invites';
+
+		if (!$schema->hasTable($table_name)) {
+			$table = $schema->createTable($table_name);
+			$table->addColumn('id', Types::BIGINT, [
+				'autoincrement' => true,
+				'notnull' => true,
+				'length' => 11,
+				'unsigned' => true,
+			]);
+			$table->addColumn('user_id', Types::STRING, [
+				'notnull' => true,
+				'length' => 64,
+
+			]);
+			// https://saturncloud.io/blog/what-is-the-maximum-length-of-a-url-in-different-browsers/#maximum-url-length-in-different-browsers
+			// We use the least common denominator, the minimum length supported by browsers
+			$table->addColumn('recipient_provider', Types::STRING, [
+				'notnull' => false,
+				'length' => 2083,
+			]);
+			$table->addColumn('recipient_user_id', Types::STRING, [
+				'notnull' => false,
+				'length' => 1024,
+			]);
+			$table->addColumn('recipient_name', Types::STRING, [
+				'notnull' => false,
+				'length' => 1024,
+			]);
+			// https://www.directedignorance.com/blog/maximum-length-of-email-address
+			$table->addColumn('recipient_email', Types::STRING, [
+				'notnull' => false,
+				'length' => 320,
+			]);
+			$table->addColumn('token', Types::STRING, [
+				'notnull' => true,
+				'length' => 60,
+			]);
+			$table->addColumn('accepted', Types::BOOLEAN, [
+				'notnull' => false,
+				'default' => false
+			]);
+			$table->addColumn('created_at', Types::BIGINT, [
+				'notnull' => true,
+			]);
+
+			$table->addColumn('expired_at', Types::BIGINT, [
+				'notnull' => false,
+			]);
+
+			$table->addColumn('accepted_at', Types::BIGINT, [
+				'notnull' => false,
+			]);
+
+			$table->addUniqueConstraint(['token']);
+			$table->setPrimaryKey(['id']);
+			return $schema;
+		}
+
+		return null;
+	}
+}
@@ -36,79 +36,10 @@
            },
            "Capabilities": {
                "type": "object",
-                "required": [
-                    "ocm"
-                ],
-                "properties": {
-                    "ocm": {
-                        "type": "object",
-                        "required": [
-                            "apiVersion",
-                            "enabled",
-                            "endPoint",
-                            "resourceTypes",
-                            "version"
-                        ],
-                        "properties": {
-                            "apiVersion": {
-                                "type": "string",
-                                "enum": [
-                                    "1.0-proposal1"
-                                ]
-                            },
-                            "enabled": {
-                                "type": "boolean"
-                            },
-                            "endPoint": {
-                                "type": "string"
-                            },
-                            "publicKey": {
-                                "type": "object",
-                                "required": [
-                                    "keyId",
-                                    "publicKeyPem"
-                                ],
-                                "properties": {
-                                    "keyId": {
-                                        "type": "string"
-                                    },
-                                    "publicKeyPem": {
-                                        "type": "string"
-                                    }
-                                }
-                            },
-                            "resourceTypes": {
-                                "type": "array",
-                                "items": {
-                                    "type": "object",
-                                    "required": [
-                                        "name",
-                                        "shareTypes",
-                                        "protocols"
-                                    ],
-                                    "properties": {
-                                        "name": {
-                                            "type": "string"
-                                        },
-                                        "shareTypes": {
-                                            "type": "array",
-                                            "items": {
-                                                "type": "string"
-                                            }
-                                        },
-                                        "protocols": {
-                                            "type": "object",
-                                            "additionalProperties": {
-                                                "type": "string"
-                                            }
-                                        }
-                                    }
-                                }
-                            },
-                            "version": {
-                                "type": "string"
-                            }
-                        }
+                "additionalProperties": {
+                    "type": "object",
+                    "additionalProperties": {
+                        "type": "object"
                    }
                }
            },
@@ -396,6 +327,167 @@
                    }
                }
            }
+        },
+        "/index.php/ocm/invite-accepted": {
+            "post": {
+                "operationId": "request_handler-invite-accepted",
+                "summary": "Inform the sender that an invitation was accepted to start sharing",
+                "description": "Inform about an accepted invitation so the user on the sender provider's side can initiate the OCM share creation. To protect the identity of the parties, for shares created following an OCM invitation, the user id MAY be hashed, and recipients implementing the OCM invitation workflow MAY refuse to process shares coming from unknown parties.\nhttps://cs3org.github.io/OCM-API/docs.html?branch=v1.1.0&repo=OCM-API&user=cs3org#/paths/~1invite-accepted/post\nNote: Not implementing 404 Invitation token does not exist, instead using 400",
+                "tags": [
+                    "request_handler"
+                ],
+                "security": [
+                    {},
+                    {
+                        "bearer_auth": []
+                    },
+                    {
+                        "basic_auth": []
+                    }
+                ],
+                "requestBody": {
+                    "required": true,
+                    "content": {
+                        "application/json": {
+                            "schema": {
+                                "type": "object",
+                                "required": [
+                                    "recipientProvider",
+                                    "token",
+                                    "userId",
+                                    "email",
+                                    "name"
+                                ],
+                                "properties": {
+                                    "recipientProvider": {
+                                        "type": "string",
+                                        "description": "The address of the recipent's provider"
+                                    },
+                                    "token": {
+                                        "type": "string",
+                                        "description": "The token used for the invitation"
+                                    },
+                                    "userId": {
+                                        "type": "string",
+                                        "description": "The userId of the recipient at the recipient's provider"
+                                    },
+                                    "email": {
+                                        "type": "string",
+                                        "description": "The email address of the recipient"
+                                    },
+                                    "name": {
+                                        "type": "string",
+                                        "description": "The display name of the recipient"
+                                    }
+                                }
+                            }
+                        }
+                    }
+                },
+                "responses": {
+                    "200": {
+                        "description": "Invitation accepted",
+                        "content": {
+                            "application/json": {
+                                "schema": {
+                                    "type": "object",
+                                    "required": [
+                                        "userID",
+                                        "email",
+                                        "name"
+                                    ],
+                                    "properties": {
+                                        "userID": {
+                                            "type": "string"
+                                        },
+                                        "email": {
+                                            "type": "string"
+                                        },
+                                        "name": {
+                                            "type": "string"
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    },
+                    "403": {
+                        "description": "Invitation token does not exist",
+                        "content": {
+                            "application/json": {
+                                "schema": {
+                                    "type": "object",
+                                    "required": [
+                                        "message",
+                                        "error"
+                                    ],
+                                    "properties": {
+                                        "message": {
+                                            "type": "string"
+                                        },
+                                        "error": {
+                                            "type": "boolean",
+                                            "enum": [
+                                                true
+                                            ]
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    },
+                    "400": {
+                        "description": "Invalid token",
+                        "content": {
+                            "application/json": {
+                                "schema": {
+                                    "type": "object",
+                                    "required": [
+                                        "message",
+                                        "error"
+                                    ],
+                                    "properties": {
+                                        "message": {
+                                            "type": "string"
+                                        },
+                                        "error": {
+                                            "type": "boolean",
+                                            "enum": [
+                                                true
+                                            ]
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    },
+                    "409": {
+                        "description": "User is already known by the OCM provider",
+                        "content": {
+                            "application/json": {
+                                "schema": {
+                                    "type": "object",
+                                    "required": [
+                                        "message",
+                                        "error"
+                                    ],
+                                    "properties": {
+                                        "message": {
+                                            "type": "string"
+                                        },
+                                        "error": {
+                                            "type": "boolean",
+                                            "enum": [
+                                                true
+                                            ]
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            }
        }
    },
    "tags": [
@@ -0,0 +1,136 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * SPDX-FileCopyrightText: 2025 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+namespace OCA\CloudFederationApi\Tests;
+
+use NCU\Security\Signature\ISignatureManager;
+use OC\OCM\OCMSignatoryManager;
+use OCA\CloudFederationAPI\Config;
+use OCA\CloudFederationAPI\Controller\RequestHandlerController;
+use OCA\CloudFederationAPI\Db\FederatedInvite;
+use OCA\CloudFederationAPI\Db\FederatedInviteMapper;
+use OCA\FederatedFileSharing\AddressHandler;
+use OCP\AppFramework\Http;
+use OCP\AppFramework\Http\JSONResponse;
+use OCP\AppFramework\Utility\ITimeFactory;
+use OCP\EventDispatcher\IEventDispatcher;
+use OCP\Federation\ICloudFederationFactory;
+use OCP\Federation\ICloudFederationProviderManager;
+use OCP\Federation\ICloudIdManager;
+use OCP\IAppConfig;
+use OCP\IGroupManager;
+use OCP\IRequest;
+use OCP\IURLGenerator;
+use OCP\IUser;
+use OCP\IUserManager;
+use PHPUnit\Framework\MockObject\MockObject;
+use Psr\Log\LoggerInterface;
+use Test\TestCase;
+
+class RequestHandlerControllerTest extends TestCase {
+	private IRequest&MockObject $request;
+	private LoggerInterface&MockObject $logger;
+	private IUserManager&MockObject $userManager;
+	private IGroupManager&MockObject $groupManager;
+	private IURLGenerator&MockObject $urlGenerator;
+	private ICloudFederationProviderManager&MockObject $cloudFederationProviderManager;
+	private Config&MockObject $config;
+	private IEventDispatcher&MockObject $eventDispatcher;
+	private FederatedInviteMapper&MockObject $federatedInviteMapper;
+	private AddressHandler&MockObject $addressHandler;
+	private IAppConfig&MockObject $appConfig;
+	private ICloudFederationFactory&MockObject $cloudFederationFactory;
+	private ICloudIdManager&MockObject $cloudIdManager;
+	private ISignatureManager&MockObject $signatureManager;
+	private OCMSignatoryManager&MockObject $signatoryManager;
+	private ITimeFactory&MockObject $timeFactory;
+
+	private RequestHandlerController $requestHandlerController;
+
+	protected function setUp(): void {
+		parent::setUp();
+
+		$this->request = $this->createMock(IRequest::class);
+		$this->logger = $this->createMock(LoggerInterface::class);
+		$this->userManager = $this->createMock(IUserManager::class);
+		$this->groupManager = $this->createMock(IGroupManager::class);
+		$this->urlGenerator = $this->createMock(IURLGenerator::class);
+		$this->cloudFederationProviderManager = $this->createMock(ICloudFederationProviderManager::class);
+		$this->config = $this->createMock(Config::class);
+		$this->eventDispatcher = $this->createMock(IEventDispatcher::class);
+		$this->federatedInviteMapper = $this->createMock(FederatedInviteMapper::class);
+		$this->addressHandler = $this->createMock(AddressHandler::class);
+		$this->appConfig = $this->createMock(IAppConfig::class);
+		$this->cloudFederationFactory = $this->createMock(ICloudFederationFactory::class);
+		$this->cloudIdManager = $this->createMock(ICloudIdManager::class);
+		$this->signatureManager = $this->createMock(ISignatureManager::class);
+		$this->signatoryManager = $this->createMock(OCMSignatoryManager::class);
+		$this->timeFactory = $this->createMock(ITimeFactory::class);
+
+		$this->requestHandlerController = new RequestHandlerController(
+			'cloud_federation_api',
+			$this->request,
+			$this->logger,
+			$this->userManager,
+			$this->groupManager,
+			$this->urlGenerator,
+			$this->cloudFederationProviderManager,
+			$this->config,
+			$this->eventDispatcher,
+			$this->federatedInviteMapper,
+			$this->addressHandler,
+			$this->appConfig,
+			$this->cloudFederationFactory,
+			$this->cloudIdManager,
+			$this->signatureManager,
+			$this->signatoryManager,
+			$this->timeFactory,
+		);
+	}
+
+	public function testInviteAccepted(): void {
+		$token = 'token';
+		$userId = 'userId';
+		$invite = new FederatedInvite();
+		$invite->setCreatedAt(1);
+		$invite->setUserId($userId);
+		$invite->setToken($token);
+
+		$this->federatedInviteMapper->expects(self::once())
+			->method('findByToken')
+			->with($token)
+			->willReturn($invite);
+
+		$this->federatedInviteMapper->expects(self::once())
+			->method('update')
+			->willReturnArgument(0);
+
+		$user = $this->createMock(IUser::class);
+		$user->method('getUID')
+			->willReturn($userId);
+		$user->method('getEMailAddress')
+			->willReturn('email');
+		$user->method('getDisplayName')
+			->willReturn('displayName');
+
+		$this->userManager->expects(self::once())
+			->method('get')
+			->with($userId)
+			->willReturn($user);
+
+		$recipientProvider = 'http://127.0.0.1';
+		$recipientId = 'remote';
+		$recipientEmail = 'remote@example.org';
+		$recipientName = 'Remote Remoteson';
+		$response = ['userID' => $userId, 'email' => 'email', 'name' => 'displayName'];
+		$json = new JSONResponse($response, Http::STATUS_OK);
+
+		$this->assertEquals($json, $this->requestHandlerController->inviteAccepted($recipientProvider, $token, $recipientId, $recipientEmail, $recipientName));
+	}
+}
@@ -10,7 +10,7 @@
 	<name>Comments</name>
 	<summary>Files app plugin to add comments to files</summary>
 	<description>Files app plugin to add comments to files</description>
-	<version>1.21.0</version>
+	<version>1.22.0</version>
 	<licence>agpl</licence>
 	<author>Arthur Schiwon</author>
 	<author>Vincent Petry</author>
@@ -21,7 +21,7 @@
 	<category>social</category>
 	<bugs>https://github.com/nextcloud/server/issues</bugs>
 	<dependencies>
-		<nextcloud min-version="31" max-version="31"/>
+		<nextcloud min-version="32" max-version="32"/>
 	</dependencies>

 	<activity>
@@ -0,0 +1,20 @@
+OC.L10N.register(
+    "comments",
+    {
+    "Comments" : "Kommentare",
+    "You commented" : "U het kommentaar gelewer",
+    "{author} commented" : "{outeur} het kommentaar gelewer",
+    "You commented on %1$s" : "U het op %1$s kommentaar gelewer",
+    "You commented on {file}" : "U het op {lêer} kommentaar gelewer",
+    "%1$s commented on %2$s" : "%1$s het op %2$s kommentaar gelewer",
+    "{author} commented on {file}" : "{outeur} het op {lêer} kommentaar gelewer",
+    "<strong>Comments</strong> for files" : "<strong>Kommentare</strong> vir lêers",
+    "Files app plugin to add comments to files" : "Lêertoepinprop om kommentaar op lêers te lewer",
+    "Edit comment" : "Wysig kommentaar",
+    "Delete comment" : "Skrap kommentaar",
+    "No comments yet, start the conversation!" : "Nog geen kommentaar, begin die gesprek!",
+    "Retry" : "Herprobeer",
+    "Comment" : "Kommentaar",
+    "_%n unread comment_::_%n unread comments_" : ["%n ongelese kommentaar","%n ongelese kommentare"]
+},
+"nplurals=2; plural=(n != 1);");
@@ -0,0 +1,18 @@
+{ "translations": {
+    "Comments" : "Kommentare",
+    "You commented" : "U het kommentaar gelewer",
+    "{author} commented" : "{outeur} het kommentaar gelewer",
+    "You commented on %1$s" : "U het op %1$s kommentaar gelewer",
+    "You commented on {file}" : "U het op {lêer} kommentaar gelewer",
+    "%1$s commented on %2$s" : "%1$s het op %2$s kommentaar gelewer",
+    "{author} commented on {file}" : "{outeur} het op {lêer} kommentaar gelewer",
+    "<strong>Comments</strong> for files" : "<strong>Kommentare</strong> vir lêers",
+    "Files app plugin to add comments to files" : "Lêertoepinprop om kommentaar op lêers te lewer",
+    "Edit comment" : "Wysig kommentaar",
+    "Delete comment" : "Skrap kommentaar",
+    "No comments yet, start the conversation!" : "Nog geen kommentaar, begin die gesprek!",
+    "Retry" : "Herprobeer",
+    "Comment" : "Kommentaar",
+    "_%n unread comment_::_%n unread comments_" : ["%n ongelese kommentaar","%n ongelese kommentare"]
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
@@ -17,6 +17,7 @@ OC.L10N.register(
    "Delete comment" : "حذف التعليق",
    "Cancel edit" : "إلغاء التعديل",
    "New comment" : "تعليق جديد",
+    "Write a comment …" : "أكتُب تعليق ...",
    "Post comment" : "أضف تعليق",
    "@ for mentions, : for emoji, / for smart picker" : "@ للإشارات : للإيموجي  / للاقط الذكي",
    "Could not reload comments" : "تعذّرت إعادة تحميل التعليقات",
@@ -30,7 +31,6 @@ OC.L10N.register(
    "An error occurred while trying to edit the comment" : "حدث خطأ أثناء محاولة تعديل التعليق",
    "Comment deleted" : "التعليق محذوف",
    "An error occurred while trying to delete the comment" : "حدث خطأ أثناء محاولة حذف التعليق",
-    "An error occurred while trying to create the comment" : "حدث خطأ أثناء محاولة إنشاء التعليق",
-    "Write a comment …" : "أكتُب تعليق ..."
+    "An error occurred while trying to create the comment" : "حدث خطأ أثناء محاولة إنشاء التعليق"
 },
 "nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;");
@@ -15,6 +15,7 @@
    "Delete comment" : "حذف التعليق",
    "Cancel edit" : "إلغاء التعديل",
    "New comment" : "تعليق جديد",
+    "Write a comment …" : "أكتُب تعليق ...",
    "Post comment" : "أضف تعليق",
    "@ for mentions, : for emoji, / for smart picker" : "@ للإشارات : للإيموجي  / للاقط الذكي",
    "Could not reload comments" : "تعذّرت إعادة تحميل التعليقات",
@@ -28,7 +29,6 @@
    "An error occurred while trying to edit the comment" : "حدث خطأ أثناء محاولة تعديل التعليق",
    "Comment deleted" : "التعليق محذوف",
    "An error occurred while trying to delete the comment" : "حدث خطأ أثناء محاولة حذف التعليق",
-    "An error occurred while trying to create the comment" : "حدث خطأ أثناء محاولة إنشاء التعليق",
-    "Write a comment …" : "أكتُب تعليق ..."
+    "An error occurred while trying to create the comment" : "حدث خطأ أثناء محاولة إنشاء التعليق"
 },"pluralForm" :"nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;"
 }
@@ -17,6 +17,7 @@ OC.L10N.register(
    "Delete comment" : "Desaniciar el comentariu",
    "Cancel edit" : "Anular la edición",
    "New comment" : "Comentariu nuevu",
+    "Write a comment …" : "Escribi un comentariu…",
    "Post comment" : "Espublizar el comentariu",
    "@ for mentions, : for emoji, / for smart picker" : "@ pa les menciones, : pa los fustaxes, / pal selector intelixente",
    "Could not reload comments" : "Nun se pudieron recargar los comentarios",
@@ -30,7 +31,6 @@ OC.L10N.register(
    "An error occurred while trying to edit the comment" : "Prodúxose un error mentanto se tentaba d'editar el comentariu",
    "Comment deleted" : "Desanicióse'l comentariu",
    "An error occurred while trying to delete the comment" : "Prodúxose un error mentanto se tentaba de desaniciar el comentariu",
-    "An error occurred while trying to create the comment" : "Prodúxose un error mentanto se tentaba de crear el comentariu",
-    "Write a comment …" : "Escribi un comentariu…"
+    "An error occurred while trying to create the comment" : "Prodúxose un error mentanto se tentaba de crear el comentariu"
 },
 "nplurals=2; plural=(n != 1);");
@@ -15,6 +15,7 @@
    "Delete comment" : "Desaniciar el comentariu",
    "Cancel edit" : "Anular la edición",
    "New comment" : "Comentariu nuevu",
+    "Write a comment …" : "Escribi un comentariu…",
    "Post comment" : "Espublizar el comentariu",
    "@ for mentions, : for emoji, / for smart picker" : "@ pa les menciones, : pa los fustaxes, / pal selector intelixente",
    "Could not reload comments" : "Nun se pudieron recargar los comentarios",
@@ -28,7 +29,6 @@
    "An error occurred while trying to edit the comment" : "Prodúxose un error mentanto se tentaba d'editar el comentariu",
    "Comment deleted" : "Desanicióse'l comentariu",
    "An error occurred while trying to delete the comment" : "Prodúxose un error mentanto se tentaba de desaniciar el comentariu",
-    "An error occurred while trying to create the comment" : "Prodúxose un error mentanto se tentaba de crear el comentariu",
-    "Write a comment …" : "Escribi un comentariu…"
+    "An error occurred while trying to create the comment" : "Prodúxose un error mentanto se tentaba de crear el comentariu"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
@@ -0,0 +1,8 @@
+OC.L10N.register(
+    "comments",
+    {
+    "Cancel" : "Dayandır",
+    "Save" : "Saxla",
+    "Comment" : "Komentariya"
+},
+"nplurals=2; plural=(n != 1);");
@@ -0,0 +1,6 @@
+{ "translations": {
+    "Cancel" : "Dayandır",
+    "Save" : "Saxla",
+    "Comment" : "Komentariya"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
@@ -1,37 +0,0 @@
-OC.L10N.register(
-    "comments",
-    {
-    "Comments" : "Каментарыі",
-    "You commented" : "Вы пракаментавалі",
-    "{author} commented" : "{author} пракаментаваў(-ла)",
-    "You commented on %1$s" : "Вы пракаментавалі %1$s",
-    "You commented on {file}" : "Вы пракаментавалі {file}",
-    "%1$s commented on %2$s" : "%1$s пракаментаваў(-ла) %2$s",
-    "{author} commented on {file}" : "{author} пракаментаваў(-ла) {file}",
-    "<strong>Comments</strong> for files" : "<strong>Каментарыі</strong> да файлаў",
-    "Files" : "Файлы",
-    "You were mentioned on \"{file}\", in a comment by an account that has since been deleted" : "Вас згадалі ў каментарыі да \"{file}\" з уліковага запісу, які пазней быў выдалены.",
-    "{user} mentioned you in a comment on \"{file}\"" : "{user} згадаў(-ла) вас у каментарыі да \"{file}\"",
-    "Files app plugin to add comments to files" : "Убудова праграмы Файлы для дадавання каментарыяў да файлаў",
-    "Edit comment" : "Рэдагаваць каментарый",
-    "Delete comment" : "Выдаліць каментарый",
-    "Cancel edit" : "Скасаваць рэдагаванне",
-    "New comment" : "Новы каментарый",
-    "Write a comment …" : "Напішыце каментарый …",
-    "Post comment" : "Апублікаваць каментарый",
-    "@ for mentions, : for emoji, / for smart picker" : "@ - згадкі, : - эмодзі, / - smart picker",
-    "Could not reload comments" : "Не ўдалося перазагрузіць каментарыі",
-    "Failed to mark comments as read" : "Не атрымалася пазначыць каментарыі як прачытаныя",
-    "Unable to load the comments list" : "Не ўдалося загрузіць спіс каментарыяў",
-    "No comments yet, start the conversation!" : "Пакуль няма каментарыяў, пачніце размову!",
-    "No more messages" : "Больш паведамленняў няма",
-    "Retry" : "Паўтарыць спробу",
-    "_1 new comment_::_{unread} new comments_" : ["1 новы каментарый","{unread} новыя каментарыі","{unread} новых каментарыяў","{unread} новых каментарыяў"],
-    "Comment" : "Каментарый",
-    "An error occurred while trying to edit the comment" : "Падчас спробы рэдагавання каментарыя ўзнікла памылка",
-    "Comment deleted" : "Каментарый выдалены",
-    "An error occurred while trying to delete the comment" : "Падчас спробы выдалення каментарыя ўзнікла памылка",
-    "An error occurred while trying to create the comment" : "Падчас спробы стварэння каментарыя ўзнікла памылка",
-    "Write a comment …" : "Напішыце каментарый …"
-},
-"nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);");
@@ -1,35 +0,0 @@
-{ "translations": {
-    "Comments" : "Каментарыі",
-    "You commented" : "Вы пракаментавалі",
-    "{author} commented" : "{author} пракаментаваў(-ла)",
-    "You commented on %1$s" : "Вы пракаментавалі %1$s",
-    "You commented on {file}" : "Вы пракаментавалі {file}",
-    "%1$s commented on %2$s" : "%1$s пракаментаваў(-ла) %2$s",
-    "{author} commented on {file}" : "{author} пракаментаваў(-ла) {file}",
-    "<strong>Comments</strong> for files" : "<strong>Каментарыі</strong> да файлаў",
-    "Files" : "Файлы",
-    "You were mentioned on \"{file}\", in a comment by an account that has since been deleted" : "Вас згадалі ў каментарыі да \"{file}\" з уліковага запісу, які пазней быў выдалены.",
-    "{user} mentioned you in a comment on \"{file}\"" : "{user} згадаў(-ла) вас у каментарыі да \"{file}\"",
-    "Files app plugin to add comments to files" : "Убудова праграмы Файлы для дадавання каментарыяў да файлаў",
-    "Edit comment" : "Рэдагаваць каментарый",
-    "Delete comment" : "Выдаліць каментарый",
-    "Cancel edit" : "Скасаваць рэдагаванне",
-    "New comment" : "Новы каментарый",
-    "Write a comment …" : "Напішыце каментарый …",
-    "Post comment" : "Апублікаваць каментарый",
-    "@ for mentions, : for emoji, / for smart picker" : "@ - згадкі, : - эмодзі, / - smart picker",
-    "Could not reload comments" : "Не ўдалося перазагрузіць каментарыі",
-    "Failed to mark comments as read" : "Не атрымалася пазначыць каментарыі як прачытаныя",
-    "Unable to load the comments list" : "Не ўдалося загрузіць спіс каментарыяў",
-    "No comments yet, start the conversation!" : "Пакуль няма каментарыяў, пачніце размову!",
-    "No more messages" : "Больш паведамленняў няма",
-    "Retry" : "Паўтарыць спробу",
-    "_1 new comment_::_{unread} new comments_" : ["1 новы каментарый","{unread} новыя каментарыі","{unread} новых каментарыяў","{unread} новых каментарыяў"],
-    "Comment" : "Каментарый",
-    "An error occurred while trying to edit the comment" : "Падчас спробы рэдагавання каментарыя ўзнікла памылка",
-    "Comment deleted" : "Каментарый выдалены",
-    "An error occurred while trying to delete the comment" : "Падчас спробы выдалення каментарыя ўзнікла памылка",
-    "An error occurred while trying to create the comment" : "Падчас спробы стварэння каментарыя ўзнікла памылка",
-    "Write a comment …" : "Напішыце каментарый …"
-},"pluralForm" :"nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);"
-}
@@ -0,0 +1,8 @@
+OC.L10N.register(
+    "comments",
+    {
+    "Cancel" : "বাতিল",
+    "Save" : "সংরক্ষণ",
+    "Comment" : "মন্তব্য"
+},
+"nplurals=2; plural=(n != 1);");
@@ -0,0 +1,6 @@
+{ "translations": {
+    "Cancel" : "বাতিল",
+    "Save" : "সংরক্ষণ",
+    "Comment" : "মন্তব্য"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
@@ -0,0 +1,8 @@
+OC.L10N.register(
+    "comments",
+    {
+    "Cancel" : "Odustani",
+    "Save" : "Spremi",
+    "Comment" : "Komentar"
+},
+"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);");
@@ -0,0 +1,6 @@
+{ "translations": {
+    "Cancel" : "Odustani",
+    "Save" : "Spremi",
+    "Comment" : "Komentar"
+},"pluralForm" :"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);"
+}
@@ -17,6 +17,7 @@ OC.L10N.register(
    "Delete comment" : "Suprimeix el comentari",
    "Cancel edit" : "Cancel·la l'edició",
    "New comment" : "Comentari nou",
+    "Write a comment …" : "Escriviu un comentari…",
    "Post comment" : "Publica el comentari",
    "@ for mentions, : for emoji, / for smart picker" : "@ per a mencions, : per a emojis, / per al selector intel·ligent",
    "Could not reload comments" : "No s'han pogut tornar a carregar els comentaris",
@@ -30,7 +31,6 @@ OC.L10N.register(
    "An error occurred while trying to edit the comment" : "S'ha produït un error en intentar editar el comentari",
    "Comment deleted" : "S'ha suprimit el comentari",
    "An error occurred while trying to delete the comment" : "S'ha produït un error en intentar suprimir el comentari",
-    "An error occurred while trying to create the comment" : "S'ha produït un error en intentar crear el comentari",
-    "Write a comment …" : "Escriviu un comentari…"
+    "An error occurred while trying to create the comment" : "S'ha produït un error en intentar crear el comentari"
 },
 "nplurals=2; plural=(n != 1);");
@@ -15,6 +15,7 @@
    "Delete comment" : "Suprimeix el comentari",
    "Cancel edit" : "Cancel·la l'edició",
    "New comment" : "Comentari nou",
+    "Write a comment …" : "Escriviu un comentari…",
    "Post comment" : "Publica el comentari",
    "@ for mentions, : for emoji, / for smart picker" : "@ per a mencions, : per a emojis, / per al selector intel·ligent",
    "Could not reload comments" : "No s'han pogut tornar a carregar els comentaris",
@@ -28,7 +29,6 @@
    "An error occurred while trying to edit the comment" : "S'ha produït un error en intentar editar el comentari",
    "Comment deleted" : "S'ha suprimit el comentari",
    "An error occurred while trying to delete the comment" : "S'ha produït un error en intentar suprimir el comentari",
-    "An error occurred while trying to create the comment" : "S'ha produït un error en intentar crear el comentari",
-    "Write a comment …" : "Escriviu un comentari…"
+    "An error occurred while trying to create the comment" : "S'ha produït un error en intentar crear el comentari"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
@@ -17,7 +17,7 @@ OC.L10N.register(
    "Delete comment" : "Smazat komentář",
    "Cancel edit" : "Zrušit úpravu",
    "New comment" : "Nový komentář",
-    "Write a comment …" : "Napsat komentář …",
+    "Write a comment …" : "Napsat komentář…",
    "Post comment" : "Odeslat komentář",
    "@ for mentions, : for emoji, / for smart picker" : "@ pro zmínění, : pro emotikony, / pro inteligentní výběr",
    "Could not reload comments" : "Znovunačtení komentářů se nezdařilo",
@@ -31,7 +31,6 @@ OC.L10N.register(
    "An error occurred while trying to edit the comment" : "Došlo k chybě při pokusu o úpravu komentáře",
    "Comment deleted" : "Komentář smazán",
    "An error occurred while trying to delete the comment" : "Došlo k chybě při pokusu o smazání komentáře",
-    "An error occurred while trying to create the comment" : "Došlo k chybě při pokusu o vytvoření komentáře",
-    "Write a comment …" : "Napsat komentář…"
+    "An error occurred while trying to create the comment" : "Došlo k chybě při pokusu o vytvoření komentáře"
 },
 "nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n >= 2 && n <= 4 && n % 1 == 0) ? 1: (n % 1 != 0 ) ? 2 : 3;");
@@ -15,7 +15,7 @@
    "Delete comment" : "Smazat komentář",
    "Cancel edit" : "Zrušit úpravu",
    "New comment" : "Nový komentář",
-    "Write a comment …" : "Napsat komentář …",
+    "Write a comment …" : "Napsat komentář…",
    "Post comment" : "Odeslat komentář",
    "@ for mentions, : for emoji, / for smart picker" : "@ pro zmínění, : pro emotikony, / pro inteligentní výběr",
    "Could not reload comments" : "Znovunačtení komentářů se nezdařilo",
@@ -29,7 +29,6 @@
    "An error occurred while trying to edit the comment" : "Došlo k chybě při pokusu o úpravu komentáře",
    "Comment deleted" : "Komentář smazán",
    "An error occurred while trying to delete the comment" : "Došlo k chybě při pokusu o smazání komentáře",
-    "An error occurred while trying to create the comment" : "Došlo k chybě při pokusu o vytvoření komentáře",
-    "Write a comment …" : "Napsat komentář…"
+    "An error occurred while trying to create the comment" : "Došlo k chybě při pokusu o vytvoření komentáře"
 },"pluralForm" :"nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n >= 2 && n <= 4 && n % 1 == 0) ? 1: (n % 1 != 0 ) ? 2 : 3;"
 }
@@ -0,0 +1,7 @@
+OC.L10N.register(
+    "comments",
+    {
+    "Cancel" : "Diddymu",
+    "Save" : "Cadw"
+},
+"nplurals=4; plural=(n==1) ? 0 : (n==2) ? 1 : (n != 8 && n != 11) ? 2 : 3;");
@@ -0,0 +1,5 @@
+{ "translations": {
+    "Cancel" : "Diddymu",
+    "Save" : "Cadw"
+},"pluralForm" :"nplurals=4; plural=(n==1) ? 0 : (n==2) ? 1 : (n != 8 && n != 11) ? 2 : 3;"
+}
@@ -10,14 +10,14 @@ OC.L10N.register(
    "{author} commented on {file}" : "{author} kommenterede {file}",
    "<strong>Comments</strong> for files" : "<strong>Kommentarer</strong> for filer",
    "Files" : "Filer",
-    "You were mentioned on \"{file}\", in a comment by an account that has since been deleted" : "Du blev omtalt på \"{file}\", i en kommentar af en konto, som siden er blevet slettet",
-    "{user} mentioned you in a comment on \"{file}\"" : "{user} omtalte dig i en kommentar til \"{file}\"",
+    "You were mentioned on \"{file}\", in a comment by an account that has since been deleted" : "Du blev nævnt på \"{file}\", i en kommentar af en konto, som siden er blevet slettet",
+    "{user} mentioned you in a comment on \"{file}\"" : "{user} nævnte dig i en kommentar til \"{file}\"",
    "Files app plugin to add comments to files" : "Files app plugin til at tilføje kommentarer til filer",
-    "Edit comment" : "Redigér kommentar",
+    "Edit comment" : "Rediger kommentar",
    "Delete comment" : "Slet kommentar",
-    "Cancel edit" : "Annullér redigering",
+    "Cancel edit" : "Annuller redigering",
    "New comment" : "Ny kommentar",
-    "Write a comment …" : "Skriv kommentar …",
+    "Write a comment …" : "Skriv kommentar…",
    "Post comment" : "Skriv kommentar",
    "@ for mentions, : for emoji, / for smart picker" : "\"@\" for at omtale, \":\" for emojis, \"/\" for Smart Vælger",
    "Could not reload comments" : "Kunne ikke indlæse kommentarer",
@@ -31,7 +31,6 @@ OC.L10N.register(
    "An error occurred while trying to edit the comment" : "Der opstod en fejl under forsøget på at redigere kommentaren",
    "Comment deleted" : "Kommentar slettet",
    "An error occurred while trying to delete the comment" : "Der opstod en fejl under forsøget på at slette kommentaren",
-    "An error occurred while trying to create the comment" : "Der opstod en fejl under forsøget på at oprette kommentaren",
-    "Write a comment …" : "Skriv kommentar…"
+    "An error occurred while trying to create the comment" : "Der opstod en fejl under forsøget på at oprette kommentaren"
 },
 "nplurals=2; plural=(n != 1);");
@@ -8,14 +8,14 @@
    "{author} commented on {file}" : "{author} kommenterede {file}",
    "<strong>Comments</strong> for files" : "<strong>Kommentarer</strong> for filer",
    "Files" : "Filer",
-    "You were mentioned on \"{file}\", in a comment by an account that has since been deleted" : "Du blev omtalt på \"{file}\", i en kommentar af en konto, som siden er blevet slettet",
-    "{user} mentioned you in a comment on \"{file}\"" : "{user} omtalte dig i en kommentar til \"{file}\"",
+    "You were mentioned on \"{file}\", in a comment by an account that has since been deleted" : "Du blev nævnt på \"{file}\", i en kommentar af en konto, som siden er blevet slettet",
+    "{user} mentioned you in a comment on \"{file}\"" : "{user} nævnte dig i en kommentar til \"{file}\"",
    "Files app plugin to add comments to files" : "Files app plugin til at tilføje kommentarer til filer",
-    "Edit comment" : "Redigér kommentar",
+    "Edit comment" : "Rediger kommentar",
    "Delete comment" : "Slet kommentar",
-    "Cancel edit" : "Annullér redigering",
+    "Cancel edit" : "Annuller redigering",
    "New comment" : "Ny kommentar",
-    "Write a comment …" : "Skriv kommentar …",
+    "Write a comment …" : "Skriv kommentar…",
    "Post comment" : "Skriv kommentar",
    "@ for mentions, : for emoji, / for smart picker" : "\"@\" for at omtale, \":\" for emojis, \"/\" for Smart Vælger",
    "Could not reload comments" : "Kunne ikke indlæse kommentarer",
@@ -29,7 +29,6 @@
    "An error occurred while trying to edit the comment" : "Der opstod en fejl under forsøget på at redigere kommentaren",
    "Comment deleted" : "Kommentar slettet",
    "An error occurred while trying to delete the comment" : "Der opstod en fejl under forsøget på at slette kommentaren",
-    "An error occurred while trying to create the comment" : "Der opstod en fejl under forsøget på at oprette kommentaren",
-    "Write a comment …" : "Skriv kommentar…"
+    "An error occurred while trying to create the comment" : "Der opstod en fejl under forsøget på at oprette kommentaren"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
@@ -17,7 +17,7 @@ OC.L10N.register(
    "Delete comment" : "Kommentar löschen",
    "Cancel edit" : "Bearbeiten abbrechen",
    "New comment" : "Neuer Kommentar",
-    "Write a comment …" : "Einen Kommentar schreiben …",
+    "Write a comment …" : "Einen Kommentar schreiben …",
    "Post comment" : "Kommentar veröffentlichen",
    "@ for mentions, : for emoji, / for smart picker" : "@ für Erwähnungen, : für Emoji, / für Smart Picker",
    "Could not reload comments" : "Kommentare konnten nicht erneut geladen werden",
@@ -31,7 +31,6 @@ OC.L10N.register(
    "An error occurred while trying to edit the comment" : "Es ist ein Fehler beim Bearbeiten des Kommentars aufgetreten",
    "Comment deleted" : "Kommentar gelöscht",
    "An error occurred while trying to delete the comment" : "Es ist ein Fehler beim Löschen des Kommentars aufgetreten",
-    "An error occurred while trying to create the comment" : "Es ist ein Fehler beim Erstellen des Kommentars aufgetreten",
-    "Write a comment …" : "Einen Kommentar schreiben …"
+    "An error occurred while trying to create the comment" : "Es ist ein Fehler beim Erstellen des Kommentars aufgetreten"
 },
 "nplurals=2; plural=(n != 1);");
@@ -15,7 +15,7 @@
    "Delete comment" : "Kommentar löschen",
    "Cancel edit" : "Bearbeiten abbrechen",
    "New comment" : "Neuer Kommentar",
-    "Write a comment …" : "Einen Kommentar schreiben …",
+    "Write a comment …" : "Einen Kommentar schreiben …",
    "Post comment" : "Kommentar veröffentlichen",
    "@ for mentions, : for emoji, / for smart picker" : "@ für Erwähnungen, : für Emoji, / für Smart Picker",
    "Could not reload comments" : "Kommentare konnten nicht erneut geladen werden",
@@ -29,7 +29,6 @@
    "An error occurred while trying to edit the comment" : "Es ist ein Fehler beim Bearbeiten des Kommentars aufgetreten",
    "Comment deleted" : "Kommentar gelöscht",
    "An error occurred while trying to delete the comment" : "Es ist ein Fehler beim Löschen des Kommentars aufgetreten",
-    "An error occurred while trying to create the comment" : "Es ist ein Fehler beim Erstellen des Kommentars aufgetreten",
-    "Write a comment …" : "Einen Kommentar schreiben …"
+    "An error occurred while trying to create the comment" : "Es ist ein Fehler beim Erstellen des Kommentars aufgetreten"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
--- a/Show More
+++ b/Show More