Merge pull request #37202 from nextcloud/release/26.0.0_rc3

26.0.0 RC3
Merge pull request #37031 from nextcloud/dependabot/npm_and_yarn/stable26/nextcloud/webpack-vue-config-516d77c
2023-03-16 12:48:19 +01:00 · 2023-03-16 12:12:26 +01:00 · 2023-03-16 11:10:20 +01:00 · 2023-03-16 11:09:36 +01:00 · 2023-03-16 10:38:24 +01:00 · 2023-03-16 10:30:23 +01:00
4791 changed files with 92196 additions and 101653 deletions
@@ -1,6 +1,7 @@
 <?php

-$cloudEnvironmentId = getenv('CLOUDENV_ENVIRONMENT_ID');
+$codespaceName = getenv('CODESPACE_NAME');
+$codespaceDomain = getenv('GITHUB_CODESPACES_PORT_FORWARDING_DOMAIN');

 $CONFIG = [
    'mail_from_address' => 'no-reply',
@@ -12,7 +13,7 @@ $CONFIG = [
    'memcache.local' => '\OC\Memcache\APCu',
 ];

-if($cloudEnvironmentId !== true) {
-    $CONFIG['overwritehost'] = $cloudEnvironmentId . '-80.apps.codespaces.githubusercontent.com';
+if(is_string($codespaceName) && !empty($codespaceName) && is_string($codespaceDomain) && !empty($codespaceDomain)) {
+    $CONFIG['overwritehost'] = $codespaceName . '-80.' . $codespaceDomain;
    $CONFIG['overwriteprotocol'] = 'https';
 }
@@ -7,7 +7,7 @@ steps:
  commands:
    - git submodule update --init
 - name: checkers
-  image: ghcr.io/nextcloud/continuous-integration-integration-php7.4:latest
+  image: ghcr.io/nextcloud/continuous-integration-php8.0:latest
  commands:
    - ./autotest-checkers.sh
  secrets: [ github_token ]
@@ -30,12 +30,12 @@ steps:
  commands:
    - git submodule update --init
 - name: litmus-v1
-  image: ghcr.io/nextcloud/continuous-integration-litmus-php7.4:latest
+  image: ghcr.io/nextcloud/continuous-integration-litmus-php8.0:latest
  commands:
    - bash tests/travis/install.sh sqlite
    - bash apps/dav/tests/travis/litmus-v1/script.sh
 - name: litmus-v2
-  image: ghcr.io/nextcloud/continuous-integration-litmus-php7.4:latest
+  image: ghcr.io/nextcloud/continuous-integration-litmus-php8.0:latest
  commands:
    - bash tests/travis/install.sh sqlite
    - bash apps/dav/tests/travis/litmus-v2/script.sh
@@ -58,7 +58,7 @@ steps:
  commands:
    - git submodule update --init
 - name: caldavtester-new-endpoint
-  image: ghcr.io/nextcloud/continuous-integration-litmus-php7.4:latest
+  image: ghcr.io/nextcloud/continuous-integration-litmus-php8.0:latest
  commands:
    - bash tests/travis/install.sh sqlite
    - bash apps/dav/tests/travis/caldav/install.sh
@@ -82,7 +82,7 @@ steps:
  commands:
    - git submodule update --init
 - name: caldavtester-old-endpoint
-  image: ghcr.io/nextcloud/continuous-integration-litmus-php7.4:latest
+  image: ghcr.io/nextcloud/continuous-integration-litmus-php8.0:latest
  commands:
    - bash tests/travis/install.sh sqlite
    - bash apps/dav/tests/travis/caldav/install.sh
@@ -106,7 +106,7 @@ steps:
  commands:
    - git submodule update --init
 - name: carddavtester-new-endpoint
-  image: ghcr.io/nextcloud/continuous-integration-litmus-php7.4:latest
+  image: ghcr.io/nextcloud/continuous-integration-litmus-php8.0:latest
  commands:
    - bash tests/travis/install.sh sqlite
    - bash apps/dav/tests/travis/carddav/install.sh
@@ -130,7 +130,7 @@ steps:
  commands:
    - git submodule update --init
 - name: carddavtester-old-endpoint
-  image: ghcr.io/nextcloud/continuous-integration-litmus-php7.4:latest
+  image: ghcr.io/nextcloud/continuous-integration-litmus-php8.0:latest
  commands:
    - bash tests/travis/install.sh sqlite
    - bash apps/dav/tests/travis/carddav/install.sh
@@ -153,8 +153,8 @@ steps:
  image: ghcr.io/nextcloud/continuous-integration-alpine-git:latest
  commands:
    - git submodule update --init
- name: sqlite-php7.4-samba-native
-  image: ghcr.io/nextcloud/continuous-integration-samba-native-php7.4:latest
+- name: sqlite-php8.0-samba-native
+  image: ghcr.io/nextcloud/continuous-integration-samba-native-php8.0:latest
  commands:
    - smbd -D -FS &
    - ./autotest-external.sh sqlite smb-linux
@@ -164,8 +164,8 @@ steps:
    - sh -c "if [ '$DRONE_BUILD_EVENT' = 'pull_request' ]; then bash codecov.sh -B $DRONE_BRANCH -C $DRONE_COMMIT -P $DRONE_PULL_REQUEST -t 117641e2-a9e8-4b7b-984b-ae872d9b05f5 -f tests/autotest-external-clover-sqlite-smb-linux.xml; fi"
    - sh -c "if [ '$DRONE_BUILD_EVENT' != 'pull_request' ]; then bash codecov.sh -B $DRONE_BRANCH -C $DRONE_COMMIT -t 117641e2-a9e8-4b7b-984b-ae872d9b05f5 -f tests/autotest-external-clover-sqlite-smb-linux.xml; fi"
 # Temporarily disabled because it times out for unknown reasons 98% of the time
-#- name: sqlite-php7.4-samba-non-native
-#  image: ghcr.io/nextcloud/continuous-integration-samba-non-native-php7.4:latest
+#- name: sqlite-php8.0-samba-non-native
+#  image: ghcr.io/nextcloud/continuous-integration-samba-non-native-php8.0:latest
 #  commands:
 #    - smbd -D -FS &
 #    - ./autotest-external.sh sqlite smb-linux
@@ -185,15 +185,15 @@ trigger:

 ---
 kind: pipeline
-name: sqlite-php7.4-webdav-apache
+name: sqlite-php8.0-webdav-apache

 steps:
 - name: submodules
  image: ghcr.io/nextcloud/continuous-integration-alpine-git:latest
  commands:
    - git submodule update --init
- name: sqlite-php7.4-webdav-apache
-  image: ghcr.io/nextcloud/continuous-integration-webdav-apache-php7.4:latest
+- name: sqlite-php8.0-webdav-apache
+  image: ghcr.io/nextcloud/continuous-integration-webdav-apache-php8.0:latest
  commands:
    - apache2ctl start
    - ./autotest-external.sh sqlite webdav-apachedrone
@@ -224,11 +224,6 @@ steps:
  image: ghcr.io/nextcloud/continuous-integration-alpine-git:latest
  commands:
    - git submodule update --init
- name: nodb-php7.4
-  image: ghcr.io/nextcloud/continuous-integration-integration-php7.4:latest
-  commands:
-    - bash tests/drone-run-php-tests.sh || exit 0
-    - NOCOVERAGE=true TEST_SELECTION=NODB ./autotest.sh sqlite
 - name: nodb-php8.0
  image: ghcr.io/nextcloud/continuous-integration-php8.0:latest
  commands:
@@ -256,11 +251,6 @@ steps:
  image: ghcr.io/nextcloud/continuous-integration-alpine-git:latest
  commands:
    - git submodule update --init
- name: sqlite-php7.4
-  image: ghcr.io/nextcloud/continuous-integration-integration-php7.4:latest
-  commands:
-    - bash tests/drone-run-php-tests.sh || exit 0
-    - NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh sqlite
 - name: sqlite-php8.0
  image: ghcr.io/nextcloud/continuous-integration-php8.0:latest
  commands:
@@ -281,15 +271,15 @@ trigger:

 ---
 kind: pipeline
-name: mariadb10.2-php7.4
+name: mariadb10.2-php8.0

 steps:
 - name: submodules
  image: ghcr.io/nextcloud/continuous-integration-alpine-git:latest
  commands:
    - git submodule update --init
- name: mariadb10.2-php7.4
-  image: ghcr.io/nextcloud/continuous-integration-integration-php7.4:latest
+- name: mariadb10.2-php8.0
+  image: ghcr.io/nextcloud/continuous-integration-php8.0:latest
  commands:
    - bash tests/drone-run-php-tests.sh || exit 0
    - NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh mariadb
@@ -374,7 +364,7 @@ services:
 - name: cache
  image: ghcr.io/nextcloud/continuous-integration-redis:latest
 - name: mariadb
-  image: ghcr.io/nextcloud/continuous-integration-mariadb-10.6continuous-integration-mariadb-10.6:10.6
+  image: ghcr.io/nextcloud/continuous-integration-mariadb-10.6:latest
  environment:
    MYSQL_ROOT_PASSWORD: owncloud
    MYSQL_USER: oc_autotest
@@ -395,15 +385,15 @@ trigger:

 ---
 kind: pipeline
-name: mysql8.0-php7.4
+name: mysql8.0-php8.0

 steps:
 - name: submodules
  image: ghcr.io/nextcloud/continuous-integration-alpine-git:latest
  commands:
    - git submodule update --init
- name: mysql-php7.4
-  image: ghcr.io/nextcloud/continuous-integration-integration-php7.4:latest
+- name: mysql-php8.0
+  image: ghcr.io/nextcloud/continuous-integration-php8.0:latest
  commands:
    - bash tests/drone-run-php-tests.sh || exit 0
    - NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh mysql
@@ -434,15 +424,15 @@ trigger:

 ---
 kind: pipeline
-name: postgres10-php7.4
+name: postgres10-php8.0

 steps:
 - name: submodules
  image: ghcr.io/nextcloud/continuous-integration-alpine-git:latest
  commands:
    - git submodule update --init
- name: postgres-php7.4
-  image: ghcr.io/nextcloud/continuous-integration-php7.4:php7.4-3
+- name: postgres-php8.0
+  image: ghcr.io/nextcloud/continuous-integration-php8.0:latest
  commands:
    - bash tests/drone-run-php-tests.sh || exit 0
    - sleep 10 # gives the database enough time to initialize
@@ -455,7 +445,7 @@ services:
  image: ghcr.io/nextcloud/continuous-integration-postgres-10:postgres-10
  environment:
    POSTGRES_USER: oc_autotest
-    POSTGRES_DB: oc_autotest_dummy
+    POSTGRES_DB: oc_autotest
    POSTGRES_PASSWORD: owncloud
  tmpfs:
    - /var/lib/postgresql/data
@@ -470,15 +460,15 @@ trigger:

 ---
 kind: pipeline
-name: postgres11-php7.4
+name: postgres11-php8.0

 steps:
 - name: submodules
  image: ghcr.io/nextcloud/continuous-integration-alpine-git:latest
  commands:
    - git submodule update --init
- name: postgres-php7.4
-  image: ghcr.io/nextcloud/continuous-integration-integration-php7.4:latest
+- name: postgres-php8.0
+  image: ghcr.io/nextcloud/continuous-integration-php8.0:latest
  commands:
    - bash tests/drone-run-php-tests.sh || exit 0
    - sleep 10 # gives the database enough time to initialize
@@ -491,7 +481,7 @@ services:
  image: ghcr.io/nextcloud/continuous-integration-postgres-11:postgres-11
  environment:
    POSTGRES_USER: oc_autotest
-    POSTGRES_DB: oc_autotest_dummy
+    POSTGRES_DB: oc_autotest
    POSTGRES_PASSWORD: owncloud
  tmpfs:
    - /var/lib/postgresql/data
@@ -527,7 +517,43 @@ services:
  image: ghcr.io/nextcloud/continuous-integration-postgres-13:postgres-13
  environment:
    POSTGRES_USER: oc_autotest
-    POSTGRES_DB: oc_autotest_dummy
+    POSTGRES_DB: oc_autotest
+    POSTGRES_PASSWORD: owncloud
+  tmpfs:
+    - /var/lib/postgresql/data
+
+trigger:
+  branch:
+    - master
+    - stable*
+  event:
+    - pull_request
+    - push
+
+---
+kind: pipeline
+name: postgres15-php8.0
+
+steps:
+- name: submodules
+  image: ghcr.io/nextcloud/continuous-integration-alpine-git:latest
+  commands:
+    - git submodule update --init
+- name: postgres-php8.0
+  image: ghcr.io/nextcloud/continuous-integration-php8.0:latest
+  commands:
+    - bash tests/drone-run-php-tests.sh || exit 0
+    - sleep 10 # gives the database enough time to initialize
+    - POSTGRES=15 NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh pgsql
+
+services:
+- name: cache
+  image: ghcr.io/nextcloud/continuous-integration-redis:latest
+- name: postgres-15
+  image: ghcr.io/nextcloud/continuous-integration-postgres-15:latest
+  environment:
+    POSTGRES_USER: oc_autotest
+    POSTGRES_DB: oc_autotest
    POSTGRES_PASSWORD: owncloud
  tmpfs:
    - /var/lib/postgresql/data
@@ -550,7 +576,7 @@ steps:
  commands:
    - git submodule update --init
 - name: integration-capabilities_features
-  image: ghcr.io/nextcloud/continuous-integration-integration-php7.4:latest
+  image: ghcr.io/nextcloud/continuous-integration-integration-php8.0:latest
  commands:
    - bash tests/drone-run-integration-tests.sh || exit 0
    - ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
@@ -575,7 +601,7 @@ steps:
  commands:
    - git submodule update --init
 - name: integration-collaboration_features
-  image: ghcr.io/nextcloud/continuous-integration-integration-php7.4:latest
+  image: ghcr.io/nextcloud/continuous-integration-integration-php8.0:latest
  commands:
    - bash tests/drone-run-integration-tests.sh || exit 0
    - ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
@@ -600,7 +626,7 @@ steps:
  commands:
    - git submodule update --init
 - name: integration-federation_features
-  image: ghcr.io/nextcloud/continuous-integration-integration-php7.4:latest
+  image: ghcr.io/nextcloud/continuous-integration-integration-php8.0:latest
  commands:
    - bash tests/drone-run-integration-tests.sh || exit 0
    - ./occ maintenance:install --admin-pass=admin
@@ -625,7 +651,7 @@ steps:
  commands:
    - git submodule update --init
 - name: integration-auth
-  image: ghcr.io/nextcloud/continuous-integration-integration-php7.4:latest
+  image: ghcr.io/nextcloud/continuous-integration-integration-php8.0:latest
  commands:
    - bash tests/drone-run-integration-tests.sh || exit 0
    - ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
@@ -650,7 +676,7 @@ steps:
  commands:
    - git submodule update --init
 - name: integration-avatar
-  image: ghcr.io/nextcloud/continuous-integration-integration-php7.4:latest
+  image: ghcr.io/nextcloud/continuous-integration-integration-php8.0:latest
  commands:
    - bash tests/drone-run-integration-tests.sh || exit 0
    - ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
@@ -675,7 +701,7 @@ steps:
  commands:
    - git submodule update --init
 - name: integration-maintenance-mode
-  image: ghcr.io/nextcloud/continuous-integration-integration-php7.4:latest
+  image: ghcr.io/nextcloud/continuous-integration-integration-php8.0:latest
  commands:
    - bash tests/drone-run-integration-tests.sh || exit 0
    - ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
@@ -700,7 +726,7 @@ steps:
  commands:
    - git submodule update --init
 - name: integration-ratelimiting
-  image: ghcr.io/nextcloud/continuous-integration-integration-php7.4:latest
+  image: ghcr.io/nextcloud/continuous-integration-integration-php8.0:latest
  commands:
    - bash tests/drone-run-integration-tests.sh || exit 0
    - ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
@@ -735,7 +761,7 @@ steps:
  commands:
    - git submodule update --init
 - name: integration-carddav
-  image: ghcr.io/nextcloud/continuous-integration-integration-php7.4:latest
+  image: ghcr.io/nextcloud/continuous-integration-integration-php8.0:latest
  commands:
    - bash tests/drone-run-integration-tests.sh || exit 0
    - ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
@@ -760,7 +786,7 @@ steps:
  commands:
    - git submodule update --init
 - name: integration-dav-v2
-  image: ghcr.io/nextcloud/continuous-integration-integration-php7.4:latest
+  image: ghcr.io/nextcloud/continuous-integration-integration-php8.0:latest
  commands:
    - bash tests/drone-run-integration-tests.sh || exit 0
    - ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
@@ -785,7 +811,7 @@ steps:
  commands:
    - git submodule update --init
 - name: integration-ocs-v1
-  image: ghcr.io/nextcloud/continuous-integration-integration-php7.4:latest
+  image: ghcr.io/nextcloud/continuous-integration-integration-php8.0:latest
  commands:
    - bash tests/drone-run-integration-tests.sh || exit 0
    - ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
@@ -810,7 +836,7 @@ steps:
  commands:
    - git submodule update --init
 - name: integration-checksums-v1
-  image: ghcr.io/nextcloud/continuous-integration-integration-php7.4:latest
+  image: ghcr.io/nextcloud/continuous-integration-integration-php8.0:latest
  commands:
    - bash tests/drone-run-integration-tests.sh || exit 0
    - ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
@@ -835,7 +861,7 @@ steps:
  commands:
    - git submodule update --init
 - name: integration-external-storage
-  image: ghcr.io/nextcloud/continuous-integration-integration-php7.4:latest
+  image: ghcr.io/nextcloud/continuous-integration-integration-php8.0:latest
  commands:
    - bash tests/drone-run-integration-tests.sh || exit 0
    - ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
@@ -860,7 +886,7 @@ steps:
  commands:
    - git submodule update --init
 - name: integration-provisioning-v1
-  image: ghcr.io/nextcloud/continuous-integration-integration-php7.4:latest
+  image: ghcr.io/nextcloud/continuous-integration-integration-php8.0:latest
  commands:
    - bash tests/drone-run-integration-tests.sh || exit 0
    - ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
@@ -885,7 +911,7 @@ steps:
  commands:
    - git submodule update --init
 - name: integration-tags
-  image: ghcr.io/nextcloud/continuous-integration-integration-php7.4:latest
+  image: ghcr.io/nextcloud/continuous-integration-integration-php8.0:latest
  commands:
    - bash tests/drone-run-integration-tests.sh || exit 0
    - ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
@@ -910,7 +936,7 @@ steps:
  commands:
    - git submodule update --init
 - name: integration-caldav
-  image: ghcr.io/nextcloud/continuous-integration-integration-php7.4:latest
+  image: ghcr.io/nextcloud/continuous-integration-integration-php8.0:latest
  commands:
    - bash tests/drone-run-integration-tests.sh || exit 0
    - ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
@@ -935,7 +961,7 @@ steps:
  commands:
    - git submodule update --init
 - name: integration-comments
-  image: ghcr.io/nextcloud/continuous-integration-integration-php7.4:latest
+  image: ghcr.io/nextcloud/continuous-integration-integration-php8.0:latest
  commands:
    - bash tests/drone-run-integration-tests.sh || exit 0
    - ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
@@ -960,7 +986,7 @@ steps:
  commands:
    - git submodule update --init
 - name: integration-comments-search
-  image: ghcr.io/nextcloud/continuous-integration-integration-php7.4:latest
+  image: ghcr.io/nextcloud/continuous-integration-integration-php8.0:latest
  commands:
    - bash tests/drone-run-integration-tests.sh || exit 0
    - ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
@@ -985,7 +1011,7 @@ steps:
  commands:
    - git submodule update --init
 - name: integration-contacts-menu
-  image: ghcr.io/nextcloud/continuous-integration-integration-php7.4:latest
+  image: ghcr.io/nextcloud/continuous-integration-integration-php8.0:latest
  commands:
    - bash tests/drone-run-integration-tests.sh || exit 0
    - ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
@@ -1010,7 +1036,7 @@ steps:
  commands:
    - git submodule update --init
 - name: integration-favorites
-  image: ghcr.io/nextcloud/continuous-integration-integration-php7.4:latest
+  image: ghcr.io/nextcloud/continuous-integration-integration-php8.0:latest
  commands:
    - bash tests/drone-run-integration-tests.sh || exit 0
    - ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
@@ -1035,7 +1061,7 @@ steps:
  commands:
    - git submodule update --init
 - name: integration-provisioning-v2
-  image: ghcr.io/nextcloud/continuous-integration-integration-php7.4:latest
+  image: ghcr.io/nextcloud/continuous-integration-integration-php8.0:latest
  commands:
    - bash tests/drone-run-integration-tests.sh || exit 0
    - ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
@@ -1060,7 +1086,7 @@ steps:
  commands:
    - git submodule update --init
 - name: integration-webdav-related
-  image: ghcr.io/nextcloud/continuous-integration-integration-php7.4:latest
+  image: ghcr.io/nextcloud/continuous-integration-integration-php8.0:latest
  commands:
    - bash tests/drone-run-integration-tests.sh || exit 0
    - ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
@@ -1085,7 +1111,7 @@ steps:
  commands:
    - git submodule update --init
 - name: integration-sharees-features
-  image: ghcr.io/nextcloud/continuous-integration-integration-php7.4:latest
+  image: ghcr.io/nextcloud/continuous-integration-integration-php8.0:latest
  commands:
    - bash tests/drone-run-integration-tests.sh || exit 0
    - ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
@@ -1110,7 +1136,7 @@ steps:
  commands:
    - git submodule update --init
 - name: integration-sharees-v2-features
-  image: ghcr.io/nextcloud/continuous-integration-integration-php7.4:latest
+  image: ghcr.io/nextcloud/continuous-integration-integration-php8.0:latest
  commands:
    - bash tests/drone-run-integration-tests.sh || exit 0
    - ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
@@ -1135,7 +1161,7 @@ steps:
  commands:
    - git submodule update --init
 - name: integration-sharing-v1
-  image: ghcr.io/nextcloud/continuous-integration-integration-php7.4:latest
+  image: ghcr.io/nextcloud/continuous-integration-integration-php8.0:latest
  commands:
    - bash tests/drone-run-integration-tests.sh || exit 0
    - ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
@@ -1160,7 +1186,7 @@ steps:
  commands:
    - git submodule update --init
 - name: integration-sharing-v1-part2
-  image: ghcr.io/nextcloud/continuous-integration-integration-php7.4:latest
+  image: ghcr.io/nextcloud/continuous-integration-integration-php8.0:latest
  commands:
    - bash tests/drone-run-integration-tests.sh || exit 0
    - ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
@@ -1185,7 +1211,7 @@ steps:
  commands:
    - git submodule update --init
 - name: integration-sharing-v1-part3
-  image: ghcr.io/nextcloud/continuous-integration-integration-php7.4:latest
+  image: ghcr.io/nextcloud/continuous-integration-integration-php8.0:latest
  commands:
    - bash tests/drone-run-integration-tests.sh || exit 0
    - ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
@@ -1210,13 +1236,18 @@ steps:
  commands:
    - git submodule update --init
 - name: install-talk
-  image: ghcr.io/nextcloud/continuous-integration-alpine-git:latest
+  image: ghcr.io/nextcloud/continuous-integration-php8.0:latest
  commands:
-    # JavaScript files are not used in integration tests so it is not needed to
+    # JavaScript files are not used in integration tests, so it is not needed to
    # build them.
-    - git clone --depth 1 https://github.com/nextcloud/spreed apps/spreed
+    - git clone --depth 1 --branch stable26 https://github.com/nextcloud/spreed apps/spreed
+    - cd apps/spreed
+    - composer --version
+    - composer self-update --2
+    - composer install --no-dev
+    - cd ../..
 - name: integration-sharing-v1-video-verification
-  image: ghcr.io/nextcloud/continuous-integration-integration-php7.4:latest
+  image: ghcr.io/nextcloud/continuous-integration-integration-php8.0:latest
  commands:
    - bash tests/drone-run-integration-tests.sh || exit 0
    - ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
@@ -1241,7 +1272,7 @@ steps:
  commands:
    - git submodule update --init
 - name: integration-setup-features
-  image: ghcr.io/nextcloud/continuous-integration-integration-php7.4:latest
+  image: ghcr.io/nextcloud/continuous-integration-integration-php8.0:latest
  commands:
    - bash tests/drone-run-integration-tests.sh || exit 0
    - cd build/integration
@@ -1265,7 +1296,7 @@ steps:
  commands:
    - git submodule update --init
 - name: integration-filesdrop-features
-  image: ghcr.io/nextcloud/continuous-integration-integration-php7.4:latest
+  image: ghcr.io/nextcloud/continuous-integration-integration-php8.0:latest
  commands:
    - bash tests/drone-run-integration-tests.sh || exit 0
    - ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
@@ -1290,7 +1321,7 @@ steps:
  commands:
    - git submodule update --init
 - name: integration-transfer-ownership-features
-  image: ghcr.io/nextcloud/continuous-integration-integration-php7.4:latest
+  image: ghcr.io/nextcloud/continuous-integration-integration-php8.0:latest
  commands:
    - bash tests/drone-run-integration-tests.sh || exit 0
    - ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
@@ -1315,7 +1346,7 @@ steps:
  commands:
    - git submodule update --init
 - name: integration-ldap-features
-  image: ghcr.io/nextcloud/continuous-integration-integration-php7.4:latest
+  image: ghcr.io/nextcloud/continuous-integration-integration-php8.0:latest
  commands:
    - bash tests/drone-run-integration-tests.sh || exit 0
    - ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
@@ -1340,7 +1371,7 @@ steps:
  commands:
    - git submodule update --init
 - name: integration-ldap-openldap-features
-  image: ghcr.io/nextcloud/continuous-integration-integration-php7.4:latest
+  image: ghcr.io/nextcloud/continuous-integration-integration-php8.0:latest
  commands:
    - bash tests/drone-run-integration-tests.sh || exit 0
    - ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
@@ -1381,7 +1412,7 @@ steps:
      commands:
          - git submodule update --init
    - name: integration-ldap-openldap-uid-features
-      image: ghcr.io/nextcloud/continuous-integration-integration-php7.4:latest
+      image: ghcr.io/nextcloud/continuous-integration-integration-php8.0:latest
      commands:
          - bash tests/drone-run-integration-tests.sh || exit 0
          - ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
@@ -1423,7 +1454,7 @@ steps:
  commands:
    - git submodule update --init
 - name: integration-ldap-openldap-numerical-id-features
-  image: ghcr.io/nextcloud/continuous-integration-integration-php7.4:latest
+  image: ghcr.io/nextcloud/continuous-integration-integration-php8.0:latest
  commands:
    - bash tests/drone-run-integration-tests.sh || exit 0
    - ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
@@ -1464,7 +1495,7 @@ steps:
  commands:
    - git submodule update --init
 - name: integration-trashbin
-  image: ghcr.io/nextcloud/continuous-integration-integration-php7.4:latest
+  image: ghcr.io/nextcloud/continuous-integration-integration-php8.0:latest
  commands:
    - bash tests/drone-run-integration-tests.sh || exit 0
    - ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
@@ -1489,7 +1520,7 @@ steps:
  commands:
    - git submodule update --init
 - name: integration-remote-api
-  image: ghcr.io/nextcloud/continuous-integration-integration-php7.4:latest
+  image: ghcr.io/nextcloud/continuous-integration-integration-php8.0:latest
  commands:
    - bash tests/drone-run-integration-tests.sh || exit 0
    - ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
@@ -1514,7 +1545,7 @@ steps:
  commands:
    - git submodule update --init
 - name: integration-download
-  image: ghcr.io/nextcloud/continuous-integration-integration-php7.4:latest
+  image: ghcr.io/nextcloud/continuous-integration-integration-php8.0:latest
  commands:
    - bash tests/drone-run-integration-tests.sh || exit 0
    - ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
@@ -1539,7 +1570,7 @@ steps:
  commands:
    - git submodule update --init
 - name: acceptance-access-levels
-  image: ghcr.io/nextcloud/continuous-integration-acceptance-php7.4:latest
+  image: ghcr.io/nextcloud/continuous-integration-acceptance-php8.0:latest
  commands:
    - tests/acceptance/run-local.sh --timeout-multiplier 10 --nextcloud-server-domain acceptance-access-levels --selenium-server selenium:4444 allow-git-repository-modifications features/access-levels.feature

@@ -1569,7 +1600,7 @@ steps:
  commands:
    - git submodule update --init
 - name: acceptance-app-files
-  image: ghcr.io/nextcloud/continuous-integration-acceptance-php7.4:latest
+  image: ghcr.io/nextcloud/continuous-integration-acceptance-php8.0:latest
  commands:
    - tests/acceptance/run-local.sh --timeout-multiplier 10 --nextcloud-server-domain acceptance-app-files --selenium-server selenium:4444 allow-git-repository-modifications features/app-files.feature

@@ -1599,7 +1630,7 @@ steps:
  commands:
    - git submodule update --init
 - name: acceptance-app-files-sharing
-  image: ghcr.io/nextcloud/continuous-integration-acceptance-php7.4:latest
+  image: ghcr.io/nextcloud/continuous-integration-acceptance-php8.0:latest
  commands:
    - tests/acceptance/run-local.sh --timeout-multiplier 10 --nextcloud-server-domain acceptance-app-files-sharing --selenium-server selenium:4444 allow-git-repository-modifications features/app-files-sharing.feature

@@ -1629,7 +1660,7 @@ steps:
  commands:
    - git submodule update --init
 - name: acceptance-app-files-sharing-link
-  image: ghcr.io/nextcloud/continuous-integration-acceptance-php7.4:latest
+  image: ghcr.io/nextcloud/continuous-integration-acceptance-php8.0:latest
  commands:
    - tests/acceptance/run-local.sh --timeout-multiplier 10 --nextcloud-server-domain acceptance-app-files-sharing-link --selenium-server selenium:4444 allow-git-repository-modifications features/app-files-sharing-link.feature

@@ -1659,7 +1690,7 @@ steps:
  commands:
    - git submodule update --init
 - name: acceptance-app-files-tags
-  image: ghcr.io/nextcloud/continuous-integration-acceptance-php7.4:latest
+  image: ghcr.io/nextcloud/continuous-integration-acceptance-php8.0:latest
  commands:
    - tests/acceptance/run-local.sh --timeout-multiplier 10 --nextcloud-server-domain acceptance-app-files-tags --selenium-server selenium:4444 allow-git-repository-modifications features/app-files-tags.feature

@@ -1679,36 +1710,6 @@ trigger:
    - pull_request
    - push

---
-kind: pipeline
-name: acceptance-app-theming
-
-steps:
- name: submodules
-  image: ghcr.io/nextcloud/continuous-integration-alpine-git:latest
-  commands:
-    - git submodule update --init
- name: acceptance-app-theming
-  image: ghcr.io/nextcloud/continuous-integration-acceptance-php7.4:latest
-  commands:
-    - tests/acceptance/run-local.sh --timeout-multiplier 10 --nextcloud-server-domain acceptance-app-theming --selenium-server selenium:4444 allow-git-repository-modifications features/app-theming.feature
-
-services:
- name: selenium
-  image: ghcr.io/nextcloud/continuous-integration-selenium:3.141.59
-  environment:
-    # Reduce default log level for Selenium server (INFO) as it is too
-    # verbose.
-    JAVA_OPTS: -Dselenium.LOGGER.level=WARNING
-
-trigger:
-  branch:
-    - master
-    - stable*
-  event:
-    - pull_request
-    - push
-
 ---
 kind: pipeline
 name: acceptance-header
@@ -1719,7 +1720,7 @@ steps:
  commands:
    - git submodule update --init
 - name: acceptance-header
-  image: ghcr.io/nextcloud/continuous-integration-acceptance-php7.4:latest
+  image: ghcr.io/nextcloud/continuous-integration-acceptance-php8.0:latest
  commands:
    - tests/acceptance/run-local.sh --timeout-multiplier 10 --nextcloud-server-domain acceptance-header --selenium-server selenium:4444 allow-git-repository-modifications features/header.feature

@@ -1749,7 +1750,7 @@ steps:
  commands:
    - git submodule update --init
 - name: acceptance-login
-  image: ghcr.io/nextcloud/continuous-integration-acceptance-php7.4:latest
+  image: ghcr.io/nextcloud/continuous-integration-acceptance-php8.0:latest
  commands:
    - tests/acceptance/run-local.sh --timeout-multiplier 10 --nextcloud-server-domain acceptance-login --selenium-server selenium:4444 allow-git-repository-modifications features/login.feature

@@ -1779,7 +1780,7 @@ steps:
  commands:
    - git submodule update --init
 - name: acceptance-users
-  image: ghcr.io/nextcloud/continuous-integration-acceptance-php7.4:latest
+  image: ghcr.io/nextcloud/continuous-integration-acceptance-php8.0:latest
  commands:
    - tests/acceptance/run-local.sh --timeout-multiplier 10 --nextcloud-server-domain acceptance-users --selenium-server selenium:4444 allow-git-repository-modifications features/users.feature

@@ -1809,7 +1810,7 @@ steps:
  commands:
    - git submodule update --init
 - name: acceptance-apps
-  image: ghcr.io/nextcloud/continuous-integration-acceptance-php7.4:latest
+  image: ghcr.io/nextcloud/continuous-integration-acceptance-php8.0:latest
  commands:
    - tests/acceptance/run-local.sh --timeout-multiplier 10 --nextcloud-server-domain acceptance-apps --selenium-server selenium:4444 allow-git-repository-modifications features/apps.feature

@@ -1839,7 +1840,7 @@ steps:
  commands:
    - git submodule update --init
 - name: nodb-codecov
-  image: ghcr.io/nextcloud/continuous-integration-integration-php7.4:latest
+  image: ghcr.io/nextcloud/continuous-integration-php8.0:latest
  environment:
      CODECOV_TOKEN:
          from_secret: CODECOV_TOKEN
@@ -1871,7 +1872,7 @@ steps:
  commands:
    - git submodule update --init
 - name: db-codecov
-  image: ghcr.io/nextcloud/continuous-integration-integration-php7.4:latest
+  image: ghcr.io/nextcloud/continuous-integration-php8.0:latest
  environment:
      CODECOV_TOKEN:
          from_secret: CODECOV_TOKEN
@@ -1912,7 +1913,7 @@ steps:
  commands:
    - git submodule update --init
 - name: object-store
-  image: ghcr.io/nextcloud/continuous-integration-integration-php7.4:latest
+  image: ghcr.io/nextcloud/continuous-integration-php8.0:latest
  environment:
      OBJECT_STORE: s3
      CODECOV_TOKEN:
@@ -1942,7 +1943,7 @@ steps:
  commands:
    - git submodule update --init
 - name: object-store
-  image: ghcr.io/nextcloud/continuous-integration-integration-php7.4:latest
+  image: ghcr.io/nextcloud/continuous-integration-php8.0:latest
  environment:
      OBJECT_STORE: azure
      CODECOV_TOKEN:
@@ -1978,7 +1979,7 @@ steps:
  commands:
    - git submodule update --init
 - name: memcache-memcached
-  image: ghcr.io/nextcloud/continuous-integration-php7.4-memcached:latest
+  image: ghcr.io/nextcloud/continuous-integration-php8.0-memcached:latest
  commands:
    - phpenmod xdebug
    - service memcached restart
@@ -8,8 +8,15 @@ module.exports = {
 		oc_userconfig: true,
 		dayNames: true,
 		firstDay: true,
+		'cypress/globals': true,
 	},
-	extends: ['@nextcloud'],
+	plugins: [
+		'cypress',
+	],
+	extends: [
+		'@nextcloud',
+		'plugin:cypress/recommended',
+	],
 	rules: {
 		'no-tabs': 'warn',
 		// TODO: make sure we fix this as this is bad vue coding style.
@@ -1,2 +1,3 @@
 /dist/* binary
-/package-lock.json binary
+/package-lock.json merge=binary
+/core/css/*.css* binary
@@ -9,11 +9,8 @@
 */TwoFactorAuth/*                  @ChristophWurst @miaulalala @nickvergessen
 /core/templates/twofactor*         @ChristophWurst @miaulalala @nickvergessen

-/apps/user_status                  @CarlSchwan
-/apps/settings/lib                 @CarlSchwan
-/lib/private/Metadata              @CarlSchwan
 /lib/private/Profiler              @CarlSchwan
 /lib/public/Profiler               @CarlSchwan

 # Security team
-resources/config/ca-bundle.crt    @ChristophWurst @eneiluj @miaulalala @nickvergessen
+resources/config/ca-bundle.crt    @ChristophWurst @julien-nc @miaulalala @nickvergessen
@@ -28,6 +28,8 @@ updates:
    - "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
@@ -62,7 +64,7 @@ updates:
    day: saturday
    time: "03:00"
    timezone: Europe/Paris
-  target-branch: stable22
+  target-branch: stable24
  labels:
    - "3. to review"
    - "feature: dependencies"
@@ -80,7 +82,7 @@ updates:
    day: saturday
    time: "03:00"
    timezone: Europe/Paris
-  target-branch: stable23
+  target-branch: stable25
  labels:
    - "3. to review"
    - "feature: dependencies"
@@ -89,25 +91,7 @@ updates:
  ignore:
    # ignore all GitHub linguist patch updates
    - dependency-name: "*"
-      update-types: ["version-update:semver-major", "version-update:semver-minor"]
-
- package-ecosystem: npm
-  directory: "/"
-  schedule:
-    interval: weekly
-    day: saturday
-    time: "03:00"
-    timezone: Europe/Paris
-  target-branch: stable24
-  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"]
+      update-types: ["version-update:semver-major", "version-update:semver-minor", "version-update:semver-patch"]

 # Testing StableXX composer
 - package-ecosystem: composer
@@ -117,7 +101,7 @@ updates:
    day: saturday
    time: "03:00"
    timezone: Europe/Paris
-  target-branch: stable22
+  target-branch: stable24
  labels:
    - "3. to review"
    - "feature: dependencies"
@@ -135,7 +119,7 @@ updates:
    day: saturday
    time: "03:00"
    timezone: Europe/Paris
-  target-branch: stable23
+  target-branch: stable25
  labels:
    - "3. to review"
    - "feature: dependencies"
@@ -144,22 +128,4 @@ updates:
  ignore:
    # ignore all GitHub linguist patch updates
    - dependency-name: "*"
-      update-types: ["version-update:semver-major", "version-update:semver-minor"]
-
- package-ecosystem: composer
-  directory: "/build/integration"
-  schedule:
-    interval: weekly
-    day: saturday
-    time: "03:00"
-    timezone: Europe/Paris
-  target-branch: stable24
-  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"]
+      update-types: ["version-update:semver-major", "version-update:semver-minor", "version-update:semver-patch"]
@@ -0,0 +1,18 @@
+
+* Resolves: # <!-- related github issue -->
+
+## Summary
+
+
+## TODO
+
+- [ ] ...
+
+## Checklist
+
+- Code is [properly formatted](https://docs.nextcloud.com/server/latest/developer_manual/digging_deeper/continuous_integration.html#linting)
+- [Sign-off message](https://github.com/src-d/guide/blob/master/developer-community/fix-DCO.md) is added to all commits
+- [ ] Tests ([unit](https://docs.nextcloud.com/server/latest/developer_manual/app_development/tutorial.html#unit-tests), [integration](https://docs.nextcloud.com/server/latest/developer_manual/app_development/tutorial.html#integration-tests), api and/or acceptance) are included
+- [ ] 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)
@@ -54,7 +54,7 @@ jobs:

    steps:
      - name: Checkout ${{ needs.init.outputs.head_ref }}
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
        with:
          token: ${{ secrets.COMMAND_BOT_PAT }}
          fetch-depth: 0
@@ -86,12 +86,6 @@ jobs:
          npm ci
          npm run build --if-present

-      - name: Build css
-        run: npm run --if-present sass
-
-      - name: Build icons css
-        run: npm run --if-present sass:icons
-
      - name: Commit and push default
        if: ${{ needs.init.outputs.arg1 != 'fixup' && needs.init.outputs.arg1 != 'amend' }}
        run: |
@@ -0,0 +1,104 @@
+name: Cypress
+
+on:
+  pull_request:
+  push:
+    branches:
+      - master
+      - stable*
+
+env:
+  APP_NAME: viewer
+  BRANCH: ${{ github.ref }}
+  TESTING: true
+
+jobs:
+  init:
+    runs-on: ubuntu-latest
+
+    if: ${{ github.repository_owner != 'nextcloud-gmbh' }}
+
+    steps:
+      - name: Checkout server
+        uses: actions/checkout@v3
+
+      - name: Read package.json node and npm engines version
+        uses: skjnldsv/read-package-engines-version-actions@v1.2
+        id: versions
+        with:
+          fallbackNode: "^12"
+          fallbackNpm: "^6"
+
+      - name: Set up node ${{ steps.versions.outputs.nodeVersion }}
+        uses: actions/setup-node@v3
+        with:
+          cache: "npm"
+          node-version: ${{ steps.versions.outputs.nodeVersion }}
+
+      - name: Set up npm ${{ steps.versions.outputs.npmVersion }}
+        run: npm i -g npm@"${{ steps.versions.outputs.npmVersion }}"
+
+      - name: Install dependencies & build app
+        run: |
+          npm ci
+          TESTING=true npm run build --if-present
+
+      - name: Save context
+        uses: actions/cache@v3
+        with:
+          key: cypress-context-${{ github.run_id }}
+          path: /home/runner/work/server
+
+  cypress:
+    runs-on: ubuntu-latest
+    needs: init
+
+    strategy:
+      fail-fast: false
+      matrix:
+        # run multiple copies of the current job in parallel
+        containers: ['component', 1, 2]
+
+    name: runner ${{ matrix.containers }}
+
+    steps:
+      - name: Restore context
+        uses: actions/cache@v3
+        with:
+          key: cypress-context-${{ github.run_id }}
+          path: /home/runner/work/server
+
+      - name: Run ${{ matrix.containers == 'component' && 'component' || 'E2E' }} cypress tests
+
+        uses: cypress-io/github-action@v5
+        with:
+          record: true
+          parallel: true
+          # cypress run type
+          component: ${{ matrix.containers == 'component' }}
+          group: Run ${{ matrix.containers == 'component' && 'component' || 'E2E' }}
+          # cypress env
+          ci-build-id: ${{ github.sha }}-${{ github.run_number }}
+          tag: ${{ github.event_name }}t
+        env:
+          # Needs to be prefixed with CYPRESS_
+          CYPRESS_BRANCH: ${{ env.BRANCH }}
+          CYPRESS_GH: true
+          # https://github.com/cypress-io/github-action/issues/124
+          COMMIT_INFO_MESSAGE: ${{ github.event.pull_request.title }}
+          # Needed for some specific code workarounds
+          TESTING: true
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_RECORD_KEY }}
+
+  summary:
+    runs-on: ubuntu-latest
+    needs: [init, cypress]
+
+    if: always()
+
+    name: cypress-summary
+
+    steps:
+      - name: Summary status
+        run: if ${{ needs.init.result != 'success' || ( needs.cypress.result != 'success' && needs.cypress.result != 'skipped' ) }}; then exit 1; fi
@@ -17,18 +17,20 @@ jobs:
  ftp-tests:
    runs-on: ubuntu-latest

+    if: ${{ github.repository_owner != 'nextcloud-gmbh' }}
+
    strategy:
      # do not stop on another job's failure
      fail-fast: false
      matrix:
-        php-versions: ['7.4', '8.0']
+        php-versions: ['8.0']
        ftpd: ['proftpd', 'vsftpd', 'pure-ftpd']

    name: php${{ matrix.php-versions }}-${{ matrix.ftpd }}

    steps:
      - name: Checkout server
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
        with:
          submodules: true

@@ -43,8 +45,10 @@ jobs:
        uses: shivammathur/setup-php@v2
        with:
          php-version: ${{ matrix.php-versions }}
-          tools: phpunit
+          tools: phpunit:9
          extensions: mbstring, fileinfo, intl, sqlite, pdo_sqlite, zip, gd
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

      - name: Set up Nextcloud
        run: |
@@ -20,7 +20,7 @@ jobs:

    steps:
      - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3

      - name: Read package.json node and npm engines version
        uses: skjnldsv/read-package-engines-version-actions@v1.1
@@ -0,0 +1,39 @@
+# This workflow is provided via the organization template repository
+#
+# https://github.com/nextcloud/.github
+# https://docs.github.com/en/actions/learn-github-actions/sharing-workflows-with-your-organization
+
+name: Lint
+
+on: pull_request
+
+permissions:
+  contents: read
+
+concurrency:
+  group: lint-php-cs-${{ github.head_ref || github.run_id }}
+  cancel-in-progress: true
+
+jobs:
+  lint:
+    runs-on: ubuntu-latest
+
+    name: php-cs
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - name: Set up php
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: "8.0"
+          coverage: none
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Install dependencies
+        run: composer i
+
+      - name: Lint
+        run: composer run cs:check || ( echo "Please run `composer run cs:fix` to format your code" && exit 1 )
@@ -0,0 +1,59 @@
+# This workflow is provided via the organization template repository
+#
+# https://github.com/nextcloud/.github
+# https://docs.github.com/en/actions/learn-github-actions/sharing-workflows-with-your-organization
+
+name: Lint
+
+on:
+  pull_request:
+  push:
+    branches:
+      - main
+      - master
+      - stable*
+
+permissions:
+  contents: read
+
+concurrency:
+  group: lint-php-${{ github.head_ref || github.run_id }}
+  cancel-in-progress: true
+
+jobs:
+  php-lint:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        php-versions: [ "8.0", "8.1", "8.2" ]
+
+    name: php-lint
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@755da8c3cf115ac066823e79a1e1788f8940201b # v3
+
+      - name: Set up php ${{ matrix.php-versions }}
+        uses: shivammathur/setup-php@1a18b2267f80291a81ca1d33e7c851fe09e7dfc4 # v2
+        with:
+          php-version: ${{ matrix.php-versions }}
+          coverage: none
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Lint
+        run: composer run lint
+
+  summary:
+    permissions:
+      contents: none
+    runs-on: ubuntu-latest
+    needs: php-lint
+
+    if: always()
+
+    name: php-lint-summary
+
+    steps:
+      - name: Summary status
+        run: if ${{ needs.php-lint.result != 'success' && needs.php-lint.result != 'skipped' }}; then exit 1; fi
@@ -1,42 +0,0 @@
-name: Lint
-on: pull_request
-
-jobs:
-  php-linters:
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        php-versions: ['7.4', '8.0', '8.1', '8.2']
-    name: php${{ matrix.php-versions }} lint
-    steps:
-    - name: Checkout
-      uses: actions/checkout@master
-    - name: Set up php${{ matrix.php-versions }}
-      uses: shivammathur/setup-php@master
-      with:
-        php-version: ${{ matrix.php-versions }}
-        extensions: ctype,curl,dom,fileinfo,gd,intl,json,mbstring,openssl,pdo_sqlite,posix,sqlite,xml,zip
-        coverage: none
-    - name: Lint
-      run: composer run lint
-
-  php-cs-fixer:
-    name: php-cs check
-    runs-on: ubuntu-latest
-    steps:
-    - name: Checkout
-      uses: actions/checkout@master
-    - name: Set up php
-      uses: shivammathur/setup-php@master
-      with:
-        php-version: 7.4
-        extensions: ctype,curl,dom,fileinfo,gd,intl,json,mbstring,openssl,pdo_sqlite,posix,sqlite,xml,zip
-        coverage: none
-        tools: cs2pr
-    - name: Install dependencies
-      run: composer i
-    - name: Run coding standards check
-      run: |
-        composer run cs:check -- --format=checkstyle | cs2pr
-        composer run cs:check || ( echo 'Please run `composer run cs:fix` to format your code' && exit 1 )
-      shell: bash
@@ -10,13 +10,16 @@ on:
 jobs:
  versions:
    runs-on: ubuntu-latest
+
+    if: ${{ github.repository_owner != 'nextcloud-gmbh' }}
+
    outputs:
      nodeVersion: ${{ steps.versions.outputs.nodeVersion }}
      npmVersion: ${{ steps.versions.outputs.npmVersion }}

    steps:
      - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3

      - name: Read package.json node and npm engines version
        uses: skjnldsv/read-package-engines-version-actions@v1.1
@@ -31,7 +34,7 @@ jobs:

    steps:
      - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3

      - name: Set up node ${{ needs.versions.outputs.nodeVersion }}
        uses: actions/setup-node@v2
@@ -53,7 +56,7 @@ jobs:

    steps:
      - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3

      - name: Set up node ${{ needs.versions.outputs.nodeVersion }}
        uses: actions/setup-node@v2
@@ -75,7 +78,7 @@ jobs:

    steps:
      - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3

      - name: Set up node ${{ needs.versions.outputs.nodeVersion }}
        uses: actions/setup-node@v2
@@ -45,12 +45,6 @@ jobs:
          npm ci
          npm run build --if-present

-      - name: Build css
-        run: npm run sass
-
-      - name: Build icons css
-        run: npm run sass:icons
-
      - name: Check webpack build changes
        run: |
          bash -c "[[ ! \"`git status --porcelain `\" ]] || (echo 'Please recompile and commit the assets, see the section \"Show changes on failure\" for details' && exit 1)"
@@ -1,48 +1,46 @@
 name: PHPUnit

-on:
-  pull_request:
-  push:
-    branches:
-      - master
-      - stable*
+on: pull_request
+
+permissions:
+  contents: read
+
+concurrency:
+  group: phpunit-oci-${{ github.head_ref || github.run_id }}
+  cancel-in-progress: true

 jobs:
-  phpunit-oci8:
+  phpunit-oci:
    runs-on: ubuntu-20.04

-    strategy:
-      fail-fast: false
-      matrix:
-        php-versions: [ '7.4', '8.0', '8.1']
-        databases: [ 'oci' ]
+    if: ${{ github.repository_owner != 'nextcloud-gmbh' }}

-    name: php${{ matrix.php-versions }}-${{ matrix.databases }}
+    strategy:
+      matrix:
+        php-versions: ['8.0', '8.1', '8.2']

    services:
      oracle:
-        image: deepdiver/docker-oracle-xe-11g # "wnameless/oracle-xe-11g-r2"
+        image: deepdiver/docker-oracle-xe-11g # 'wnameless/oracle-xe-11g-r2'
        ports:
-          - "1521:1521"
+          - 1521:1521/tcp

    steps:
      - name: Checkout server
-        uses: actions/checkout@v2
-
-      - name: Checkout submodules
-        shell: bash
-        run: |
-          auth_header="$(git config --local --get http.https://github.com/.extraheader)"
-          git submodule sync --recursive
-          git -c "http.extraheader=$auth_header" -c protocol.version=2 submodule update --init --force --recursive --depth=1
+        uses: actions/checkout@v3
+        with:
+          submodules: true

      - name: Set up php ${{ matrix.php-versions }}
        uses: shivammathur/setup-php@v2
        with:
          php-version: ${{ matrix.php-versions }}
-          extensions: ctype,curl,dom,fileinfo,gd,imagick,intl,json,mbstring,oci8,openssl,pdo_sqlite,posix,sqlite,xml,zip
+          extensions: ctype, curl, dom, fileinfo, gd, imagick, intl, json, mbstring, oci8, openssl, pdo_sqlite, posix, sqlite, xml, zip
          tools: phpunit:9
          coverage: none
+          ini-file: development
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

      - name: Set up Nextcloud
        run: |
@@ -53,3 +51,21 @@ jobs:
      - name: PHPUnit
        working-directory: tests
        run: phpunit --configuration phpunit-autotest.xml --group DB,SLOWDB
+
+      - name: Run repair steps
+        run: |
+          ./occ maintenance:repair --include-expensive
+
+  summary:
+    permissions:
+      contents: none
+    runs-on: ubuntu-latest
+    needs: phpunit-oci
+
+    if: always()
+
+    name: phpunit-oci-summary
+
+    steps:
+      - name: Summary status
+        run: if ${{ needs.phpunit-oci.result != 'success' }}; then exit 1; fi
@@ -6,6 +6,8 @@ jobs:
  performance-testing:
    runs-on: ubuntu-latest

+    if: ${{ github.repository_owner != 'nextcloud-gmbh' }}
+
    strategy:
      fail-fast: false
      matrix:
@@ -24,8 +26,10 @@ jobs:
        uses: shivammathur/setup-php@v2
        with:
          php-version: ${{ matrix.php-versions }}
-          tools: phpunit
+          tools: phpunit:9
          extensions: mbstring, fileinfo, intl, sqlite, pdo_sqlite, zip, gd
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

      - name: Set up Nextcloud
        run: |
@@ -39,7 +43,7 @@ jobs:
          blueprint: tests/blueprints/basic.toml
          ref: ${{ github.event.pull_request.head.ref }}
      - name: Run before measurements
-        uses: nextcloud/profiler@fa03a1e6864fcb63fb92b8940fa72f5191baffbe
+        uses: nextcloud/profiler@1e66a9de5f76a01e9d1db4f0153bcc1cbf989b3d
        with:
          run: |
            curl -s -X PROPFIND -u test:test http://localhost:8080/remote.php/dav/files/test
@@ -48,18 +52,20 @@ 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: stable26

      - name: Apply PR
        run: |
-          git fetch origin ${{ github.event.pull_request.head.ref }}
-          git checkout ${{ github.event.pull_request.head.ref }}
+          git remote add pr ${{ github.event.pull_request.head.repo.clone_url }}
+          git fetch pr ${{ github.event.pull_request.head.ref }}
+          git checkout -b pr/${{ github.event.pull_request.head.ref }}
          git submodule update

          ./occ upgrade

      - name: Run after measurements
        id: compare
-        uses: nextcloud/profiler@fa03a1e6864fcb63fb92b8940fa72f5191baffbe
+        uses: nextcloud/profiler@1e66a9de5f76a01e9d1db4f0153bcc1cbf989b3d
        with:
          run: |
            curl -s -X PROPFIND -u test:test http://localhost:8080/remote.php/dav/files/test
@@ -68,6 +74,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: master
          compare-with: before.json

      - name: Upload profiles
@@ -0,0 +1,61 @@
+name: PHPUnit
+
+on:
+  workflow_dispatch:
+  schedule:
+    - cron: "15 1 * * 1-6"
+
+permissions:
+  contents: read
+
+concurrency:
+  group: phpunit-32bits-${{ github.head_ref || github.run_id }}
+  cancel-in-progress: true
+
+jobs:
+  phpunit-32bits:
+    runs-on: ubuntu-latest
+
+    if: ${{ github.repository_owner != 'nextcloud-gmbh' }}
+
+    container: shivammathur/node:latest-i386
+
+    strategy:
+      matrix:
+        php-versions: ['8.0']
+
+    steps:
+      - name: Checkout server
+        uses: actions/checkout@v3
+        with:
+          submodules: true
+
+      - name: Install tools
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y ffmpeg imagemagick libmagickcore-6.q16-3-extra
+
+      - name: Set up php ${{ matrix.php-versions }}
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php-versions }}
+          extensions: ctype, curl, dom, fileinfo, gd, imagick, intl, json, mbstring, openssl, pdo_sqlite, posix, sqlite, xml, zip, apcu
+          tools: phpunit:9
+          coverage: none
+          ini-values:
+            apc.enabled=on,
+            apc.enable_cli=on
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Set up Nextcloud
+        env:
+          DB_PORT: 4444
+        run: |
+          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
+
+      - name: PHPUnit
+        working-directory: tests
+        run: phpunit --configuration phpunit-autotest.xml --exclude-group PRIMARY-azure,PRIMARY-s3,PRIMARY-swift,Memcached,Redis,RoutingWeirdness
@@ -1,28 +0,0 @@
-name: Psalm show github
-
-on:
-  pull_request:
-  push:
-    branches:
-      - master
-      - stable*
-
-jobs:
-  psalm:
-    name: Psalm
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v2
-        with:
-          submodules: recursive
-      - name: Psalm
-        uses: docker://vimeo/psalm-github-actions:4.9.3
-        continue-on-error: true
-        with:
-          composer_ignore_platform_reqs: false
-          report_file: results.sarif
-      - name: Upload Analysis results to GitHub
-        uses: github/codeql-action/upload-sarif@v1
-        with:
-          sarif_file: results.sarif
@@ -1,28 +0,0 @@
-name: Psalm Security Analysis
-
-on:
-  pull_request:
-  push:
-    branches:
-      - master
-      - stable*
-
-jobs:
-  psalm:
-    name: Psalm
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v2
-        with:
-          submodules: recursive
-      - name: Psalm
-        uses: docker://vimeo/psalm-github-actions:4.9.3
-        with:
-          security_analysis: true
-          composer_ignore_platform_reqs: false
-          report_file: results.sarif
-      - name: Upload Security Analysis results to GitHub
-        uses: github/codeql-action/upload-sarif@v1
-        with:
-          sarif_file: results.sarif
@@ -17,11 +17,13 @@ jobs:
  s3-external-tests-minio:
    runs-on: ubuntu-latest

+    if: ${{ github.repository_owner != 'nextcloud-gmbh' }}
+
    strategy:
      # do not stop on another job's failure
      fail-fast: false
      matrix:
-        php-versions: ['7.4', '8.0']
+        php-versions: ['8.0', '8.1']

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

@@ -36,7 +38,7 @@ jobs:

    steps:
      - name: Checkout server
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
        with:
          submodules: true

@@ -44,8 +46,10 @@ jobs:
        uses: shivammathur/setup-php@v2
        with:
          php-version: ${{ matrix.php-versions }}
-          tools: phpunit
+          tools: phpunit:9
          extensions: mbstring, fileinfo, intl, sqlite, pdo_sqlite, zip, gd
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

      - name: Set up Nextcloud
        run: |
@@ -66,11 +70,13 @@ jobs:
  s3-external-tests-localstack:
    runs-on: ubuntu-latest

+    if: ${{ github.repository_owner != 'nextcloud-gmbh' }}
+
    strategy:
      # do not stop on another job's failure
      fail-fast: false
      matrix:
-        php-versions: ['7.4', '8.0']
+        php-versions: ['8.0', '8.1']

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

@@ -85,7 +91,7 @@ jobs:

    steps:
      - name: Checkout server
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
        with:
          submodules: true

@@ -93,8 +99,10 @@ jobs:
        uses: shivammathur/setup-php@v2
        with:
          php-version: ${{ matrix.php-versions }}
-          tools: phpunit
+          tools: phpunit:9
          extensions: mbstring, fileinfo, intl, sqlite, pdo_sqlite, zip, gd
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

      - name: Set up Nextcloud
        run: |
@@ -0,0 +1,84 @@
+name: S3 primary storage integration tests
+on:
+  pull_request:
+  push:
+    branches:
+      - master
+      - stable*
+
+jobs:
+  s3-primary-integration-tests-minio:
+    runs-on: ubuntu-20.04
+
+    strategy:
+      # do not stop on another job's failure
+      fail-fast: false
+      matrix:
+        php-versions: ['8.0']
+        key: ['objectstore', 'objectstore_multibucket']
+
+    name: php${{ matrix.php-versions }}-${{ matrix.key }}-minio
+
+    services:
+      redis:
+        image: redis
+        ports:
+          - "6379:6379"
+      minio:
+        env:
+          MINIO_ACCESS_KEY: minio
+          MINIO_SECRET_KEY: minio123
+        image: bitnami/minio:2021.12.29
+        ports:
+          - "9000:9000"
+
+    steps:
+      - name: Checkout server
+        uses: actions/checkout@v3
+        with:
+          submodules: true
+
+      - name: Set up php ${{ matrix.php-versions }}
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php-versions }}
+          tools: phpunit:9
+          extensions: mbstring, fileinfo, intl, sqlite, pdo_sqlite, zip, gd, redis
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Wait for S3
+        run: |
+          sleep 10
+          curl -f -m 1 --retry-connrefused --retry 10 --retry-delay 10 http://localhost:9000/minio/health/ready
+
+      - name: Set up Nextcloud
+        run: |
+          mkdir data
+          echo '<?php $CONFIG=["${{ matrix.key }}" => ["class" => "OC\Files\ObjectStore\S3", "arguments" => ["bucket" => "nextcloud", "autocreate" => true, "key" => "minio", "secret" => "minio123", "hostname" => "localhost", "port" => 9000, "use_ssl" => false, "use_path_style" => true, "uploadPartSize" => 52428800]]];' > config/config.php
+          echo '<?php $CONFIG=["redis" => ["host" => "localhost", "port" => 6379], "memcache.local" => "\OC\Memcache\Redis", "memcache.distributed" => "\OC\Memcache\Redis"];' > config/redis.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 admin
+          php -f index.php
+
+      - name: Integration
+        run: |
+          cd build/integration
+          bash run.sh --tags "~@failure-s3" features/webdav-related.feature
+
+      - name: S3 logs
+        if: always()
+        run: |
+          cat data/nextcloud.log
+          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
+
+
+  s3-primary-integration-summary:
+    runs-on: ubuntu-latest
+    needs: [s3-primary-integration-tests-minio]
+
+    if: always()
+
+    steps:
+      - name: Summary status
+        run: if ${{ needs.s3-primary-integration-tests-minio.result != 'success' }}; then exit 1; fi
@@ -8,7 +8,9 @@ on:

 jobs:
  s3-primary-tests-minio:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
+
+    if: ${{ github.repository_owner != 'nextcloud-gmbh' }}

    strategy:
      # do not stop on another job's failure
@@ -24,13 +26,13 @@ jobs:
        env:
          MINIO_ACCESS_KEY: minio
          MINIO_SECRET_KEY: minio123
-        image: bitnami/minio:2021.10.6
+        image: bitnami/minio:2021.12.29
        ports:
          - "9000:9000"

    steps:
      - name: Checkout server
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
        with:
          submodules: true

@@ -38,8 +40,10 @@ jobs:
        uses: shivammathur/setup-php@v2
        with:
          php-version: ${{ matrix.php-versions }}
-          tools: phpunit
+          tools: phpunit:9
          extensions: mbstring, fileinfo, intl, sqlite, pdo_sqlite, zip, gd
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

      - name: Set up Nextcloud
        run: |
@@ -52,8 +56,6 @@ jobs:
        run: |
          sleep 10
          curl -f -m 1 --retry-connrefused --retry 10 --retry-delay 10 http://localhost:9000/minio/health/ready
-          sleep 10
-          curl -f -m 1 --retry-connrefused --retry 10 --retry-delay 10 http://localhost:9000/minio/health/ready

      - name: PHPUnit
        working-directory: tests
@@ -6,24 +6,23 @@ on:
      - stable*
    paths:
      - 'apps/files_external/**'
+      - '.github/workflows/smb-kerberos.yml'
  pull_request:
    paths:
      - 'apps/files_external/**'
+      - '.github/workflows/smb-kerberos.yml'

 jobs:
  smb-kerberos-tests:
    runs-on: ubuntu-latest

-    strategy:
-      fail-fast: false
-      matrix:
-        php-versions: ['7.4', '8.0']
+    if: ${{ github.repository_owner != 'nextcloud-gmbh' }}

-    name: php${{ matrix.php-versions }}-${{ matrix.ftpd }}
+    name: smb-kerberos-sso

    steps:
      - name: Checkout server
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
        with:
          submodules: true
      - name: Pull images
@@ -33,9 +32,12 @@ jobs:
          docker pull icewind1991/samba-krb-test-client
      - name: Setup AD-DC
        run: |
+          cp apps/files_external/tests/*.sh .
          mkdir data
          sudo chown -R 33 data apps config
-          apps/files_external/tests/setup-krb.sh
+          DC_IP=$(./start-dc.sh)
+          ./start-apache.sh $DC_IP $PWD
+          echo "DC_IP=$DC_IP" >> $GITHUB_ENV
      - name: Set up Nextcloud
        run: |
          docker exec --user 33 apache ./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
@@ -44,7 +46,8 @@ jobs:
          # setup user_saml
          docker exec --user 33 apache ./occ app:enable user_saml --force
          docker exec --user 33 apache ./occ config:app:set user_saml type --value 'environment-variable'
-          docker exec --user 33 apache ./occ config:app:set user_saml general-uid_mapping --value REMOTE_USER
+          docker exec --user 33 apache ./occ saml:config:create
+          docker exec --user 33 apache ./occ saml:config:set 1 --general-uid_mapping=REMOTE_USER

          # setup external storage
          docker exec --user 33 apache ./occ app:enable files_external --force
@@ -54,25 +57,18 @@ jobs:
          docker exec --user 33 apache ./occ files_external:list
      - name: Test SSO
        run: |
-          mkdir cookies
-          chmod 0777 cookies
+          mkdir /tmp/shared/cookies
+          chmod 0777 /tmp/shared/cookies

-          DC_IP=$(docker inspect dc --format '{{.NetworkSettings.IPAddress}}')
-          docker run --rm --name client -v $PWD/cookies:/cookies -v /tmp/shared:/shared --dns $DC_IP --hostname client.domain.test icewind1991/samba-krb-test-client \
-            curl -c /cookies/jar -s --negotiate -u testuser@DOMAIN.TEST: --delegation always http://httpd.domain.test/index.php/apps/user_saml/saml/login
-          CONTENT=$(docker run --rm --name client -v $PWD/cookies:/cookies -v /tmp/shared:/shared --dns $DC_IP --hostname client.domain.test icewind1991/samba-krb-test-client \
-            curl -b /cookies/jar -s --negotiate -u testuser@DOMAIN.TEST: --delegation always http://httpd.domain.test/remote.php/webdav/smb/test.txt)
-          echo $CONTENT
-          CONTENT=$(echo $CONTENT | tr -d '[:space:]')
+          echo "SAML login"
+          ./client-cmd.sh ${{ env.DC_IP }} curl -c /shared/cookies/jar -s --negotiate -u testuser@DOMAIN.TEST: --delegation always http://httpd.domain.test/index.php/apps/user_saml/saml/login
+          echo "Check we are logged in"
+          CONTENT=$(./client-cmd.sh ${{ env.DC_IP }} curl -b /shared/cookies/jar -s --negotiate -u testuser@DOMAIN.TEST: --delegation always http://httpd.domain.test/remote.php/webdav/smb/test.txt)
+          CONTENT=$(echo $CONTENT | head -n 1 | tr -d '[:space:]')
          [[ $CONTENT == "testfile" ]]
-
-
-  smb-kerberos-summary:
-    runs-on: ubuntu-latest
-    needs: smb-kerberos-tests
-
-    if: always()
-
-    steps:
-      - name: Summary status
-        run: if ${{ needs.smb-kerberos-tests.result != 'success' }}; then exit 1; fi
+      - name: Show logs
+        if: failure()
+        run: |
+          docker exec --user 33 apache ./occ log:file
+          FILEPATH=$(docker exec --user 33 apache ./occ log:file | grep "Log file:" | cut -d' ' -f3)
+          docker exec --user 33 apache cat $FILEPATH
@@ -7,12 +7,13 @@ on:

 jobs:
  stale:
-
    runs-on: ubuntu-latest
-    
+
+    if: ${{ github.repository_owner != 'nextcloud-gmbh' }}
+
    permissions:
      issues: write
-    
+
    steps:
    - uses: actions/stale@v5
      with:
@@ -29,4 +30,4 @@ jobs:
        days-before-stale: 30
        days-before-close: 14
        # debug-only: true
- 
+
@@ -1,56 +1,101 @@
-name: Static code analysis
+name: Psalm static code analysis

-on: [pull_request]
+on:
+  pull_request:
+  push:
+    branches:
+      - master
+      - stable*

 jobs:
-    static-code-analysis:
-        runs-on: ubuntu-latest
-        steps:
-            - uses: actions/checkout@v2
-            - name: Checkout submodules
-              shell: bash
-              run: |
-                auth_header="$(git config --local --get http.https://github.com/.extraheader)"
-                git submodule sync --recursive
-                git -c "http.extraheader=$auth_header" -c protocol.version=2 submodule update --init --force --recursive --depth=1
-            - name: Set up php7.4
-              uses: shivammathur/setup-php@master
-              with:
-                php-version: 7.4
-                extensions: ctype,curl,dom,fileinfo,gd,intl,json,mbstring,openssl,pdo_sqlite,posix,sqlite,xml,zip
-                coverage: none
-            - name: Composer install
-              run: composer i
-            - name: Psalm
-              run: composer run psalm -- --monochrome --no-progress --output-format=github --update-baseline || ( git diff -- . ':!lib/composer' && exit 1 )
-            - name: Check diff
-              run: git diff -- . ':!lib/composer'
-            - name: Show potential changes in Psalm baseline
-              run: |
-                bash -c "[[ ! \"`git status --porcelain build/psalm-baseline.xml`\" ]] || ( echo 'Uncommited changes in Psalm baseline' && git status && git diff build/psalm-baseline.xml)"
+  static-code-analysis:
+    runs-on: ubuntu-latest

-    static-code-analysis-ocp:
-        runs-on: ubuntu-latest
-        steps:
-            - uses: actions/checkout@v2
-            - name: Checkout submodules
-              shell: bash
-              run: |
-                auth_header="$(git config --local --get http.https://github.com/.extraheader)"
-                git submodule sync --recursive
-                git -c "http.extraheader=$auth_header" -c protocol.version=2 submodule update --init --force --recursive --depth=1
-            - name: Set up php7.4
-              uses: shivammathur/setup-php@master
-              with:
-                php-version: 7.4
-                extensions: ctype,curl,dom,fileinfo,gd,intl,json,mbstring,openssl,pdo_sqlite,posix,sqlite,xml,zip
-                coverage: none
-            - name: Composer install
-              run: composer i
-            - name: Psalm
-              run: composer run psalm -- -c psalm-ocp.xml --monochrome --no-progress --output-format=github --update-baseline || ( git diff -- . ':!lib/composer' && exit 1 )
-            - name: Check diff
-              run: git diff -- . ':!lib/composer'
-            - name: Show potential changes in Psalm baseline
-              run: |
-                bash -c "[[ ! \"`git status --porcelain build/psalm-baseline-ocp.xml`\" ]] || ( echo 'Uncommited changes in Psalm baseline' && git status && git diff build/psalm-baseline.xml)"
+    if: ${{ github.repository_owner != 'nextcloud-gmbh' }}
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+        with:
+          submodules: true
+
+      - name: Set up php
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: '8.0'
+          extensions: ctype,curl,dom,fileinfo,gd,intl,json,mbstring,openssl,pdo_sqlite,posix,sqlite,xml,zip
+          coverage: none
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Composer install
+        run: composer i
+
+      - name: Psalm
+        run: composer run psalm -- --monochrome --no-progress --output-format=github --update-baseline --report=results.sarif
+
+      - name: Show potential changes in Psalm baseline
+        if: always()
+        run: git diff -- . ':!lib/composer'
+
+      - name: Upload Analysis results to GitHub
+        if: always()
+        uses: github/codeql-action/upload-sarif@v2
+        with:
+          sarif_file: results.sarif
+
+  static-code-analysis-security:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+        with:
+          submodules: true
+
+      - name: Set up php
+        uses: shivammathur/setup-php@master
+        with:
+          php-version: '8.0'
+          extensions: ctype,curl,dom,fileinfo,gd,intl,json,mbstring,openssl,pdo_sqlite,posix,sqlite,xml,zip
+          coverage: none
+
+      - name: Composer install
+        run: composer i
+
+      - name: Psalm taint analysis
+        run: composer run psalm -- --monochrome --no-progress --output-format=github --report=results.sarif --taint-analysis
+
+      - name: Upload Security Analysis results to GitHub
+        if: always()
+        uses: github/codeql-action/upload-sarif@v2
+        with:
+          sarif_file: results.sarif
+
+  static-code-analysis-ocp:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+        with:
+          submodules: true
+
+      - name: Set up php
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: '8.0'
+          extensions: ctype,curl,dom,fileinfo,gd,intl,json,mbstring,openssl,pdo_sqlite,posix,sqlite,xml,zip
+          coverage: none
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Composer install
+        run: composer i
+
+      - name: Psalm
+        run: composer run psalm -- -c psalm-ocp.xml --monochrome --no-progress --output-format=github --update-baseline
+
+      - name: Show potential changes in Psalm baseline
+        if: always()
+        run: git diff -- . ':!lib/composer'
@@ -12,7 +12,7 @@ jobs:
    strategy:
      fail-fast: false
      matrix:
-        branches: ["master", "stable24", "stable23", "stable22"]
+        branches: ["master", "stable25", "stable24", "stable23", "stable22"]

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

@@ -9,25 +9,29 @@ jobs:
  update-psalm-baseline:
    runs-on: ubuntu-latest

+    if: ${{ github.repository_owner != 'nextcloud-gmbh' }}
+
    strategy:
      fail-fast: false
      matrix:
-        branches: ["master", "stable24", "stable23", "stable22"]
+        branches: ["master", "stable25", "stable24", "stable23"]

    name: update-psalm-baseline-${{ matrix.branches }}

    steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
        with:
          ref: ${{ matrix.branches }}
          submodules: true

-      - name: Set up php7.4
+      - name: Set up php
        uses: shivammathur/setup-php@v2
        with:
-          php-version: 7.4
+          php-version: '8.0'
          extensions: ctype,curl,dom,fileinfo,gd,intl,json,mbstring,openssl,pdo_sqlite,posix,sqlite,xml,zip
          coverage: none
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

      - name: Composer install
        run: composer install
@@ -36,13 +40,17 @@ jobs:
        run: composer run psalm -- --monochrome --no-progress --output-format=text --update-baseline
        continue-on-error: true

+      - name: Psalm OCP
+        run: composer run psalm -- -c psalm-ocp.xml --monochrome --no-progress --output-format=github --update-baseline
+        continue-on-error: true
+
      - name: Reset composer
        run: |
          git clean -f lib/composer
          git checkout composer.json composer.lock lib/composer

      - name: Create Pull Request
-        uses: peter-evans/create-pull-request@v3
+        uses: peter-evans/create-pull-request@v4
        with:
          token: ${{ secrets.COMMAND_BOT_PAT }}
          commit-message: Update psalm baseline
@@ -73,6 +73,7 @@ CVS/*
 RCS/*
 *.backup*
 .php_cs.cache
+.php-cs-fixer.cache

 # kdevelop
 .kdev
@@ -159,3 +160,10 @@ tests/acceptance/vendor/
 composer.phar
 /lib/composer/bin
 /vendor-bin/**/vendor
+
+./.htaccess
+core/js/mimetypelist.js
+
+# Tests - cypress
+cypress/snapshots
+cypress/videos
@@ -31,7 +31,7 @@
    Header always set X-Permitted-Cross-Domain-Policies "none"

    Header onsuccess unset X-Robots-Tag
-    Header always set X-Robots-Tag "none"
+    Header always set X-Robots-Tag "noindex, nofollow"

    Header onsuccess unset X-XSS-Protection
    Header always set X-XSS-Protection "1; mode=block"
@@ -41,11 +41,12 @@

  # Add cache control for static resources
  <FilesMatch "\.(css|js|svg|gif|png|jpg|ico|wasm|tflite)$">
-    Header set Cache-Control "max-age=15778463"
-  </FilesMatch>
-
-  <FilesMatch "\.(css|js|svg|gif|png|jpg|ico|wasm|tflite)(\?v=.*)?$">
-    Header set Cache-Control "max-age=15778463, immutable"
+    <If "%{QUERY_STRING} =~ /(^|&)v=/">
+      Header set Cache-Control "max-age=15778463, immutable"
+    </If>
+    <Else>
+      Header set Cache-Control "max-age=15778463"
+    </Else>
  </FilesMatch>

  # Let browsers cache WOFF files for a week
@@ -0,0 +1,17 @@
+# See https://pre-commit.com for more information
+# See https://pre-commit.com/hooks.html for more hooks
+repos:
+-   repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v4.3.0
+    hooks:
+    -   id: end-of-file-fixer
+    -   id: check-yaml
+    -   id: check-added-large-files
+- repo: https://github.com/nextcloud/pre-commit-php.git
+  rev: 1.5.1
+  hooks:
+  - id: php-lint
+  - id: php-cs-fixer
+    files: \.(php)$
+    exclude: ^(config|data|composer|lib\/composer)
+    args: []
@@ -1,177 +1,178 @@
 [main]
-host = https://www.transifex.com
-lang_map = bg_BG: bg, cs_CZ: cs, fi_FI: fi, hu_HU: hu, nb_NO: nb, sk_SK: sk, th_TH: th, ja_JP: ja
+host     = https://www.transifex.com
+lang_map = fi_FI: fi, hu_HU: hu, nb_NO: nb, sk_SK: sk, th_TH: th, ja_JP: ja, bg_BG: bg, cs_CZ: cs

-[nextcloud.core]
-file_filter = translationfiles/<lang>/core.po
-source_file = translationfiles/templates/core.pot
-source_lang = en
-type = PO
-
-[nextcloud.files]
-file_filter = translationfiles/<lang>/files.po
-source_file = translationfiles/templates/files.pot
-source_lang = en
-type = PO
-
-[nextcloud.settings-1]
-file_filter = translationfiles/<lang>/settings.po
-source_file = translationfiles/templates/settings.pot
-source_lang = en
-type = PO
-
-[nextcloud.lib]
-file_filter = translationfiles/<lang>/lib.po
-source_file = translationfiles/templates/lib.pot
-source_lang = en
-type = PO
-
-[nextcloud.dav]
-file_filter = translationfiles/<lang>/dav.po
-source_file = translationfiles/templates/dav.pot
-source_lang = en
-type = PO
-
-[nextcloud.files_encryption]
-file_filter = translationfiles/<lang>/encryption.po
-source_file = translationfiles/templates/encryption.pot
-source_lang = en
-type = PO
-
-[nextcloud.files_external]
-file_filter = translationfiles/<lang>/files_external.po
-source_file = translationfiles/templates/files_external.pot
-source_lang = en
-type = PO
-
-[nextcloud.files_sharing]
-file_filter = translationfiles/<lang>/files_sharing.po
-source_file = translationfiles/templates/files_sharing.pot
-source_lang = en
-type = PO
-
-[nextcloud.files_trashbin]
-file_filter = translationfiles/<lang>/files_trashbin.po
-source_file = translationfiles/templates/files_trashbin.pot
-source_lang = en
-type = PO
-
-[nextcloud.files_versions]
-file_filter = translationfiles/<lang>/files_versions.po
-source_file = translationfiles/templates/files_versions.pot
-source_lang = en
-type = PO
-
-[nextcloud.user_ldap]
-file_filter = translationfiles/<lang>/user_ldap.po
-source_file = translationfiles/templates/user_ldap.pot
-source_lang = en
-type = PO
-
-[nextcloud.comments]
-file_filter = translationfiles/<lang>/comments.po
-source_file = translationfiles/templates/comments.pot
-source_lang = en
-type = PO
-
-[nextcloud.federatedfilesharing]
-file_filter = translationfiles/<lang>/federatedfilesharing.po
-source_file = translationfiles/templates/federatedfilesharing.pot
-source_lang = en
-type = PO
-
-[nextcloud.federation]
-file_filter = translationfiles/<lang>/federation.po
-source_file = translationfiles/templates/federation.pot
-source_lang = en
-type = PO
-
-[nextcloud.oauth2]
-file_filter = translationfiles/<lang>/oauth2.po
-source_file = translationfiles/templates/oauth2.pot
-source_lang = en
-type = PO
-
-[nextcloud.sharebymail]
-file_filter = translationfiles/<lang>/sharebymail.po
-source_file = translationfiles/templates/sharebymail.pot
-source_lang = en
-type = PO
-
-[nextcloud.systemtags]
-file_filter = translationfiles/<lang>/systemtags.po
-source_file = translationfiles/templates/systemtags.pot
-source_lang = en
-type = PO
-
-[nextcloud.updatenotification]
-file_filter = translationfiles/<lang>/updatenotification.po
-source_file = translationfiles/templates/updatenotification.pot
-source_lang = en
-type = PO
-
-[nextcloud.theming]
-file_filter = translationfiles/<lang>/theming.po
-source_file = translationfiles/templates/theming.pot
-source_lang = en
-type = PO
-
-[nextcloud.twofactor_backupcodes]
-file_filter = translationfiles/<lang>/twofactor_backupcodes.po
-source_file = translationfiles/templates/twofactor_backupcodes.pot
-source_lang = en
-type = PO
-
-[nextcloud.workflowengine]
-file_filter = translationfiles/<lang>/workflowengine.po
-source_file = translationfiles/templates/workflowengine.pot
-source_lang = en
-type = PO
-
-[nextcloud.provisioning_api]
-file_filter = translationfiles/<lang>/provisioning_api.po
-source_file = translationfiles/templates/provisioning_api.pot
-source_lang = en
-type = PO
-
-[nextcloud.lookup_server_connector]
-file_filter = translationfiles/<lang>/lookup_server_connector.po
-source_file = translationfiles/templates/lookup_server_connector.pot
-source_lang = en
-type = PO
-
-[nextcloud.dashboard-shipped-with-server]
-file_filter = translationfiles/<lang>/dashboard.po
-source_file = translationfiles/templates/dashboard.pot
-source_lang = en
-type = PO
-
-[nextcloud.contactsinteraction]
-file_filter = translationfiles/<lang>/contactsinteraction.po
-source_file = translationfiles/templates/contactsinteraction.pot
-source_lang = en
-type = PO
-
-[nextcloud.cloud_federation_api]
-file_filter = translationfiles/<lang>/cloud_federation_api.po
-source_file = translationfiles/templates/cloud_federation_api.pot
-source_lang = en
-type = PO
-
-[nextcloud.admin_audit]
+[o:nextcloud:p:nextcloud:r:admin_audit]
 file_filter = translationfiles/<lang>/admin_audit.po
 source_file = translationfiles/templates/admin_audit.pot
 source_lang = en
-type = PO
+type        = PO

-[nextcloud.user_status]
+[o:nextcloud:p:nextcloud:r:cloud_federation_api]
+file_filter = translationfiles/<lang>/cloud_federation_api.po
+source_file = translationfiles/templates/cloud_federation_api.pot
+source_lang = en
+type        = PO
+
+[o:nextcloud:p:nextcloud:r:comments]
+file_filter = translationfiles/<lang>/comments.po
+source_file = translationfiles/templates/comments.pot
+source_lang = en
+type        = PO
+
+[o:nextcloud:p:nextcloud:r:contactsinteraction]
+file_filter = translationfiles/<lang>/contactsinteraction.po
+source_file = translationfiles/templates/contactsinteraction.pot
+source_lang = en
+type        = PO
+
+[o:nextcloud:p:nextcloud:r:core]
+file_filter = translationfiles/<lang>/core.po
+source_file = translationfiles/templates/core.pot
+source_lang = en
+type        = PO
+
+[o:nextcloud:p:nextcloud:r:dashboard-shipped-with-server]
+file_filter = translationfiles/<lang>/dashboard.po
+source_file = translationfiles/templates/dashboard.pot
+source_lang = en
+type        = PO
+
+[o:nextcloud:p:nextcloud:r:dav]
+file_filter = translationfiles/<lang>/dav.po
+source_file = translationfiles/templates/dav.pot
+source_lang = en
+type        = PO
+
+[o:nextcloud:p:nextcloud:r:federatedfilesharing]
+file_filter = translationfiles/<lang>/federatedfilesharing.po
+source_file = translationfiles/templates/federatedfilesharing.pot
+source_lang = en
+type        = PO
+
+[o:nextcloud:p:nextcloud:r:federation]
+file_filter = translationfiles/<lang>/federation.po
+source_file = translationfiles/templates/federation.pot
+source_lang = en
+type        = PO
+
+[o:nextcloud:p:nextcloud:r:files]
+file_filter = translationfiles/<lang>/files.po
+source_file = translationfiles/templates/files.pot
+source_lang = en
+type        = PO
+
+[o:nextcloud:p:nextcloud:r:files_encryption]
+file_filter = translationfiles/<lang>/encryption.po
+source_file = translationfiles/templates/encryption.pot
+source_lang = en
+type        = PO
+
+[o:nextcloud:p:nextcloud:r:files_external]
+file_filter = translationfiles/<lang>/files_external.po
+source_file = translationfiles/templates/files_external.pot
+source_lang = en
+type        = PO
+
+[o:nextcloud:p:nextcloud:r:files_sharing]
+file_filter = translationfiles/<lang>/files_sharing.po
+source_file = translationfiles/templates/files_sharing.pot
+source_lang = en
+type        = PO
+
+[o:nextcloud:p:nextcloud:r:files_trashbin]
+file_filter = translationfiles/<lang>/files_trashbin.po
+source_file = translationfiles/templates/files_trashbin.pot
+source_lang = en
+type        = PO
+
+[o:nextcloud:p:nextcloud:r:files_versions]
+file_filter = translationfiles/<lang>/files_versions.po
+source_file = translationfiles/templates/files_versions.pot
+source_lang = en
+type        = PO
+
+[o:nextcloud:p:nextcloud:r:lib]
+file_filter = translationfiles/<lang>/lib.po
+source_file = translationfiles/templates/lib.pot
+source_lang = en
+type        = PO
+
+[o:nextcloud:p:nextcloud:r:lookup_server_connector]
+file_filter = translationfiles/<lang>/lookup_server_connector.po
+source_file = translationfiles/templates/lookup_server_connector.pot
+source_lang = en
+type        = PO
+
+[o:nextcloud:p:nextcloud:r:oauth2]
+file_filter = translationfiles/<lang>/oauth2.po
+source_file = translationfiles/templates/oauth2.pot
+source_lang = en
+type        = PO
+
+[o:nextcloud:p:nextcloud:r:provisioning_api]
+file_filter = translationfiles/<lang>/provisioning_api.po
+source_file = translationfiles/templates/provisioning_api.pot
+source_lang = en
+type        = PO
+
+[o:nextcloud:p:nextcloud:r:settings-1]
+file_filter = translationfiles/<lang>/settings.po
+source_file = translationfiles/templates/settings.pot
+source_lang = en
+type        = PO
+
+[o:nextcloud:p:nextcloud:r:sharebymail]
+file_filter = translationfiles/<lang>/sharebymail.po
+source_file = translationfiles/templates/sharebymail.pot
+source_lang = en
+type        = PO
+
+[o:nextcloud:p:nextcloud:r:systemtags]
+file_filter = translationfiles/<lang>/systemtags.po
+source_file = translationfiles/templates/systemtags.pot
+source_lang = en
+type        = PO
+
+[o:nextcloud:p:nextcloud:r:theming]
+file_filter = translationfiles/<lang>/theming.po
+source_file = translationfiles/templates/theming.pot
+source_lang = en
+type        = PO
+
+[o:nextcloud:p:nextcloud:r:twofactor_backupcodes]
+file_filter = translationfiles/<lang>/twofactor_backupcodes.po
+source_file = translationfiles/templates/twofactor_backupcodes.pot
+source_lang = en
+type        = PO
+
+[o:nextcloud:p:nextcloud:r:updatenotification]
+file_filter = translationfiles/<lang>/updatenotification.po
+source_file = translationfiles/templates/updatenotification.pot
+source_lang = en
+type        = PO
+
+[o:nextcloud:p:nextcloud:r:user_ldap]
+file_filter = translationfiles/<lang>/user_ldap.po
+source_file = translationfiles/templates/user_ldap.pot
+source_lang = en
+type        = PO
+
+[o:nextcloud:p:nextcloud:r:user_status]
 file_filter = translationfiles/<lang>/user_status.po
 source_file = translationfiles/templates/user_status.pot
 source_lang = en
-type = PO
+type        = PO

-[nextcloud.weather_status]
+[o:nextcloud:p:nextcloud:r:weather_status]
 file_filter = translationfiles/<lang>/weather_status.po
 source_file = translationfiles/templates/weather_status.pot
 source_lang = en
-type = PO
+type        = PO
+
+[o:nextcloud:p:nextcloud:r:workflowengine]
+file_filter = translationfiles/<lang>/workflowengine.po
+source_file = translationfiles/templates/workflowengine.pot
+source_lang = en
+type        = PO
+
@@ -0,0 +1,24 @@
+# Nextcloud Design contribution guidelines
+
+## 👋 Welcome
+
+At Nextcloud we want to make sure to have everything in place to enable designers to contribute – making our apps universally accessible and easy to use.
+
+## 🚢 How to contribute design
+
+We have a dedicated page with more in-detail guidelines on our website: 
+https://nextcloud.com/design/
+
+**TL;DR**
+
+1. Check out open [issues](https://github.com/nextcloud/server/issues) here on GitHub (we label them with `design`)
+2. Make sure create publicly accessible assets 
+3. Add your contributions to an issue and we promise we will review your contribution carefully and foster discussions
+
+[This issue](https://github.com/nextcloud/desktop/issues/877) has examples of other apps, some simple mockups, and specifications about the design. In the discussions in the comments there are updates to the design as well.
+
+[This pull request](https://github.com/nextcloud/desktop/pull/1565) by a developer has the implementation of that issue, the changes they made, and more design discussions and adjustments.
+
+**We encourage you to:**
+
+- Get in touch with the team by joining our [public Talk channel](https://cloud.nextcloud.com/call/gqff69i8)
@@ -2,10 +2,11 @@
 [![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/nextcloud/server/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/nextcloud/server/?branch=master)
 [![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/master/files/Files%20Sharing.png)
+![](https://raw.githubusercontent.com/nextcloud/screenshots/master/nextcloud-hub-files-25-preview.png)

 ## Why is this so awesome? 🤩

@@ -58,7 +59,7 @@ Otherwise, git checkouts can be handled the same as release archives, by using t

 ### Working with front-end code 🏗

-#### Building
+#### Building Vue components and scripts

 We are moving more and more toward using Vue.js in the front-end, starting with Settings. For building the code on changes, use these terminal commands in the root folder:

@@ -76,6 +77,21 @@ make watch-js
 make build-js-production
 ```

+#### Building styles
+
+Styles are written in SCSS and compiled to css.
+
+```bash
+# install dependencies
+make dev-setup
+
+# compile style sheets
+npm run sass
+
+# compile style sheets and watch edits
+npm run sass:watch
+```
+
 #### Committing changes

 **When making changes, also commit the compiled files!**
@@ -5,7 +5,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.15.0</version>
+	<version>1.16.0</version>
 	<licence>agpl</licence>
 	<author>Nextcloud</author>
 	<namespace>AdminAudit</namespace>
@@ -15,7 +15,7 @@
 	<category>monitoring</category>
 	<bugs>https://github.com/nextcloud/server/issues</bugs>
 	<dependencies>
-		<nextcloud min-version="25" max-version="25"/>
+		<nextcloud min-version="26" max-version="26"/>
 	</dependencies>
 	<background-jobs>
 		<job>OCA\AdminAudit\BackgroundJobs\Rotate</job>
@@ -3,8 +3,21 @@
 // autoload.php @generated by Composer

 if (PHP_VERSION_ID < 50600) {
-    echo 'Composer 2.3.0 dropped support for autoloading on PHP <5.6 and you are running '.PHP_VERSION.', please upgrade PHP or use Composer 2.2 LTS via "composer self-update --2.2". Aborting.'.PHP_EOL;
-    exit(1);
+    if (!headers_sent()) {
+        header('HTTP/1.1 500 Internal Server Error');
+    }
+    $err = 'Composer 2.3.0 dropped support for autoloading on PHP <5.6 and you are running '.PHP_VERSION.', please upgrade PHP or use Composer 2.2 LTS via "composer self-update --2.2". Aborting.'.PHP_EOL;
+    if (!ini_get('display_errors')) {
+        if (PHP_SAPI === 'cli' || PHP_SAPI === 'phpdbg') {
+            fwrite(STDERR, $err);
+        } elseif (!headers_sent()) {
+            echo $err;
+        }
+    }
+    trigger_error(
+        $err,
+        E_USER_ERROR
+    );
 }

 require_once __DIR__ . '/composer/autoload_real.php';
@@ -42,6 +42,9 @@ namespace Composer\Autoload;
 */
 class ClassLoader
 {
+    /** @var \Closure(string):void */
+    private static $includeFile;
+
    /** @var ?string */
    private $vendorDir;

@@ -106,6 +109,7 @@ class ClassLoader
    public function __construct($vendorDir = null)
    {
        $this->vendorDir = $vendorDir;
+        self::initializeIncludeClosure();
    }

    /**
@@ -425,7 +429,7 @@ class ClassLoader
    public function loadClass($class)
    {
        if ($file = $this->findFile($class)) {
-            includeFile($file);
+            (self::$includeFile)($file);

            return true;
        }
@@ -555,18 +559,23 @@ class ClassLoader

        return false;
    }
-}

-/**
- * Scope isolated include.
- *
- * Prevents access to $this/self from included files.
- *
- * @param  string $file
- * @return void
- * @private
- */
-function includeFile($file)
-{
-    include $file;
+    private static function initializeIncludeClosure(): void
+    {
+        if (self::$includeFile !== null) {
+            return;
+        }
+
+        /**
+         * Scope isolated include.
+         *
+         * Prevents access to $this/self from included files.
+         *
+         * @param  string $file
+         * @return void
+         */
+        self::$includeFile = static function($file) {
+            include $file;
+        };
+    }
 }
@@ -3,7 +3,7 @@
        'name' => '__root__',
        'pretty_version' => 'dev-master',
        'version' => 'dev-master',
-        'reference' => '144514e49e25b7b123fd535902fee97fa39fb446',
+        'reference' => 'd51429a47232bbf46a2be832ecfa711f102da802',
        'type' => 'library',
        'install_path' => __DIR__ . '/../',
        'aliases' => array(),
@@ -13,7 +13,7 @@
        '__root__' => array(
            'pretty_version' => 'dev-master',
            'version' => 'dev-master',
-            'reference' => '144514e49e25b7b123fd535902fee97fa39fb446',
+            'reference' => 'd51429a47232bbf46a2be832ecfa711f102da802',
            'type' => 'library',
            'install_path' => __DIR__ . '/../',
            'aliases' => array(),
@@ -0,0 +1,6 @@
+OC.L10N.register(
+    "admin_audit",
+    {
+    "Auditing / Logging" : "Auditoría / Registros"
+},
+"nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;");
@@ -0,0 +1,4 @@
+{ "translations": {
+    "Auditing / Logging" : "Auditoría / Registros"
+},"pluralForm" :"nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;"
+}
@@ -2,6 +2,6 @@ OC.L10N.register(
    "admin_audit",
    {
    "Auditing / Logging" : "Auditoretza / Erregistroa",
-    "Provides logging abilities for Nextcloud such as logging file accesses or otherwise sensitive actions." : "Nextcloud-i  gaitasuna ematen dio, adibidez, fitxategien atzipenak edo bestelako ekintza babesgarriak erregistratzeko."
+    "Provides logging abilities for Nextcloud such as logging file accesses or otherwise sensitive actions." : "Nextcloudi  gaitasuna ematen dio, adibidez, saio-hasiera fitxategiak atzitzeko edo beste kontuzko ekintza batzuetarako."
 },
 "nplurals=2; plural=(n != 1);");
@@ -1,5 +1,5 @@
 { "translations": {
    "Auditing / Logging" : "Auditoretza / Erregistroa",
-    "Provides logging abilities for Nextcloud such as logging file accesses or otherwise sensitive actions." : "Nextcloud-i  gaitasuna ematen dio, adibidez, fitxategien atzipenak edo bestelako ekintza babesgarriak erregistratzeko."
+    "Provides logging abilities for Nextcloud such as logging file accesses or otherwise sensitive actions." : "Nextcloudi  gaitasuna ematen dio, adibidez, saio-hasiera fitxategiak atzitzeko edo beste kontuzko ekintza batzuetarako."
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
@@ -1,7 +1,7 @@
 OC.L10N.register(
    "admin_audit",
    {
-    "Auditing / Logging" : "Audit / journalisation",
-    "Provides logging abilities for Nextcloud such as logging file accesses or otherwise sensitive actions." : "Fournit des capacités de journalisation pour Nextcloud telles que l'enregistrement des accès aux fichiers ou d'autres actions sensibles."
+    "Auditing / Logging" : "Audit / Journalisation",
+    "Provides logging abilities for Nextcloud such as logging file accesses or otherwise sensitive actions." : "Fournit des capacités de traçage à NextCloud telles que les accès aux fichiers ou d'autres actions sensibles."
 },
 "nplurals=3; plural=(n == 0 || n == 1) ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;");
@@ -1,5 +1,5 @@
 { "translations": {
-    "Auditing / Logging" : "Audit / journalisation",
-    "Provides logging abilities for Nextcloud such as logging file accesses or otherwise sensitive actions." : "Fournit des capacités de journalisation pour Nextcloud telles que l'enregistrement des accès aux fichiers ou d'autres actions sensibles."
+    "Auditing / Logging" : "Audit / Journalisation",
+    "Provides logging abilities for Nextcloud such as logging file accesses or otherwise sensitive actions." : "Fournit des capacités de traçage à NextCloud telles que les accès aux fichiers ou d'autres actions sensibles."
 },"pluralForm" :"nplurals=3; plural=(n == 0 || n == 1) ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;"
 }
@@ -0,0 +1,7 @@
+OC.L10N.register(
+    "admin_audit",
+    {
+    "Auditing / Logging" : "Աուդիտ / Տեղեկագրում",
+    "Provides logging abilities for Nextcloud such as logging file accesses or otherwise sensitive actions." : "Nextcloud ֊ի համար տրամադրում է տեղեկագրման հնարավորություն՝ նիշքերի հասանելիության և զգայուն գործողություինների պահպանումը տեղեկամատյանում։"
+},
+"nplurals=2; plural=(n != 1);");
@@ -0,0 +1,5 @@
+{ "translations": {
+    "Auditing / Logging" : "Աուդիտ / Տեղեկագրում",
+    "Provides logging abilities for Nextcloud such as logging file accesses or otherwise sensitive actions." : "Nextcloud ֊ի համար տրամադրում է տեղեկագրման հնարավորություն՝ նիշքերի հասանելիության և զգայուն գործողություինների պահպանումը տեղեկամատյանում։"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
@@ -0,0 +1,7 @@
+OC.L10N.register(
+    "admin_audit",
+    {
+    "Auditing / Logging" : "Ревизија / Евиденција",
+    "Provides logging abilities for Nextcloud such as logging file accesses or otherwise sensitive actions." : "Обезбедува можности за евидентирање на Nextcloud, како што се евидентирање пристапи до датотеки или на друг начин чувствителни дејства."
+},
+"nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;");
@@ -0,0 +1,5 @@
+{ "translations": {
+    "Auditing / Logging" : "Ревизија / Евиденција",
+    "Provides logging abilities for Nextcloud such as logging file accesses or otherwise sensitive actions." : "Обезбедува можности за евидентирање на Nextcloud, како што се евидентирање пристапи до датотеки или на друг начин чувствителни дејства."
+},"pluralForm" :"nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;"
+}
@@ -1,7 +1,7 @@
 OC.L10N.register(
    "admin_audit",
    {
-    "Auditing / Logging" : "Auditoria / registo",
-    "Provides logging abilities for Nextcloud such as logging file accesses or otherwise sensitive actions." : "Fornece a funcionalidade de registo ao Nextcloud como o registo de acesso a ficheiros ou acções sensíveis."
+    "Auditing / Logging" : "Auditorias / Registos",
+    "Provides logging abilities for Nextcloud such as logging file accesses or otherwise sensitive actions." : "Fornece funcionalidades de registo para o Nextcloud como registar acessos a ficheiros ou demais ações sensíveis. "
 },
 "nplurals=3; plural=(n == 0 || n == 1) ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;");
@@ -1,5 +1,5 @@
 { "translations": {
-    "Auditing / Logging" : "Auditoria / registo",
-    "Provides logging abilities for Nextcloud such as logging file accesses or otherwise sensitive actions." : "Fornece a funcionalidade de registo ao Nextcloud como o registo de acesso a ficheiros ou acções sensíveis."
+    "Auditing / Logging" : "Auditorias / Registos",
+    "Provides logging abilities for Nextcloud such as logging file accesses or otherwise sensitive actions." : "Fornece funcionalidades de registo para o Nextcloud como registar acessos a ficheiros ou demais ações sensíveis. "
 },"pluralForm" :"nplurals=3; plural=(n == 0 || n == 1) ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;"
 }
@@ -160,6 +160,19 @@ class Sharing extends Action {
 					'id',
 				]
 			);
+		} elseif ($params['shareType'] === IShare::TYPE_SCIENCEMESH) {
+			$this->log(
+				'The %s "%s" with ID "%s" has been shared to the sciencemesh user "%s" with permissions "%s" (Share ID: %s)',
+				$params,
+				[
+					'itemType',
+					'path',
+					'itemSource',
+					'shareWith',
+					'permissions',
+					'id',
+				]
+			);
 		}
 	}

@@ -276,6 +289,18 @@ class Sharing extends Action {
 					'id',
 				]
 			);
+		} elseif ($params['shareType'] === IShare::TYPE_SCIENCEMESH) {
+			$this->log(
+				'The %s "%s" with ID "%s" has been unshared from the sciencemesh user "%s" (Share ID: %s)',
+				$params,
+				[
+					'itemType',
+					'fileTarget',
+					'itemSource',
+					'shareWith',
+					'id',
+				]
+			);
 		}
 	}

@@ -27,7 +27,8 @@ declare(strict_types=1);
 */
 namespace OCA\AdminAudit\BackgroundJobs;

-use OC\BackgroundJob\TimedJob;
+use OCP\BackgroundJob\TimedJob;
+use OCP\AppFramework\Utility\ITimeFactory;
 use OCP\IConfig;
 use OCP\Log\RotationTrait;

@@ -37,13 +38,16 @@ class Rotate extends TimedJob {
 	/** @var IConfig */
 	private $config;

-	public function __construct(IConfig  $config) {
+	public function __construct(ITimeFactory $time,
+								IConfig  $config) {
+		parent::__construct($time);
+
 		$this->config = $config;

 		$this->setInterval(60 * 60 * 3);
 	}

-	protected function run($argument) {
+	protected function run($argument): void {
 		$default = $this->config->getSystemValue('datadirectory', \OC::$SERVERROOT . '/data') . '/audit.log';
 		$this->filePath = $this->config->getAppValue('admin_audit', 'logfile', $default);

@@ -5,7 +5,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.8.0</version>
+	<version>1.9.0</version>
 	<licence>agpl</licence>
 	<author>Bjoern Schiessle</author>
 	<namespace>CloudFederationAPI</namespace>
@@ -15,6 +15,6 @@
 	<category>files</category>
 	<bugs>https://github.com/nextcloud/cloud_federation/issues</bugs>
 	<dependencies>
-		<nextcloud min-version="25" max-version="25"/>
+		<nextcloud min-version="26" max-version="26"/>
 	</dependencies>
 </info>
@@ -3,8 +3,21 @@
 // autoload.php @generated by Composer

 if (PHP_VERSION_ID < 50600) {
-    echo 'Composer 2.3.0 dropped support for autoloading on PHP <5.6 and you are running '.PHP_VERSION.', please upgrade PHP or use Composer 2.2 LTS via "composer self-update --2.2". Aborting.'.PHP_EOL;
-    exit(1);
+    if (!headers_sent()) {
+        header('HTTP/1.1 500 Internal Server Error');
+    }
+    $err = 'Composer 2.3.0 dropped support for autoloading on PHP <5.6 and you are running '.PHP_VERSION.', please upgrade PHP or use Composer 2.2 LTS via "composer self-update --2.2". Aborting.'.PHP_EOL;
+    if (!ini_get('display_errors')) {
+        if (PHP_SAPI === 'cli' || PHP_SAPI === 'phpdbg') {
+            fwrite(STDERR, $err);
+        } elseif (!headers_sent()) {
+            echo $err;
+        }
+    }
+    trigger_error(
+        $err,
+        E_USER_ERROR
+    );
 }

 require_once __DIR__ . '/composer/autoload_real.php';
@@ -42,6 +42,9 @@ namespace Composer\Autoload;
 */
 class ClassLoader
 {
+    /** @var \Closure(string):void */
+    private static $includeFile;
+
    /** @var ?string */
    private $vendorDir;

@@ -106,6 +109,7 @@ class ClassLoader
    public function __construct($vendorDir = null)
    {
        $this->vendorDir = $vendorDir;
+        self::initializeIncludeClosure();
    }

    /**
@@ -425,7 +429,7 @@ class ClassLoader
    public function loadClass($class)
    {
        if ($file = $this->findFile($class)) {
-            includeFile($file);
+            (self::$includeFile)($file);

            return true;
        }
@@ -555,18 +559,23 @@ class ClassLoader

        return false;
    }
-}

-/**
- * Scope isolated include.
- *
- * Prevents access to $this/self from included files.
- *
- * @param  string $file
- * @return void
- * @private
- */
-function includeFile($file)
-{
-    include $file;
+    private static function initializeIncludeClosure(): void
+    {
+        if (self::$includeFile !== null) {
+            return;
+        }
+
+        /**
+         * Scope isolated include.
+         *
+         * Prevents access to $this/self from included files.
+         *
+         * @param  string $file
+         * @return void
+         */
+        self::$includeFile = static function($file) {
+            include $file;
+        };
+    }
 }
@@ -3,7 +3,7 @@
        'name' => '__root__',
        'pretty_version' => 'dev-master',
        'version' => 'dev-master',
-        'reference' => '144514e49e25b7b123fd535902fee97fa39fb446',
+        'reference' => 'd51429a47232bbf46a2be832ecfa711f102da802',
        'type' => 'library',
        'install_path' => __DIR__ . '/../',
        'aliases' => array(),
@@ -13,7 +13,7 @@
        '__root__' => array(
            'pretty_version' => 'dev-master',
            'version' => 'dev-master',
-            'reference' => '144514e49e25b7b123fd535902fee97fa39fb446',
+            'reference' => 'd51429a47232bbf46a2be832ecfa711f102da802',
            'type' => 'library',
            'install_path' => __DIR__ . '/../',
            'aliases' => array(),
@@ -1,8 +1,8 @@
 OC.L10N.register(
    "cloud_federation_api",
    {
-    "Cloud Federation API" : "API de la Federació cloud",
-    "Enable clouds to communicate with each other and exchange data" : "Permetre que els núvols es comuniquin entre si i intercanviar dades",
-    "The Cloud Federation API enables various Nextcloud instances to communicate with each other and to exchange data." : "L'API de la Federació cloud permet que diverses instàncies Nextcloud es comuniquin entre si i intercanviin dades."
+    "Cloud Federation API" : "API de federació de núvols",
+    "Enable clouds to communicate with each other and exchange data" : "Permeteu que els núvols es comuniquin entre si i intercanviïn dades",
+    "The Cloud Federation API enables various Nextcloud instances to communicate with each other and to exchange data." : "L'API de federació de núvols permet que diverses instàncies del Nextcloud es comuniquin entre si i intercanviïn dades."
 },
 "nplurals=2; plural=(n != 1);");
@@ -1,6 +1,6 @@
 { "translations": {
-    "Cloud Federation API" : "API de la Federació cloud",
-    "Enable clouds to communicate with each other and exchange data" : "Permetre que els núvols es comuniquin entre si i intercanviar dades",
-    "The Cloud Federation API enables various Nextcloud instances to communicate with each other and to exchange data." : "L'API de la Federació cloud permet que diverses instàncies Nextcloud es comuniquin entre si i intercanviin dades."
+    "Cloud Federation API" : "API de federació de núvols",
+    "Enable clouds to communicate with each other and exchange data" : "Permeteu que els núvols es comuniquin entre si i intercanviïn dades",
+    "The Cloud Federation API enables various Nextcloud instances to communicate with each other and to exchange data." : "L'API de federació de núvols permet que diverses instàncies del Nextcloud es comuniquin entre si i intercanviïn dades."
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
@@ -1,8 +1,8 @@
 OC.L10N.register(
    "cloud_federation_api",
    {
-    "Cloud Federation API" : "API pro federování cloudu",
-    "Enable clouds to communicate with each other and exchange data" : "Umožňuje cloudům navzájem komunikovat a vyměňovat si data",
-    "The Cloud Federation API enables various Nextcloud instances to communicate with each other and to exchange data." : "API pro federování cloudů umožňuje různým instancím Nextcloud vzájemně komunikovat a vyměňovat si data."
+    "Cloud Federation API" : "API pro federovaný cloud",
+    "Enable clouds to communicate with each other and exchange data" : "Umožňuje cloudům vzájemně komunikovat a vyměňovat si data",
+    "The Cloud Federation API enables various Nextcloud instances to communicate with each other and to exchange data." : "API pro federovaný cloud umožňuje různým instancím Nextcloud vzájemně komunikovat a vyměňovat si data."
 },
 "nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n >= 2 && n <= 4 && n % 1 == 0) ? 1: (n % 1 != 0 ) ? 2 : 3;");
@@ -1,6 +1,6 @@
 { "translations": {
-    "Cloud Federation API" : "API pro federování cloudu",
-    "Enable clouds to communicate with each other and exchange data" : "Umožňuje cloudům navzájem komunikovat a vyměňovat si data",
-    "The Cloud Federation API enables various Nextcloud instances to communicate with each other and to exchange data." : "API pro federování cloudů umožňuje různým instancím Nextcloud vzájemně komunikovat a vyměňovat si data."
+    "Cloud Federation API" : "API pro federovaný cloud",
+    "Enable clouds to communicate with each other and exchange data" : "Umožňuje cloudům vzájemně komunikovat a vyměňovat si data",
+    "The Cloud Federation API enables various Nextcloud instances to communicate with each other and to exchange data." : "API pro federovaný cloud umožňuje různým instancím Nextcloud vzájemně komunikovat a vyměňovat si data."
 },"pluralForm" :"nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n >= 2 && n <= 4 && n % 1 == 0) ? 1: (n % 1 != 0 ) ? 2 : 3;"
 }
@@ -1,8 +1,8 @@
 OC.L10N.register(
    "cloud_federation_api",
    {
-    "Cloud Federation API" : "Cloud Federation API",
-    "Enable clouds to communicate with each other and exchange data" : "Aukera ematen du beste hodeirekin komunikatzeko eta datuak trukatzeko.",
-    "The Cloud Federation API enables various Nextcloud instances to communicate with each other and to exchange data." : "Cloud Federation APIk aukera ematen du hainbat Nextcloud instantzien artean elkarri komunikatzeko eta datuak trukatzeko. "
+    "Cloud Federation API" : "Cloud Federation APIa",
+    "Enable clouds to communicate with each other and exchange data" : "Aukera ematen du beste hodeiekin komunikatzeko eta datuak trukatzeko.",
+    "The Cloud Federation API enables various Nextcloud instances to communicate with each other and to exchange data." : "Cloud Federation APIak aukera ematen du hainbat Nextcloud instantziaren artean komunikatzeko eta datuak trukatzeko. "
 },
 "nplurals=2; plural=(n != 1);");
@@ -1,6 +1,6 @@
 { "translations": {
-    "Cloud Federation API" : "Cloud Federation API",
-    "Enable clouds to communicate with each other and exchange data" : "Aukera ematen du beste hodeirekin komunikatzeko eta datuak trukatzeko.",
-    "The Cloud Federation API enables various Nextcloud instances to communicate with each other and to exchange data." : "Cloud Federation APIk aukera ematen du hainbat Nextcloud instantzien artean elkarri komunikatzeko eta datuak trukatzeko. "
+    "Cloud Federation API" : "Cloud Federation APIa",
+    "Enable clouds to communicate with each other and exchange data" : "Aukera ematen du beste hodeiekin komunikatzeko eta datuak trukatzeko.",
+    "The Cloud Federation API enables various Nextcloud instances to communicate with each other and to exchange data." : "Cloud Federation APIak aukera ematen du hainbat Nextcloud instantziaren artean komunikatzeko eta datuak trukatzeko. "
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
@@ -0,0 +1,8 @@
+OC.L10N.register(
+    "cloud_federation_api",
+    {
+    "Cloud Federation API" : "Moln-federations API",
+    "Enable clouds to communicate with each other and exchange data" : "Tillåter olika moln att kommunicera med varandra samt utbyta data",
+    "The Cloud Federation API enables various Nextcloud instances to communicate with each other and to exchange data." : "Moln-federations API:et tillåter olika Nextcloud-instanser att kommunicera med varandra samt utbyta data."
+},
+"nplurals=2; plural=(n != 1);");
@@ -0,0 +1,6 @@
+{ "translations": {
+    "Cloud Federation API" : "Moln-federations API",
+    "Enable clouds to communicate with each other and exchange data" : "Tillåter olika moln att kommunicera med varandra samt utbyta data",
+    "The Cloud Federation API enables various Nextcloud instances to communicate with each other and to exchange data." : "Moln-federations API:et tillåter olika Nextcloud-instanser att kommunicera med varandra samt utbyta data."
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
@@ -5,7 +5,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.15.0</version>
+	<version>1.16.0</version>
 	<licence>agpl</licence>
 	<author>Arthur Schiwon</author>
 	<author>Vincent Petry</author>
@@ -16,7 +16,7 @@
 	<category>social</category>
 	<bugs>https://github.com/nextcloud/server/issues</bugs>
 	<dependencies>
-		<nextcloud min-version="25" max-version="25"/>
+		<nextcloud min-version="26" max-version="26"/>
 	</dependencies>

 	<activity>
@@ -3,8 +3,21 @@
 // autoload.php @generated by Composer

 if (PHP_VERSION_ID < 50600) {
-    echo 'Composer 2.3.0 dropped support for autoloading on PHP <5.6 and you are running '.PHP_VERSION.', please upgrade PHP or use Composer 2.2 LTS via "composer self-update --2.2". Aborting.'.PHP_EOL;
-    exit(1);
+    if (!headers_sent()) {
+        header('HTTP/1.1 500 Internal Server Error');
+    }
+    $err = 'Composer 2.3.0 dropped support for autoloading on PHP <5.6 and you are running '.PHP_VERSION.', please upgrade PHP or use Composer 2.2 LTS via "composer self-update --2.2". Aborting.'.PHP_EOL;
+    if (!ini_get('display_errors')) {
+        if (PHP_SAPI === 'cli' || PHP_SAPI === 'phpdbg') {
+            fwrite(STDERR, $err);
+        } elseif (!headers_sent()) {
+            echo $err;
+        }
+    }
+    trigger_error(
+        $err,
+        E_USER_ERROR
+    );
 }

 require_once __DIR__ . '/composer/autoload_real.php';
@@ -42,6 +42,9 @@ namespace Composer\Autoload;
 */
 class ClassLoader
 {
+    /** @var \Closure(string):void */
+    private static $includeFile;
+
    /** @var ?string */
    private $vendorDir;

@@ -106,6 +109,7 @@ class ClassLoader
    public function __construct($vendorDir = null)
    {
        $this->vendorDir = $vendorDir;
+        self::initializeIncludeClosure();
    }

    /**
@@ -425,7 +429,7 @@ class ClassLoader
    public function loadClass($class)
    {
        if ($file = $this->findFile($class)) {
-            includeFile($file);
+            (self::$includeFile)($file);

            return true;
        }
@@ -555,18 +559,23 @@ class ClassLoader

        return false;
    }
-}

-/**
- * Scope isolated include.
- *
- * Prevents access to $this/self from included files.
- *
- * @param  string $file
- * @return void
- * @private
- */
-function includeFile($file)
-{
-    include $file;
+    private static function initializeIncludeClosure(): void
+    {
+        if (self::$includeFile !== null) {
+            return;
+        }
+
+        /**
+         * Scope isolated include.
+         *
+         * Prevents access to $this/self from included files.
+         *
+         * @param  string $file
+         * @return void
+         */
+        self::$includeFile = static function($file) {
+            include $file;
+        };
+    }
 }
@@ -3,7 +3,7 @@
        'name' => '__root__',
        'pretty_version' => 'dev-master',
        'version' => 'dev-master',
-        'reference' => '144514e49e25b7b123fd535902fee97fa39fb446',
+        'reference' => 'd51429a47232bbf46a2be832ecfa711f102da802',
        'type' => 'library',
        'install_path' => __DIR__ . '/../',
        'aliases' => array(),
@@ -13,7 +13,7 @@
        '__root__' => array(
            'pretty_version' => 'dev-master',
            'version' => 'dev-master',
-            'reference' => '144514e49e25b7b123fd535902fee97fa39fb446',
+            'reference' => 'd51429a47232bbf46a2be832ecfa711f102da802',
            'type' => 'library',
            'install_path' => __DIR__ . '/../',
            'aliases' => array(),
@@ -3,7 +3,6 @@ OC.L10N.register(
    {
    "Comments" : "Kommentare",
    "You commented" : "U het kommentaar gelewer",
-    "%1$s commented" : "%1$s 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",
@@ -17,7 +16,6 @@ OC.L10N.register(
    "Retry" : "Herprobeer",
    "_%n unread comment_::_%n unread comments_" : ["%n ongelese kommentaar","%n ongelese kommentare"],
    "Comment" : "Kommentaar",
-    "You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Jy is genoem op “{lêer}”, in die kommentaar van 'n gebruiker wat intussen geskrap is.",
-    "{user} mentioned you in a comment on “{file}”" : "{gebruiker} het u in ’n kommentaar oor “{lêer}” genoem"
+    "%1$s commented" : "%1$s het kommentaar gelewer"
 },
 "nplurals=2; plural=(n != 1);");
@@ -1,7 +1,6 @@
 { "translations": {
    "Comments" : "Kommentare",
    "You commented" : "U het kommentaar gelewer",
-    "%1$s commented" : "%1$s 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",
@@ -15,7 +14,6 @@
    "Retry" : "Herprobeer",
    "_%n unread comment_::_%n unread comments_" : ["%n ongelese kommentaar","%n ongelese kommentare"],
    "Comment" : "Kommentaar",
-    "You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Jy is genoem op “{lêer}”, in die kommentaar van 'n gebruiker wat intussen geskrap is.",
-    "{user} mentioned you in a comment on “{file}”" : "{gebruiker} het u in ’n kommentaar oor “{lêer}” genoem"
+    "%1$s commented" : "%1$s het kommentaar gelewer"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
@@ -3,13 +3,14 @@ OC.L10N.register(
    {
    "Comments" : "تعليقات",
    "You commented" : "قمت بكتابة تعليق",
-    "%1$s commented" : "%1$s كتب تعليق",
    "{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> على الملفات",
+    "You were mentioned on \"{file}\", in a comment by a user 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" : "حذف التعليق",
@@ -26,7 +27,6 @@ OC.L10N.register(
    "Comment deleted" : "التعليق حُذف",
    "An error occurred while trying to delete the comment" : "حدث خطأ أثناء محاولة حذف التعليق",
    "An error occurred while trying to create the comment" : "حدث خطأ أثناء محاولة إنشاء التعليق",
-    "You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "تمت الإشارة إليك على “{file}”, في تعليق بواسطة مستخدم تم حذفه منذ ذلك الحين",
-    "{user} mentioned you in a comment on “{file}”" : "{user} أشار إليك في تعليق على “{file}”"
+    "%1$s commented" : "%1$s كتب تعليق"
 },
 "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;");
@@ -1,13 +1,14 @@
 { "translations": {
    "Comments" : "تعليقات",
    "You commented" : "قمت بكتابة تعليق",
-    "%1$s commented" : "%1$s كتب تعليق",
    "{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> على الملفات",
+    "You were mentioned on \"{file}\", in a comment by a user 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" : "حذف التعليق",
@@ -24,7 +25,6 @@
    "Comment deleted" : "التعليق حُذف",
    "An error occurred while trying to delete the comment" : "حدث خطأ أثناء محاولة حذف التعليق",
    "An error occurred while trying to create the comment" : "حدث خطأ أثناء محاولة إنشاء التعليق",
-    "You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "تمت الإشارة إليك على “{file}”, في تعليق بواسطة مستخدم تم حذفه منذ ذلك الحين",
-    "{user} mentioned you in a comment on “{file}”" : "{user} أشار إليك في تعليق على “{file}”"
+    "%1$s commented" : "%1$s كتب تعليق"
 },"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;"
 }
@@ -3,7 +3,6 @@ OC.L10N.register(
    {
    "Comments" : "Comentarios",
    "You commented" : "Comentesti",
-    "%1$s commented" : "%1$s comentó",
    "{author} commented" : "{author} comentó",
    "You commented on %1$s" : "Comentesti en %1$s",
    "You commented on {file}" : "Comentesti en {file}",
@@ -16,6 +15,6 @@ OC.L10N.register(
    "Retry" : "Retentar",
    "_%n unread comment_::_%n unread comments_" : ["%n comentariu ensin lleer","%n comentarios ensin lleer"],
    "Comment" : "Comentariu",
-    "{user} mentioned you in a comment on “{file}”" : "{user} mentóte nun comentariu de «{file}»"
+    "%1$s commented" : "%1$s comentó"
 },
 "nplurals=2; plural=(n != 1);");
@@ -1,7 +1,6 @@
 { "translations": {
    "Comments" : "Comentarios",
    "You commented" : "Comentesti",
-    "%1$s commented" : "%1$s comentó",
    "{author} commented" : "{author} comentó",
    "You commented on %1$s" : "Comentesti en %1$s",
    "You commented on {file}" : "Comentesti en {file}",
@@ -14,6 +13,6 @@
    "Retry" : "Retentar",
    "_%n unread comment_::_%n unread comments_" : ["%n comentariu ensin lleer","%n comentarios ensin lleer"],
    "Comment" : "Comentariu",
-    "{user} mentioned you in a comment on “{file}”" : "{user} mentóte nun comentariu de «{file}»"
+    "%1$s commented" : "%1$s comentó"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
@@ -3,7 +3,6 @@ OC.L10N.register(
    {
    "Comments" : "Коментари",
    "You commented" : "Вие коментирахте",
-    "%1$s commented" : "%1$s коментира",
    "{author} commented" : "{author} коментира",
    "You commented on %1$s" : "Ти коментира за %1$s",
    "You commented on {file}" : "Ти коментира за {file}",
@@ -28,7 +27,6 @@ OC.L10N.register(
    "Comment deleted" : " Изтрит е коментар",
    "An error occurred while trying to delete the comment" : "Възникна грешка при опит за изтриване на коментара",
    "An error occurred while trying to create the comment" : "Възникна грешка при опит за създаване на коментар",
-    "You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Бяхте споменат/а към “{file}”, в коментар от потребител, който вече е изтрит",
-    "{user} mentioned you in a comment on “{file}”" : "{user} те спомена в коментар за “{file}”"
+    "%1$s commented" : "%1$s коментира"
 },
 "nplurals=2; plural=(n != 1);");
@@ -1,7 +1,6 @@
 { "translations": {
    "Comments" : "Коментари",
    "You commented" : "Вие коментирахте",
-    "%1$s commented" : "%1$s коментира",
    "{author} commented" : "{author} коментира",
    "You commented on %1$s" : "Ти коментира за %1$s",
    "You commented on {file}" : "Ти коментира за {file}",
@@ -26,7 +25,6 @@
    "Comment deleted" : " Изтрит е коментар",
    "An error occurred while trying to delete the comment" : "Възникна грешка при опит за изтриване на коментара",
    "An error occurred while trying to create the comment" : "Възникна грешка при опит за създаване на коментар",
-    "You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Бяхте споменат/а към “{file}”, в коментар от потребител, който вече е изтрит",
-    "{user} mentioned you in a comment on “{file}”" : "{user} те спомена в коментар за “{file}”"
+    "%1$s commented" : "%1$s коментира"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
@@ -3,23 +3,30 @@ OC.L10N.register(
    {
    "Comments" : "Comentaris",
    "You commented" : "Heu comentat",
-    "%1$s commented" : "%1$s ha comentat",
    "{author} commented" : "{author} ha comentat",
    "You commented on %1$s" : "Heu comentat a %1$s",
    "You commented on {file}" : "Heu comentat a {file}",
    "%1$s commented on %2$s" : "%1$s ha comentat a %2$s",
    "{author} commented on {file}" : "{author} ha comentat a {file}",
    "<strong>Comments</strong> for files" : "<strong>Comentaris</strong> per fitxers",
+    "You were mentioned on \"{file}\", in a comment by a user that has since been deleted" : "Se t'ha esmentat a \"{file}\" en un comentari d'un usuari que s'ha suprimit des de llavors",
+    "{user} mentioned you in a comment on \"{file}\"" : "{user} t'ha mencionat en un comentari a \"{file}\"",
    "Files app plugin to add comments to files" : "Connexió de l’aplicació de fitxers per afegir comentaris als fitxers",
-    "Edit comment" : "Edita comentari",
+    "Edit comment" : "Edició comentari",
    "Delete comment" : "Suprimeix comentari",
+    "Cancel edit" : "Cancel·la l'edició",
+    "Post comment" : "Enviar comentari",
    "No comments yet, start the conversation!" : "Encara no hi ha comentaris. Enceteu la conversa!",
-    "Retry" : "Torna a intentar",
+    "No more messages" : "No hi ha més missatges",
+    "Retry" : "Reintent",
+    "Unable to load the comments list" : "No es pot carregar la llista de comentaris",
    "_%n unread comment_::_%n unread comments_" : ["%n comentari no llegit","%n comentaris no llegits"],
    "_1 new comment_::_{unread} new comments_" : ["1 comentari nou","{unread} comentaris nous"],
    "Comment" : "Comentari",
+    "An error occurred while trying to edit the comment" : "S'ha produït un error en intentar editar el comentari",
    "Comment deleted" : "Comentari suprimit",
-    "You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Heu estat esmentats a \"{file}\" en un comentari d'un usuari que ja no existeix",
-    "{user} mentioned you in a comment on “{file}”" : "{user} us ha esmentat en un comentari de “{file}”"
+    "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",
+    "%1$s commented" : "%1$s ha comentat"
 },
 "nplurals=2; plural=(n != 1);");
@@ -1,23 +1,30 @@
 { "translations": {
    "Comments" : "Comentaris",
    "You commented" : "Heu comentat",
-    "%1$s commented" : "%1$s ha comentat",
    "{author} commented" : "{author} ha comentat",
    "You commented on %1$s" : "Heu comentat a %1$s",
    "You commented on {file}" : "Heu comentat a {file}",
    "%1$s commented on %2$s" : "%1$s ha comentat a %2$s",
    "{author} commented on {file}" : "{author} ha comentat a {file}",
    "<strong>Comments</strong> for files" : "<strong>Comentaris</strong> per fitxers",
+    "You were mentioned on \"{file}\", in a comment by a user that has since been deleted" : "Se t'ha esmentat a \"{file}\" en un comentari d'un usuari que s'ha suprimit des de llavors",
+    "{user} mentioned you in a comment on \"{file}\"" : "{user} t'ha mencionat en un comentari a \"{file}\"",
    "Files app plugin to add comments to files" : "Connexió de l’aplicació de fitxers per afegir comentaris als fitxers",
-    "Edit comment" : "Edita comentari",
+    "Edit comment" : "Edició comentari",
    "Delete comment" : "Suprimeix comentari",
+    "Cancel edit" : "Cancel·la l'edició",
+    "Post comment" : "Enviar comentari",
    "No comments yet, start the conversation!" : "Encara no hi ha comentaris. Enceteu la conversa!",
-    "Retry" : "Torna a intentar",
+    "No more messages" : "No hi ha més missatges",
+    "Retry" : "Reintent",
+    "Unable to load the comments list" : "No es pot carregar la llista de comentaris",
    "_%n unread comment_::_%n unread comments_" : ["%n comentari no llegit","%n comentaris no llegits"],
    "_1 new comment_::_{unread} new comments_" : ["1 comentari nou","{unread} comentaris nous"],
    "Comment" : "Comentari",
+    "An error occurred while trying to edit the comment" : "S'ha produït un error en intentar editar el comentari",
    "Comment deleted" : "Comentari suprimit",
-    "You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Heu estat esmentats a \"{file}\" en un comentari d'un usuari que ja no existeix",
-    "{user} mentioned you in a comment on “{file}”" : "{user} us ha esmentat en un comentari de “{file}”"
+    "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",
+    "%1$s commented" : "%1$s ha comentat"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
@@ -3,14 +3,13 @@ OC.L10N.register(
    {
    "Comments" : "Komentáře",
    "You commented" : "Okomentovali jste",
-    "%1$s commented" : "%1$s okomentován",
    "{author} commented" : "{author} okomentoval(a)",
    "You commented on %1$s" : "Okomentovali jste %1$s",
    "You commented on {file}" : "Okomentovali jste {file}",
    "%1$s commented on %2$s" : "%1$s okomentoval(a) %2$s",
    "{author} commented on {file}" : "{author} okomentoval(a) {file}",
    "<strong>Comments</strong> for files" : "<strong>Komentáře</strong> k souborům",
-    "You were mentioned on \"{file}\", in a comment by a user that has since been deleted" : "Byli jste zmíněni v souboru „{file}“, v komentáři od uživatele, který byl později smazán",
+    "You were mentioned on \"{file}\", in a comment by a user that has since been deleted" : "Byli jste zmíněni u souboru „{file}“, v komentáři od uživatele, který byl později smazán",
    "{user} mentioned you in a comment on \"{file}\"" : "{user} vás zmínil(a) v komentáři u „{file}“",
    "Files app plugin to add comments to files" : "Zásuvný modul do aplikace Soubory pro přidávání komentářů k souborům",
    "Edit comment" : "Upravit komentář",
@@ -28,7 +27,6 @@ OC.L10N.register(
    "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",
-    "You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Byli jste zmíněni v souboru „{file}“, v komentáři od uživatele, který byl později smazán",
-    "{user} mentioned you in a comment on “{file}”" : "{user} vás zmínil(a) v komentáři u „{file}“"
+    "%1$s commented" : "%1$s okomentováno"
 },
 "nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n >= 2 && n <= 4 && n % 1 == 0) ? 1: (n % 1 != 0 ) ? 2 : 3;");
@@ -1,14 +1,13 @@
 { "translations": {
    "Comments" : "Komentáře",
    "You commented" : "Okomentovali jste",
-    "%1$s commented" : "%1$s okomentován",
    "{author} commented" : "{author} okomentoval(a)",
    "You commented on %1$s" : "Okomentovali jste %1$s",
    "You commented on {file}" : "Okomentovali jste {file}",
    "%1$s commented on %2$s" : "%1$s okomentoval(a) %2$s",
    "{author} commented on {file}" : "{author} okomentoval(a) {file}",
    "<strong>Comments</strong> for files" : "<strong>Komentáře</strong> k souborům",
-    "You were mentioned on \"{file}\", in a comment by a user that has since been deleted" : "Byli jste zmíněni v souboru „{file}“, v komentáři od uživatele, který byl později smazán",
+    "You were mentioned on \"{file}\", in a comment by a user that has since been deleted" : "Byli jste zmíněni u souboru „{file}“, v komentáři od uživatele, který byl později smazán",
    "{user} mentioned you in a comment on \"{file}\"" : "{user} vás zmínil(a) v komentáři u „{file}“",
    "Files app plugin to add comments to files" : "Zásuvný modul do aplikace Soubory pro přidávání komentářů k souborům",
    "Edit comment" : "Upravit komentář",
@@ -26,7 +25,6 @@
    "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",
-    "You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Byli jste zmíněni v souboru „{file}“, v komentáři od uživatele, který byl později smazán",
-    "{user} mentioned you in a comment on “{file}”" : "{user} vás zmínil(a) v komentáři u „{file}“"
+    "%1$s commented" : "%1$s okomentováno"
 },"pluralForm" :"nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n >= 2 && n <= 4 && n % 1 == 0) ? 1: (n % 1 != 0 ) ? 2 : 3;"
 }
@@ -3,7 +3,6 @@ OC.L10N.register(
    {
    "Comments" : "Kommentarer",
    "You commented" : "Du kommenterede",
-    "%1$s commented" : "%1$s kommenterede",
    "{author} commented" : "{author} kommenterede",
    "You commented on %1$s" : "Du kommenterede %1$s",
    "You commented on {file}" : "Du kommenterede {file}",
@@ -28,7 +27,6 @@ OC.L10N.register(
    "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",
-    "You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Du blev nævnt i \"{file}”, I en kommentar af en bruger der siden er blevet slettet",
-    "{user} mentioned you in a comment on “{file}”" : "{user} nævnte dig i en kommentarer på \"{file}\""
+    "%1$s commented" : "%1$s kommenterede"
 },
 "nplurals=2; plural=(n != 1);");
@@ -1,7 +1,6 @@
 { "translations": {
    "Comments" : "Kommentarer",
    "You commented" : "Du kommenterede",
-    "%1$s commented" : "%1$s kommenterede",
    "{author} commented" : "{author} kommenterede",
    "You commented on %1$s" : "Du kommenterede %1$s",
    "You commented on {file}" : "Du kommenterede {file}",
@@ -26,7 +25,6 @@
    "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",
-    "You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Du blev nævnt i \"{file}”, I en kommentar af en bruger der siden er blevet slettet",
-    "{user} mentioned you in a comment on “{file}”" : "{user} nævnte dig i en kommentarer på \"{file}\""
+    "%1$s commented" : "%1$s kommenterede"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
@@ -3,7 +3,6 @@ OC.L10N.register(
    {
    "Comments" : "Kommentare",
    "You commented" : "Du hast kommentiert",
-    "%1$s commented" : "%1$s kommentierte",
    "{author} commented" : "{author} kommentierte",
    "You commented on %1$s" : "Du hast %1$s kommentiert",
    "You commented on {file}" : "Du hast {file} kommentiert",
@@ -28,7 +27,6 @@ OC.L10N.register(
    "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",
-    "You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Du wurdest in einem Kommentar auf \"{file}\" von einem bereits gelöschten Benutzer erwähnt",
-    "{user} mentioned you in a comment on “{file}”" : "{user} hat dich in einem Kommentar zu “{file}” erwähnt"
+    "%1$s commented" : "%1$s kommentierte"
 },
 "nplurals=2; plural=(n != 1);");
@@ -1,7 +1,6 @@
 { "translations": {
    "Comments" : "Kommentare",
    "You commented" : "Du hast kommentiert",
-    "%1$s commented" : "%1$s kommentierte",
    "{author} commented" : "{author} kommentierte",
    "You commented on %1$s" : "Du hast %1$s kommentiert",
    "You commented on {file}" : "Du hast {file} kommentiert",
@@ -26,7 +25,6 @@
    "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",
-    "You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Du wurdest in einem Kommentar auf \"{file}\" von einem bereits gelöschten Benutzer erwähnt",
-    "{user} mentioned you in a comment on “{file}”" : "{user} hat dich in einem Kommentar zu “{file}” erwähnt"
+    "%1$s commented" : "%1$s kommentierte"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
@@ -3,7 +3,6 @@ OC.L10N.register(
    {
    "Comments" : "Kommentare",
    "You commented" : "Sie haben kommentiert",
-    "%1$s commented" : "%1$s kommentierte",
    "{author} commented" : "{author} kommentierte",
    "You commented on %1$s" : "Sie haben %1$s kommentiert",
    "You commented on {file}" : "Sie haben {file} kommentiert",
@@ -28,7 +27,6 @@ OC.L10N.register(
    "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",
-    "You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Sie wurden in einem Kommentar auf \"{file}\" von einem bereits gelöschten Benutzer erwähnt",
-    "{user} mentioned you in a comment on “{file}”" : "{user} hat Sie in einem Kommentar zu “{file}” erwähnt"
+    "%1$s commented" : "%1$s kommentierte"
 },
 "nplurals=2; plural=(n != 1);");
@@ -1,7 +1,6 @@
 { "translations": {
    "Comments" : "Kommentare",
    "You commented" : "Sie haben kommentiert",
-    "%1$s commented" : "%1$s kommentierte",
    "{author} commented" : "{author} kommentierte",
    "You commented on %1$s" : "Sie haben %1$s kommentiert",
    "You commented on {file}" : "Sie haben {file} kommentiert",
@@ -26,7 +25,6 @@
    "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",
-    "You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Sie wurden in einem Kommentar auf \"{file}\" von einem bereits gelöschten Benutzer erwähnt",
-    "{user} mentioned you in a comment on “{file}”" : "{user} hat Sie in einem Kommentar zu “{file}” erwähnt"
+    "%1$s commented" : "%1$s kommentierte"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
@@ -3,7 +3,6 @@ OC.L10N.register(
    {
    "Comments" : "Σχόλια",
    "You commented" : "Σχολιάσατε",
-    "%1$s commented" : "%1$s σχολίασε",
    "{author} commented" : "Ο {author} σχολίασε",
    "You commented on %1$s" : "Σχολιάσατε στο %1$s",
    "You commented on {file}" : "Σχολιάσατε στο {file}",
@@ -28,7 +27,6 @@ OC.L10N.register(
    "Comment deleted" : "Το σχόλιο διαγράφηκε",
    "An error occurred while trying to delete the comment" : "Παρουσιάστηκε σφάλμα κατά την προσπάθεια διαγραφής του σχολίου",
    "An error occurred while trying to create the comment" : "Παρουσιάστηκε σφάλμα κατά την προσπάθεια δημιουργίας του σχολίου",
-    "You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Το όνομά σας αναφέρθηκε στο “{file}”, σε σχόλιο ενός χρήστη ο οποίος έχει πλέον διαγραφεί",
-    "{user} mentioned you in a comment on “{file}”" : "Ο {user} σας ανέφερε σε σχόλιο στο “{file}”"
+    "%1$s commented" : "%1$s σχολίασε"
 },
 "nplurals=2; plural=(n != 1);");
@@ -1,7 +1,6 @@
 { "translations": {
    "Comments" : "Σχόλια",
    "You commented" : "Σχολιάσατε",
-    "%1$s commented" : "%1$s σχολίασε",
    "{author} commented" : "Ο {author} σχολίασε",
    "You commented on %1$s" : "Σχολιάσατε στο %1$s",
    "You commented on {file}" : "Σχολιάσατε στο {file}",
@@ -26,7 +25,6 @@
    "Comment deleted" : "Το σχόλιο διαγράφηκε",
    "An error occurred while trying to delete the comment" : "Παρουσιάστηκε σφάλμα κατά την προσπάθεια διαγραφής του σχολίου",
    "An error occurred while trying to create the comment" : "Παρουσιάστηκε σφάλμα κατά την προσπάθεια δημιουργίας του σχολίου",
-    "You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Το όνομά σας αναφέρθηκε στο “{file}”, σε σχόλιο ενός χρήστη ο οποίος έχει πλέον διαγραφεί",
-    "{user} mentioned you in a comment on “{file}”" : "Ο {user} σας ανέφερε σε σχόλιο στο “{file}”"
+    "%1$s commented" : "%1$s σχολίασε"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
@@ -3,22 +3,30 @@ OC.L10N.register(
    {
    "Comments" : "Comments",
    "You commented" : "You commented",
-    "%1$s commented" : "%1$s commented",
    "{author} commented" : "{author} commented",
    "You commented on %1$s" : "You commented on %1$s",
    "You commented on {file}" : "You commented on {file}",
    "%1$s commented on %2$s" : "%1$s commented on %2$s",
    "{author} commented on {file}" : "{author} commented on {file}",
    "<strong>Comments</strong> for files" : "<strong>Comments</strong> for files",
+    "You were mentioned on \"{file}\", in a comment by a user that has since been deleted" : "You were mentioned on \"{file}\", in a comment by a user that has since been deleted",
+    "{user} mentioned you in a comment on \"{file}\"" : "{user} mentioned you in a comment on \"{file}\"",
    "Files app plugin to add comments to files" : "Files app plugin to add comments to files",
    "Edit comment" : "Edit comment",
    "Delete comment" : "Delete comment",
+    "Cancel edit" : "Cancel edit",
+    "Post comment" : "Post comment",
    "No comments yet, start the conversation!" : "No comments yet, start the conversation!",
+    "No more messages" : "No more messages",
    "Retry" : "Retry",
+    "Unable to load the comments list" : "Unable to load the comments list",
    "_%n unread comment_::_%n unread comments_" : ["%n unread comment","%n unread comments"],
    "_1 new comment_::_{unread} new comments_" : ["1 new comment","{unread} new comments"],
    "Comment" : "Comment",
-    "You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "You were mentioned on “{file}”, in a comment by a user that has since been deleted",
-    "{user} mentioned you in a comment on “{file}”" : "{user} mentioned you in a comment on “{file}”"
+    "An error occurred while trying to edit the comment" : "An error occurred while trying to edit the comment",
+    "Comment deleted" : "Comment deleted",
+    "An error occurred while trying to delete the comment" : "An error occurred while trying to delete the comment",
+    "An error occurred while trying to create the comment" : "An error occurred while trying to create the comment",
+    "%1$s commented" : "%1$s commented"
 },
 "nplurals=2; plural=(n != 1);");
@@ -1,22 +1,30 @@
 { "translations": {
    "Comments" : "Comments",
    "You commented" : "You commented",
-    "%1$s commented" : "%1$s commented",
    "{author} commented" : "{author} commented",
    "You commented on %1$s" : "You commented on %1$s",
    "You commented on {file}" : "You commented on {file}",
    "%1$s commented on %2$s" : "%1$s commented on %2$s",
    "{author} commented on {file}" : "{author} commented on {file}",
    "<strong>Comments</strong> for files" : "<strong>Comments</strong> for files",
+    "You were mentioned on \"{file}\", in a comment by a user that has since been deleted" : "You were mentioned on \"{file}\", in a comment by a user that has since been deleted",
+    "{user} mentioned you in a comment on \"{file}\"" : "{user} mentioned you in a comment on \"{file}\"",
    "Files app plugin to add comments to files" : "Files app plugin to add comments to files",
    "Edit comment" : "Edit comment",
    "Delete comment" : "Delete comment",
+    "Cancel edit" : "Cancel edit",
+    "Post comment" : "Post comment",
    "No comments yet, start the conversation!" : "No comments yet, start the conversation!",
+    "No more messages" : "No more messages",
    "Retry" : "Retry",
+    "Unable to load the comments list" : "Unable to load the comments list",
    "_%n unread comment_::_%n unread comments_" : ["%n unread comment","%n unread comments"],
    "_1 new comment_::_{unread} new comments_" : ["1 new comment","{unread} new comments"],
    "Comment" : "Comment",
-    "You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "You were mentioned on “{file}”, in a comment by a user that has since been deleted",
-    "{user} mentioned you in a comment on “{file}”" : "{user} mentioned you in a comment on “{file}”"
+    "An error occurred while trying to edit the comment" : "An error occurred while trying to edit the comment",
+    "Comment deleted" : "Comment deleted",
+    "An error occurred while trying to delete the comment" : "An error occurred while trying to delete the comment",
+    "An error occurred while trying to create the comment" : "An error occurred while trying to create the comment",
+    "%1$s commented" : "%1$s commented"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
@@ -3,7 +3,6 @@ OC.L10N.register(
    {
    "Comments" : "Komentoj",
    "You commented" : "Vi komentis",
-    "%1$s commented" : "%1$s komentis",
    "{author} commented" : "{author} komentis",
    "You commented on %1$s" : "Vi komentis %1$s",
    "You commented on {file}" : "Vi komentis pri {file}",
@@ -18,7 +17,6 @@ OC.L10N.register(
    "_%n unread comment_::_%n unread comments_" : ["%n nelegataj komentoj","%n nelegataj komentoj"],
    "_1 new comment_::_{unread} new comments_" : ["1 nova komento","{unread} novaj komentoj"],
    "Comment" : "Komento",
-    "You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Vi estis menciita en „{file}“, en komento de uzanto, kiu poste estis forigita",
-    "{user} mentioned you in a comment on “{file}”" : "{user} menciis vin en komento pri „{file}“"
+    "%1$s commented" : "%1$s komentis"
 },
 "nplurals=2; plural=(n != 1);");
@@ -1,7 +1,6 @@
 { "translations": {
    "Comments" : "Komentoj",
    "You commented" : "Vi komentis",
-    "%1$s commented" : "%1$s komentis",
    "{author} commented" : "{author} komentis",
    "You commented on %1$s" : "Vi komentis %1$s",
    "You commented on {file}" : "Vi komentis pri {file}",
@@ -16,7 +15,6 @@
    "_%n unread comment_::_%n unread comments_" : ["%n nelegataj komentoj","%n nelegataj komentoj"],
    "_1 new comment_::_{unread} new comments_" : ["1 nova komento","{unread} novaj komentoj"],
    "Comment" : "Komento",
-    "You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Vi estis menciita en „{file}“, en komento de uzanto, kiu poste estis forigita",
-    "{user} mentioned you in a comment on “{file}”" : "{user} menciis vin en komento pri „{file}“"
+    "%1$s commented" : "%1$s komentis"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
@@ -3,7 +3,6 @@ OC.L10N.register(
    {
    "Comments" : "Comentarios",
    "You commented" : "Has comentado",
-    "%1$s commented" : "%1$s comentados",
    "{author} commented" : "{author} comentó",
    "You commented on %1$s" : "Has comentado en %1$s",
    "You commented on {file}" : "Has comentado en  {file}",
@@ -28,7 +27,6 @@ OC.L10N.register(
    "Comment deleted" : "Comentario borrado",
    "An error occurred while trying to delete the comment" : "Ocurrió un error intentando borrar el comentario",
    "An error occurred while trying to create the comment" : "Ocurrió un error intentando crear el comentario",
-    "You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Te han mencionado en \"{file}\", en un comentario de un usuario que después ha sido eliminado",
-    "{user} mentioned you in a comment on “{file}”" : "{user} te mencionó en un comentario en “{file}”"
+    "%1$s commented" : "%1$s comentados"
 },
 "nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;");
@@ -1,7 +1,6 @@
 { "translations": {
    "Comments" : "Comentarios",
    "You commented" : "Has comentado",
-    "%1$s commented" : "%1$s comentados",
    "{author} commented" : "{author} comentó",
    "You commented on %1$s" : "Has comentado en %1$s",
    "You commented on {file}" : "Has comentado en  {file}",
@@ -26,7 +25,6 @@
    "Comment deleted" : "Comentario borrado",
    "An error occurred while trying to delete the comment" : "Ocurrió un error intentando borrar el comentario",
    "An error occurred while trying to create the comment" : "Ocurrió un error intentando crear el comentario",
-    "You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Te han mencionado en \"{file}\", en un comentario de un usuario que después ha sido eliminado",
-    "{user} mentioned you in a comment on “{file}”" : "{user} te mencionó en un comentario en “{file}”"
+    "%1$s commented" : "%1$s comentados"
 },"pluralForm" :"nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;"
 }
@@ -3,7 +3,6 @@ OC.L10N.register(
    {
    "Comments" : "Comentarios",
    "You commented" : "Comentaste",
-    "%1$s commented" : "%1$s comentó",
    "{author} commented" : "{author} comentó",
    "You commented on %1$s" : "Usted comentó en %1$s",
    "You commented on {file}" : "Hiciste un comentario de {file}",
@@ -16,7 +15,6 @@ OC.L10N.register(
    "Retry" : "Reintentar",
    "_%n unread comment_::_%n unread comments_" : ["%n comentarios sin leer","%n comentarios sin leer","%n comentarios sin leer"],
    "Comment" : "Comentario",
-    "You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Te mencionaron en \"{file}\", en un comentario de un usuario que ya ha sido borrado",
-    "{user} mentioned you in a comment on “{file}”" : "{user} te mencionó en un comentario en “{file}”"
+    "%1$s commented" : "%1$s comentó"
 },
 "nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;");
@@ -1,7 +1,6 @@
 { "translations": {
    "Comments" : "Comentarios",
    "You commented" : "Comentaste",
-    "%1$s commented" : "%1$s comentó",
    "{author} commented" : "{author} comentó",
    "You commented on %1$s" : "Usted comentó en %1$s",
    "You commented on {file}" : "Hiciste un comentario de {file}",
@@ -14,7 +13,6 @@
    "Retry" : "Reintentar",
    "_%n unread comment_::_%n unread comments_" : ["%n comentarios sin leer","%n comentarios sin leer","%n comentarios sin leer"],
    "Comment" : "Comentario",
-    "You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Te mencionaron en \"{file}\", en un comentario de un usuario que ya ha sido borrado",
-    "{user} mentioned you in a comment on “{file}”" : "{user} te mencionó en un comentario en “{file}”"
+    "%1$s commented" : "%1$s comentó"
 },"pluralForm" :"nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;"
 }
@@ -3,7 +3,6 @@ OC.L10N.register(
    {
    "Comments" : "Comentarios",
    "You commented" : "Ud. ha comentado",
-    "%1$s commented" : "%1$s comentados",
    "{author} commented" : "{author} comentó",
    "You commented on %1$s" : "Ud. ah comentado en %1$s",
    "You commented on {file}" : "Ud. ha comentado en {file}",
@@ -17,7 +16,6 @@ OC.L10N.register(
    "Retry" : "Reintentar",
    "_%n unread comment_::_%n unread comments_" : ["%n comentarios sin leer","%n comentarios sin leer","%n comentarios sin leer"],
    "Comment" : "Comentar",
-    "You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Usted fue mencionado en “{file}”, en un comentario de un usuario que ya ha sido eliminado",
-    "{user} mentioned you in a comment on “{file}”" : "{user} te ha mencionado en un comentario en “{file}”"
+    "%1$s commented" : "%1$s comentados"
 },
 "nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;");
@@ -1,7 +1,6 @@
 { "translations": {
    "Comments" : "Comentarios",
    "You commented" : "Ud. ha comentado",
-    "%1$s commented" : "%1$s comentados",
    "{author} commented" : "{author} comentó",
    "You commented on %1$s" : "Ud. ah comentado en %1$s",
    "You commented on {file}" : "Ud. ha comentado en {file}",
@@ -15,7 +14,6 @@
    "Retry" : "Reintentar",
    "_%n unread comment_::_%n unread comments_" : ["%n comentarios sin leer","%n comentarios sin leer","%n comentarios sin leer"],
    "Comment" : "Comentar",
-    "You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Usted fue mencionado en “{file}”, en un comentario de un usuario que ya ha sido eliminado",
-    "{user} mentioned you in a comment on “{file}”" : "{user} te ha mencionado en un comentario en “{file}”"
+    "%1$s commented" : "%1$s comentados"
 },"pluralForm" :"nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;"
 }
--- a/Show More
+++ b/Show More