Merge pull request #23989 from nextcloud/version/20.0.2/rc1

20.0.2 RC1

.drone.yml

@@ -1,4 +1,27 @@
 kind: pipeline
+name: jsunit
+
+steps:
+- name: jsunit
+  image: nextcloudci/jsunit:jsunit-5
+  environment:
+      CODECOV_TOKEN:
+          from_secret: CODECOV_TOKEN
+  commands:
+    - ./autotest-js.sh
+    - curl -o codecov.sh https://codecov.io/bash
+    - bash codecov.sh -C $DRONE_COMMIT
+
+trigger:
+  branch:
+    - master
+    - stable*
+  event:
+    - pull_request
+    - push
+
+---
+kind: pipeline
 name: checkers
 
 steps:
@@ -7,7 +30,7 @@ steps:
   commands:
     - git submodule update --init
 - name: checkers
-  image: nextcloudci/php7.3:php7.3-5
+  image: nextcloudci/php7.2:php7.2-13
   commands:
     - ./autotest-checkers.sh
   secrets: [ github_token ]
@@ -223,18 +246,18 @@ steps:
   image: docker:git
   commands:
     - git submodule update --init
+- name: nodb-php7.2
+  image: nextcloudci/php7.2:latest
+  commands:
+    - bash tests/drone-run-php-tests.sh || exit 0
+    - NOCOVERAGE=true TEST_SELECTION=NODB ./autotest.sh sqlite
 - name: nodb-php7.3
-  image: nextcloudci/php7.3:php7.3-5
+  image: nextcloudci/php7.3:latest
   commands:
     - bash tests/drone-run-php-tests.sh || exit 0
     - NOCOVERAGE=true TEST_SELECTION=NODB ./autotest.sh sqlite
 - name: nodb-php7.4
-  image: nextcloudci/php7.4:php7.4-3
-  commands:
-    - bash tests/drone-run-php-tests.sh || exit 0
-    - NOCOVERAGE=true TEST_SELECTION=NODB ./autotest.sh sqlite
-- name: nodb-php8.0
-  image: nextcloudci/php8.0:latest
+  image: nextcloudci/php7.4:latest
   commands:
     - bash tests/drone-run-php-tests.sh || exit 0
     - NOCOVERAGE=true TEST_SELECTION=NODB ./autotest.sh sqlite
@@ -260,18 +283,18 @@ steps:
   image: docker:git
   commands:
     - git submodule update --init
+- name: sqlite-php7.2
+  image: nextcloudci/php7.2:php7.2-13
+  commands:
+    - bash tests/drone-run-php-tests.sh || exit 0
+    - NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh sqlite
 - name: sqlite-php7.3
-  image: nextcloudci/php7.3:php7.3-5
+  image: nextcloudci/php7.3:php7.3-4
   commands:
     - bash tests/drone-run-php-tests.sh || exit 0
     - NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh sqlite
 - name: sqlite-php7.4
-  image: nextcloudci/php7.4:php7.4-3
-  commands:
-    - bash tests/drone-run-php-tests.sh || exit 0
-    - NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh sqlite
-- name: sqlite-php8.0
-  image: nextcloudci/php8.0:latest
+  image: nextcloudci/php7.4:2
   commands:
     - bash tests/drone-run-php-tests.sh || exit 0
     - NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh sqlite
@@ -290,15 +313,15 @@ trigger:
 
 ---
 kind: pipeline
-name: mariadb10.1-php7.3
+name: mariadb10.1-php7.2
 
 steps:
 - name: submodules
   image: docker:git
   commands:
     - git submodule update --init
-- name: mariadb10.1-php7.3
-  image: nextcloudci/php7.3:php7.3-5
+- name: mariadb10.1-php7.2
+  image: nextcloudci/php7.2:php7.2-13
   commands:
     - bash tests/drone-run-php-tests.sh || exit 0
     - NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh mariadb
@@ -326,15 +349,15 @@ trigger:
 
 ---
 kind: pipeline
-name: mariadb10.2-php7.3
+name: mariadb10.2-php7.2
 
 steps:
 - name: submodules
   image: docker:git
   commands:
     - git submodule update --init
-- name: mariadb10.2-php7.3
-  image: nextcloudci/php7.3:php7.3-5
+- name: mariadb10.2-php7.2
+  image: nextcloudci/php7.2:php7.2-13
   commands:
     - bash tests/drone-run-php-tests.sh || exit 0
     - NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh mariadb
@@ -361,15 +384,15 @@ trigger:
 
 ---
 kind: pipeline
-name: mariadb10.3-php7.3
+name: mariadb10.3-php7.2
 
 steps:
 - name: submodules
   image: docker:git
   commands:
     - git submodule update --init
-- name: mariadb10.3-php7.3
-  image: nextcloudci/php7.3:php7.3-5
+- name: mariadb10.3-php7.2
+  image: nextcloudci/php7.2:php7.2-13
   commands:
     - bash tests/drone-run-php-tests.sh || exit 0
     - NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh mariadb
@@ -396,24 +419,18 @@ trigger:
 
 ---
 kind: pipeline
-name: mariadb10.4-php7.4
-#name: mariadb10.4-php8.0
+name: mariadb10.4-php7.3
 
 steps:
 - name: submodules
   image: docker:git
   commands:
     - git submodule update --init
-- name: mariadb10.4-php7.4
-  image: nextcloudci/php7.4:php7.4-3
+- name: mariadb10.4-php7.3
+  image: nextcloudci/php7.3:php7.3-4
   commands:
     - bash tests/drone-run-php-tests.sh || exit 0
     - NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh mariadb
-#- name: mariadb10.4-php8.0
-#  image: nextcloudci/php8.0:latest
-#  commands:
-#    - bash tests/drone-run-php-tests.sh || exit 0
-#    - NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh mariadb
 
 services:
 - name: cache
@@ -438,15 +455,15 @@ trigger:
 
 ---
 kind: pipeline
-name: mysql8.0-php7.4
+name: mysql8.0-php7.2
 
 steps:
 - name: submodules
   image: docker:git
   commands:
     - git submodule update --init
-- name: mysql-php7.4
-  image: nextcloudci/php7.4:php7.4-3
+- name: mysql-php7.2
+  image: nextcloudci/php7.2:php7.2-13
   commands:
     - bash tests/drone-run-php-tests.sh || exit 0
     - NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh mysql
@@ -475,7 +492,108 @@ trigger:
 
 ---
 kind: pipeline
-name: postgres9.6-php7.3
+name: mysql5.7-php7.2
+
+steps:
+- name: submodules
+  image: docker:git
+  commands:
+    - git submodule update --init
+- name: mysql-php7.2
+  image: nextcloudci/php7.2:php7.2-13
+  commands:
+    - bash tests/drone-run-php-tests.sh || exit 0
+    - NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh mysql
+
+services:
+- name: mysql
+  image: mysql:5.7
+  environment:
+    MYSQL_ROOT_PASSWORD: owncloud
+    MYSQL_USER: oc_autotest
+    MYSQL_PASSWORD: owncloud
+    MYSQL_DATABASE: oc_autotest
+  tmpfs:
+    - /var/lib/mysql
+
+trigger:
+  branch:
+    - master
+    - stable*
+  event:
+    - push
+
+---
+kind: pipeline
+name: mysql5.7-php7.3
+
+steps:
+- name: submodules
+  image: docker:git
+  commands:
+    - git submodule update --init
+- name: mysql-php7.3
+  image: nextcloudci/php7.3:php7.3-4
+  commands:
+    - bash tests/drone-run-php-tests.sh || exit 0
+    - NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh mysql
+
+services:
+- name: mysql
+  image: mysql:5.7
+  environment:
+    MYSQL_ROOT_PASSWORD: owncloud
+    MYSQL_USER: oc_autotest
+    MYSQL_PASSWORD: owncloud
+    MYSQL_DATABASE: oc_autotest
+  tmpfs:
+    - /var/lib/mysql
+
+trigger:
+  branch:
+    - master
+    - stable*
+  event:
+    - push
+
+---
+kind: pipeline
+name: mysql5.6-php7.2
+
+steps:
+- name: submodules
+  image: docker:git
+  commands:
+    - git submodule update --init
+- name: mysql5.6-php7.2
+  image: nextcloudci/php7.2:php7.2-13
+  commands:
+    - bash tests/drone-run-php-tests.sh || exit 0
+    - NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh mysql
+
+services:
+- name: cache
+  image: redis
+- name: mysql
+  image: mysql:5.6
+  environment:
+    MYSQL_ROOT_PASSWORD: owncloud
+    MYSQL_USER: oc_autotest
+    MYSQL_PASSWORD: owncloud
+    MYSQL_DATABASE: oc_autotest
+  tmpfs:
+    - /var/lib/mysql
+trigger:
+  branch:
+    - master
+    - stable*
+  event:
+    - pull_request
+    - push
+
+---
+kind: pipeline
+name: postgres9-php7.3
 
 steps:
 - name: submodules
@@ -483,7 +601,7 @@ steps:
   commands:
     - git submodule update --init
 - name: postgres-php7.3
-  image: nextcloudci/php7.3:php7.3-5
+  image: nextcloudci/php7.3:php7.3-4
   commands:
     - bash tests/drone-run-php-tests.sh || exit 0
     - sleep 10 # gives the database enough time to initialize
@@ -493,7 +611,7 @@ services:
 - name: cache
   image: redis
 - name: postgres-9
-  image: postgres:9.6
+  image: postgres:9
   environment:
     POSTGRES_USER: oc_autotest
     POSTGRES_DB: oc_autotest_dummy
@@ -511,15 +629,15 @@ trigger:
 
 ---
 kind: pipeline
-name: postgres10-php7.3
+name: postgres10-php7.2
 
 steps:
 - name: submodules
   image: docker:git
   commands:
     - git submodule update --init
-- name: postgres-php7.3
-  image: nextcloudci/php7.3:php7.3-5
+- name: postgres-php7.2
+  image: nextcloudci/php7.2:php7.2-13
   commands:
     - bash tests/drone-run-php-tests.sh || exit 0
     - sleep 10 # gives the database enough time to initialize
@@ -546,15 +664,15 @@ trigger:
 
 ---
 kind: pipeline
-name: postgres11-php7.4
+name: postgres11-php7.2
 
 steps:
 - name: submodules
   image: docker:git
   commands:
     - git submodule update --init
-- name: postgres-php7.4
-  image: nextcloudci/php7.4:php7.4-3
+- name: postgres-php7.2
+  image: nextcloudci/php7.2:php7.2-13
   commands:
     - bash tests/drone-run-php-tests.sh || exit 0
     - sleep 10 # gives the database enough time to initialize
@@ -582,95 +700,18 @@ trigger:
 
 ---
 kind: pipeline
-name: postgres12-php7.4
+name: mysqlmb4-php7.2
 
 steps:
 - name: submodules
   image: docker:git
   commands:
     - git submodule update --init
-- name: postgres-php7.4
-  image: nextcloudci/php7.4:php7.4-3
-  commands:
-    - bash tests/drone-run-php-tests.sh || exit 0
-    - sleep 10 # gives the database enough time to initialize
-    - POSTGRES=12 NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh pgsql
-
-services:
-- name: cache
-  image: redis
-- name: postgres-12
-  image: postgres:12
-  environment:
-    POSTGRES_USER: oc_autotest
-    POSTGRES_DB: oc_autotest_dummy
-    POSTGRES_PASSWORD: owncloud
-  tmpfs:
-    - /var/lib/postgresql/data
-
-trigger:
-  branch:
-    - master
-    - stable*
-  event:
-    - pull_request
-    - push
-
----
-kind: pipeline
-name: postgres13-php7.4
-
-steps:
-- name: submodules
-  image: docker:git
-  commands:
-    - git submodule update --init
-- name: postgres-php7.4
-  image: nextcloudci/php7.4:php7.4-3
-  commands:
-    - bash tests/drone-run-php-tests.sh || exit 0
-    - sleep 10 # gives the database enough time to initialize
-    - POSTGRES=13 NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh pgsql
-
-services:
-- name: cache
-  image: redis
-- name: postgres-13
-  image: postgres:13
-  environment:
-    POSTGRES_USER: oc_autotest
-    POSTGRES_DB: oc_autotest_dummy
-    POSTGRES_PASSWORD: owncloud
-  tmpfs:
-    - /var/lib/postgresql/data
-
-trigger:
-  branch:
-    - master
-    - stable*
-  event:
-    - pull_request
-    - push
----
-kind: pipeline
-name: mysqlmb4-php7.4
-#name: mysqlmb4-php8.0
-
-steps:
-- name: submodules
-  image: docker:git
-  commands:
-    - git submodule update --init
-- name: mysqlmb4-php7.4
-  image: nextcloudci/php7.4:php7.4-3
+- name: mysqlmb4-php7.2
+  image: nextcloudci/php7.2:php7.2-13
   commands:
     - bash tests/drone-run-php-tests.sh || exit 0
     - NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh mysqlmb4
-#- name: mysqlmb4-php8.0
-#  image: nextcloudci/php8.0:latest
-#  commands:
-#    - bash tests/drone-run-php-tests.sh || exit 0
-#    - NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh mysqlmb4
 
 services:
 - name: cache
@@ -703,7 +744,7 @@ steps:
   commands:
     - git submodule update --init
 - name: mysqlmb4-php7.3
-  image: nextcloudci/php7.3:php7.3-5
+  image: nextcloudci/php7.3:php7.3-4
   commands:
     - bash tests/drone-run-php-tests.sh || exit 0
     - NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh mysqlmb4
@@ -804,31 +845,6 @@ trigger:
     - pull_request
     - push
 
----
-kind: pipeline
-name: integration-avatar
-
-steps:
-- name: submodules
-  image: docker:git
-  commands:
-    - git submodule update --init
-- name: integration-avatar
-  image: nextcloudci/integration-php7.3:integration-php7.3-2
-  commands:
-    - bash tests/drone-run-integration-tests.sh || exit 0
-    - ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
-    - cd build/integration
-    - ./run.sh features/avatar.feature
-
-trigger:
-  branch:
-    - master
-    - stable*
-  event:
-    - pull_request
-    - push
-
 ---
 kind: pipeline
 name: integration-maintenance-mode
@@ -1353,7 +1369,7 @@ steps:
   commands:
     # 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 --branch stable20 --depth 1 https://github.com/nextcloud/spreed apps/spreed
 - name: integration-sharing-v1-video-verification
   image: nextcloudci/integration-php7.3:integration-php7.3-2
   commands:
@@ -1510,6 +1526,48 @@ trigger:
     - pull_request
     - push
 
+---
+kind: pipeline
+name: integration-ldap-openldap-uid-features-php54-api
+
+steps:
+- name: submodules
+  image: docker:git
+  commands:
+    - git submodule update --init
+- name: integration-ldap-openldap-uid-features
+  image: nextcloudci/integration-php7.2:integration-php7.2-1
+  commands:
+    - bash tests/drone-run-integration-tests.sh || exit 0
+    - ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
+    - ./occ config:system:set redis host --value=cache
+    - ./occ config:system:set redis port --value=6379 --type=integer
+    - ./occ config:system:set redis timeout --value=0 --type=integer
+    - ./occ config:system:set --type string --value "\\OC\\Memcache\\Redis" memcache.local
+    - ./occ config:system:set --type string --value "\\OC\\Memcache\\Redis" memcache.distributed
+    - cd build/integration
+    - ./run.sh ldap_features/openldap-uid-username.feature
+
+services:
+- name: cache
+  image: redis
+- name: openldap
+  image: nextcloudci/openldap:openldap-7
+  environment:
+    SLAPD_DOMAIN: nextcloud.ci
+    SLAPD_ORGANIZATION: Nextcloud
+    SLAPD_PASSWORD: admin
+    SLAPD_ADDITIONAL_MODULES: memberof
+
+trigger:
+  branch:
+    - master
+    - stable*
+  event:
+    - pull_request
+    - push
+type: docker
+
 ---
 kind: pipeline
 name: integration-ldap-openldap-uid-features
@@ -2008,7 +2066,7 @@ steps:
   commands:
     - git submodule update --init
 - name: nodb-codecov
-  image: nextcloudci/php7.4:php7.4-3
+  image: nextcloudci/php7.4:latest
   environment:
       CODECOV_TOKEN:
           from_secret: CODECOV_TOKEN
@@ -2039,7 +2097,7 @@ steps:
   commands:
     - git submodule update --init
 - name: db-codecov
-  image: nextcloudci/php7.4:php7.4-3
+  image: nextcloudci/php7.4:latest
   environment:
       CODECOV_TOKEN:
           from_secret: CODECOV_TOKEN
@@ -2070,7 +2128,7 @@ steps:
   commands:
     - git submodule update --init
 - name: object-store
-  image: nextcloudci/php7.4:php7.4-3
+  image: nextcloudci/php7.4:latest
   environment:
       CODECOV_TOKEN:
           from_secret: CODECOV_TOKEN
@@ -2103,7 +2161,7 @@ steps:
   commands:
     - git submodule update --init
 - name: object-store
-  image: nextcloudci/php7.4:php7.4-3
+  image: nextcloudci/php7.4:latest
   environment:
       CODECOV_TOKEN:
           from_secret: CODECOV_TOKEN
@@ -2237,7 +2295,7 @@ trigger:
 #  commands:
 #    - git submodule update --init
 #- name: memcache-redis-cluster
-#  image: nextcloudci/php7.3:php7.3-5
+#  image: nextcloudci/php7.2:php7.2-13
 #  commands:
 #    - phpenmod xdebug
 #    - sleep 20
@@ -2257,3 +2315,4 @@ trigger:
 #  event:
 #    - pull_request
 #    - push
+

.github/workflows/lint.yml

@@ -6,7 +6,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        php-versions: ['7.3', '7.4', '8.0']
+        php-versions: ['7.2', '7.3', 7.4]
     name: php${{ matrix.php-versions }} lint
     steps:
     - name: Checkout
@@ -37,4 +37,4 @@ jobs:
       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
+      shell: bash {0}

.github/workflows/node.yml

@@ -24,7 +24,6 @@ jobs:
         node-version: ${{ matrix.node-version }}
     - name: Install dependencies & build
       run: |
-        make clean
         npm ci
         npm run build --if-present
     - name: Check webpack build changes
@@ -50,17 +49,6 @@ jobs:
     - name: Test
       run: npm run test
 
-  jsunit:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v2
-    - name: Use node ${{ matrix.node-version }}
-      uses: actions/setup-node@v1
-      with:
-          node-version: ${{ matrix.node-version }}
-    - name: Test
-      run: ./autotest-js.sh
-
   handlebars:
     runs-on: ubuntu-latest
     strategy:

.github/workflows/psalm-security.yml

@@ -1,26 +0,0 @@
-name: Psalm Security Analysis
-
-on:
-  push:
-  pull_request:
-  schedule:
-  - cron: '0 0 * * 0'
-
-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
-        with:
-          security_analysis: true
-          report_file: results.sarif
-      - name: Upload Security Analysis results to GitHub
-        uses: github/codeql-action/upload-sarif@v1
-        with:
-          sarif_file: results.sarif

.github/workflows/static-code-analysis.yml

@@ -27,28 +27,3 @@ jobs:
             - 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-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
-                coverage: none
-            - name: Composer install
-              run: composer i
-            - name: Psalm
-              run: composer run psalm -- -c psalm-ocp.xml --monochrome --no-progress --output-format=text --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)"

.github/workflows/update-psalm-baseline.yml

@@ -15,19 +15,16 @@ jobs:
           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
-          coverage: none
-      - name: Composer install
-        run: composer i
+      - name: Remove composer.json
+        shell: bash
+        run: rm composer.json composer.lock
       - name: Psalm
-        run: composer run psalm -- --monochrome --no-progress --output-format=text --update-baseline
+        uses: docker://jakzal/phpqa:php7.4-alpine
+        with:
+          args: psalm --monochrome --no-progress --output-format=text --update-baseline
       - name: Reset composer.json and composer.lock
         run: |
-          rm -rf lib/composer
-          git checkout -- composer.json composer.lock lib/composer
+          git checkout -- composer.json composer.lock
       - name: Create Pull Request
         uses: peter-evans/create-pull-request@v3
         with:

.gitignore

@@ -156,6 +156,5 @@ Vagrantfile
 clover.xml
 
 # Tests - dependencies
+tests/acceptance/composer.lock
 tests/acceptance/vendor/
-
-composer.phar

.htaccess

@@ -61,12 +61,16 @@
   RewriteCond %{HTTP_USER_AGENT} DavClnt
   RewriteRule ^$ /remote.php/webdav/ [L,R=302]
   RewriteRule .* - [env=HTTP_AUTHORIZATION:%{HTTP:Authorization}]
+  RewriteRule ^\.well-known/host-meta /public.php?service=host-meta [QSA,L]
+  RewriteRule ^\.well-known/host-meta\.json /public.php?service=host-meta-json [QSA,L]
+  RewriteRule ^\.well-known/webfinger /public.php?service=webfinger [QSA,L]
+  RewriteRule ^\.well-known/nodeinfo /public.php?service=nodeinfo [QSA,L]
   RewriteRule ^\.well-known/carddav /remote.php/dav/ [R=301,L]
   RewriteRule ^\.well-known/caldav /remote.php/dav/ [R=301,L]
   RewriteRule ^remote/(.*) remote.php [QSA,L]
   RewriteRule ^(?:build|tests|config|lib|3rdparty|templates)/.* - [R=404,L]
-  RewriteRule ^\.well-known/(?!acme-challenge|pki-validation) /index.php [QSA,L]
-  RewriteRule ^(?:\.(?!well-known)|autotest|occ|issue|indie|db_|console).* - [R=404,L]
+  RewriteCond %{REQUEST_URI} !^/\.well-known/(acme-challenge|pki-validation)/.*
+  RewriteRule ^(?:\.|autotest|occ|issue|indie|db_|console).* - [R=404,L]
 </IfModule>
 <IfModule mod_mime.c>
   AddType image/svg+xml svg svgz

.mailmap

@@ -164,7 +164,6 @@ ideaship <ideaship@users.noreply.github.com>
 Ignacio Daniel Rostagno <ignaciorostagno@vijona.com.ar>
 infoneo <infoneo@yahoo.pl>
 Insanemal <insanemal@gmail.com>
-Tobias Perschon <tobias@perschon.at> Tobias Perschon <tofuSCHNITZEL@users.noreply.github.com>
 Tobias Ramforth <tobias@ramforth.com> Tobias Ramforth <tobias.ramforth@udo.edu>
 Tobias Ramforth <tobias@ramforth.com> irgsmirx <tobias.ramforth@udo.edu>
 Isaac Rosenberg <irosenb7@gmail.com>
@@ -382,7 +381,6 @@ TheSFReader <TheSFReader@gmail.com>
 Thibaut GRIDEL <tgridel@free.fr>
 thomas <thomas@thomas-VirtualBox.(none)>
 Thomas Citharel <nextcloud@tcit.fr> Thomas Citharel <tcit@tcit.fr>
-Thomas Citharel <nextcloud@tcit.fr> Thomas Citharel <github@tcit.fr>
 Thomas Müller <thomas.mueller@tmit.eu> Thomas Mueller <thomas.mueller@tmit.eu>
 Thomas Müller <thomas.mueller@tmit.eu> Thomas Müller <DeepDiver1975@users.noreply.github.com>
 Thomas Olsen <tol@tanghus>
@@ -408,9 +406,8 @@ Victor Dubiniuk <dubiniuk@owncloud.com> Victor Dubiniuk <victor.dubiniuk@gmail.c
 Victor Dubiniuk <dubiniuk@owncloud.com> VicDeo <dubiniuk@owncloud.com>
 Victor Dubiniuk <dubiniuk@owncloud.com> VicDeo <victor.dubiniuk@gmail.com>
 Vincent Cloutier <vincent1cloutier@gmail.com>
-Vincent Petry <vincent@nextcloud.com> Vincent Petry <PVince81@yahoo.fr>
-Vincent Petry <vincent@nextcloud.com> Vincent Petry <vincent@vvortex.site>
-Vincent Petry <vincent@nextcloud.com> Vincent Petry <pvince81@owncloud.com>
+Vincent Petry <pvince81@owncloud.com> Vincent Petry <PVince81@yahoo.fr>
+Vincent Petry <pvince81@owncloud.com> Vincent Petry <vincent@vvortex.site>
 Vinicius Cubas Brand <vinicius@eita.org.br> Vinicius Cubas Brand <viniciuscb@gmail.com>
 Vitaly Kuznetsov <vitty@altlinux.ru>
 Vladimir Sapronov <vladimir.sapronov@gmail.com>

AUTHORS

@@ -24,7 +24,6 @@ Nextcloud is written by:
  - Artem Kochnev <MrJeos@gmail.com>
  - Artem Sidorenko <artem@posteo.de>
  - Arthur Schiwon <blizzz@arthur-schiwon.de>
- - Ashod Nakashian <ashod.nakashian@collabora.co.uk>
  - Axel Helmert <axel.helmert@luka.de>
  - Bart Visscher <bartv@thisnet.nl>
  - Bartek Przybylski <bart.p.pl@gmail.com>
@@ -48,7 +47,6 @@ Nextcloud is written by:
  - Byron Marohn <combustible@live.com>
  - Carla Schroder <carla@owncloud.com>
  - Carlos Cerrillo <ccerrillo@gmail.com>
- - Carlos Ferreira <carlos@reendex.com>
  - Carsten Wiedmann <carsten_sttgt@gmx.de>
  - Christian <16852529+cviereck@users.noreply.github.com>
  - Christian Berendt <berendt@b1-systems.de>
@@ -83,6 +81,7 @@ Nextcloud is written by:
  - Donquixote <marjunebatac@gmail.com>
  - Elijah Martin-Merrill <elijah@nyp-itsours.com>
  - Eric Masseran <rico.masseran@gmail.com>
+ - Estelle Poulin <dev@inspiredby.es>
  - Evgeny Golyshev <eugulixes@gmail.com>
  - Fabrizio Steiner <fabrizio.steiner@gmail.com>
  - Felix Epp <work@felixepp.de>
@@ -106,13 +105,11 @@ Nextcloud is written by:
  - Greta Doci <gretadoci@gmail.com>
  - GretaD <gretadoci@gmail.com>
  - Guillaume COMPAGNON <gcompagnon@outlook.com>
- - Guillaume Virlet <github@virlet.org>
  - Hemanth Kumar Veeranki <hems.india1997@gmail.com>
  - Hendrik Leppelsack <hendrik@leppelsack.de>
  - Holger Hees <holger.hees@gmail.com>
  - Ilja Neumann <ineumann@owncloud.com>
  - Individual IT Services <info@individual-it.net>
- - Iscle <albertiscle9@gmail.com>
  - J0WI <J0WI@users.noreply.github.com>
  - Jaakko Salo <jaakkos@gmail.com>
  - Jacob Neplokh <me@jacobneplokh.com>
@@ -133,7 +130,6 @@ Nextcloud is written by:
  - Joel S <joel.devbox@protonmail.com>
  - Johan Björk <johanimon@gmail.com>
  - Johannes Ernst <jernst@indiecomputing.com>
- - Johannes Leuker <j.leuker@hosting.de>
  - Johannes Riedel <joeried@users.noreply.github.com>
  - Johannes Schlichenmaier <johannes@schlichenmaier.info>
  - Johannes Willnecker <johannes@willnecker.com>
@@ -210,6 +206,7 @@ Nextcloud is written by:
  - Michael Kuhn <michael@ikkoku.de>
  - Michael Letzgus <www@chronos.michael-letzgus.de>
  - Michael Roitzsch <reactorcontrol@icloud.com>
+ - Michael Roth <michael.roth@rz.uni-augsburg.de>
  - Michael Weimann <mail@michael-weimann.eu>
  - Michael Zamot <michael@zamot.io>
  - Michał Węgrzynek <michal.wegrzynek@malloc.com.pl>
@@ -228,6 +225,7 @@ Nextcloud is written by:
  - Ole Ostergaard <ole.ostergaard@knime.com>
  - Oliver Gasser <oliver.gasser@gmail.com>
  - Oliver Kohl D.Sc. <oliver@kohl.bz>
+ - Oliver Salzburg <oliver.salzburg@gmail.com>
  - Oliver Wegner <void1976@gmail.com>
  - Olivier Paroz <github@oparoz.com>
  - Owen Winkler <a_github@midnightcircus.com>
@@ -258,13 +256,11 @@ Nextcloud is written by:
  - RealRancor <fisch.666@gmx.de>
  - Rello <Rello@users.noreply.github.com>
  - Remco Brenninkmeijer <requist1@starmail.nl>
- - Richard Steinmetz <richard@steinmetz.cloud>
  - Rinat Gumirov <rinat.gumirov@mail.ru>
  - Robert Dailey <rcdailey@gmail.com>
  - Robin Appelman <robin@icewind.nl>
  - Robin McCorkell <robin@mccorkell.me.uk>
  - Robin Müller <coder-hugo@users.noreply.github.com>
- - Robin Windey <ro.windey@gmail.com>
  - Roeland Jago Douma <roeland@famdouma.nl>
  - Roger Szabo <roger.szabo@web.de>
  - Roland Tapken <roland@bitarbeiter.net>
@@ -314,7 +310,6 @@ Nextcloud is written by:
  - Stephen Cuppett <steve@cuppett.com>
  - Steven Bühner <buehner@me.com>
  - Sujith H <sharidasan@owncloud.com>
- - Sujith Haridasan <sujith.h@gmail.com>
  - Sven Strickroth <email@cs-ware.de>
  - Sylvia van Os <sylvia@hackerchick.me>
  - Tekhnee <info@tekhnee.org>
@@ -344,7 +339,7 @@ Nextcloud is written by:
  - Victor Dubiniuk <dubiniuk@owncloud.com>
  - Viktor Szépe <viktor@szepe.net>
  - Vincent Chan <plus.vincchan@gmail.com>
- - Vincent Petry <vincent@nextcloud.com>
+ - Vincent Petry <pvince81@owncloud.com>
  - Vinicius Cubas Brand <vinicius@eita.org.br>
  - Vitor Mattos <vitor@php.rio>
  - Vlastimil Pecinka <pecinka@email.cz>
@@ -354,7 +349,6 @@ Nextcloud is written by:
  - Xheni Myrtaj <myrtajxheni@gmail.com>
  - Xuanwo <xuanwo@yunify.com>
  - adrien <adrien.waksberg@believedigital.com>
- - aler9 <46489434+aler9@users.noreply.github.com>
  - alexweirig <alex.weirig@technolink.lu>
  - b108@volgograd "b108@volgograd"
  - bladewing <lukas@ifflaender-family.de>
@@ -362,7 +356,6 @@ Nextcloud is written by:
  - blizzz <blizzz@arthur-schiwon.de>
  - brad2014 <brad2014@users.noreply.github.com>
  - brumsel <brumsel@losecatcher.de>
- - call-me-matt <nextcloud@matthiasheinisch.de>
  - cetra3 <peter@parashift.com.au>
  - cmeh <cmeh@users.noreply.github.com>
  - comradekingu <epost@anotheragency.no>
@@ -372,9 +365,7 @@ Nextcloud is written by:
  - derkostka <sebastian.kostka@gmail.com>
  - duritong <peter.meier+github@immerda.ch>
  - eduardo <eduardo@vnexu.net>
- - eleith <online+github@eleith.com>
  - enoch <lanxenet@hotmail.com>
- - essys <essys@users.noreply.github.com>
  - exner104 <59639860+exner104@users.noreply.github.com>
  - fabian <fabian@web2.0-apps.de>
  - felixboehm <felix@webhippie.de>
@@ -382,7 +373,6 @@ Nextcloud is written by:
  - fnuesse <fnuesse@techfak.uni-bielefeld.de>
  - helix84 <helix84@centrum.sk>
  - hkjolhede <hkjolhede@gmail.com>
- - hoellen <dev@hoellen.eu>
  - ideaship <ideaship@users.noreply.github.com>
  - j-ed <juergen@eisfair.org>
  - j3l11234 <297259024@qq.com>
@@ -390,28 +380,23 @@ Nextcloud is written by:
  - jknockaert <jasper@knockaert.nl>
  - josh4trunks <joshruehlig@gmail.com>
  - karakayasemi <karakayasemi@itu.edu.tr>
- - kevin147147 <kevintamool@gmail.com>
  - korelstar <korelstar@users.noreply.github.com>
- - leith abdulla <online-nextcloud@eleith.com>
  - lui87kw <lukas.ifflaender@uni-wuerzburg.de>
- - lynn-stephenson <lynn.stephenson@protonmail.com>
  - macjohnny <estebanmarin@gmx.ch>
  - marco44 <cousinmarc@gmail.com>
  - martin-rueegg <martin.rueegg@metaworx.ch>
  - martin.mattel@diemattels.at <martin.mattel@diemattels.at>
  - martink-p <47943787+martink-p@users.noreply.github.com>
- - matt <34400929+call-me-matt@users.noreply.github.com>
- - medcloud <42641918+medcloud@users.noreply.github.com>
  - michaelletzgus <michaelletzgus@users.noreply.github.com>
  - michag86 <micha_g@arcor.de>
  - mmccarn <mmccarn-github@mmsionline.us>
  - nhirokinet <nhirokinet@nhiroki.net>
- - nik gaffney <nik@fo.am>
  - nishiki <nishiki@yaegashi.fr>
  - onehappycat <one.happy.cat@gmx.com>
  - oparoz <owncloud@interfasys.ch>
  - phisch <git@philippschaffrath.de>
  - rakekniven <mark.ziegler@rakekniven.de>
+ - rawtaz <rawtaz@users.noreply.github.com>
  - root "root@oc.(none)"
  - root <root@localhost.localdomain>
  - rubo77 <github@r.z11.de>
@@ -423,7 +408,6 @@ Nextcloud is written by:
  - sualko <klaus@jsxc.org>
  - tbartenstein <tbartenstein@users.noreply.github.com>
  - tbelau666 <thomas.belau@gmx.de>
- - timm2k <timm2k@gmx.de>
  - tux-rampage <tux-rampage@users.noreply.github.com>
  - v1r0x <vinzenz.rosenkranz@gmail.com>
  - voxsim "Simon Vocella"

README.md

@@ -56,9 +56,8 @@ Several apps that are included by default in regular releases such as [First run
 
 Otherwise, git checkouts can be handled the same as release archives, by using the `stable*` branches. Note they should never be used on production systems.
 
-### Working with front-end code 🏗
 
-#### Building
+### Building front-end code 🏗
 
 We are moving more and more towards using Vue.js in the frontend, starting with Settings. For building the code on changes, use these terminal commands in the root folder:
 
@@ -76,8 +75,6 @@ make watch-js
 make build-js-production
 ```
 
-#### Commiting changes
-
 **When making changes, also commit the compiled files!**
 
 We still use Handlebars templates some places in Files and Settings. We will replace these step-by-step with Vue.js, but in the meantime you need to compile them separately.
@@ -92,29 +89,6 @@ Then inside the root folder of your local Nextcloud development installation, ru
 ./build/compile-handlebars-templates.sh
 ```
 
-Before checking in JS changes, make sure to also build for production:
-```
-make build-js-production
-```
-Then add the compiled files for committing.
-
-To save some time, to only rebuild for a specific app, use the following and replace the module with the app name:
-```
-MODULE=user_status make build-js-production
-```
-
-Please note that if you used `make build-js` or `make watch-js` before, you'll notice that a lot of files were marked as changed, so might need to clear the workspace first.
-
-### Working with back-end code 🏗
-
-When changing back-end PHP code, in general no additional steps are needed before checking in.
-
-However, if new files were created, you will need to run the following command to update the autoloader files:
-```bash
-build/autoloaderchecker.sh
-```
-
-After that, please also include the autoloader file changes in your commits.
 
 ### Tools we use 🛠
 

apps/accessibility/appinfo/info.xml

@@ -5,7 +5,7 @@
 	<name>Accessibility</name>
 	<summary>Accessibility options for nextcloud</summary>
 	<description><![CDATA[Provides multiple accessibilities options to ease your use of Nextcloud]]></description>
-	<version>1.7.0</version>
+	<version>1.6.0</version>
 	<licence>agpl</licence>
 	<author>John Molakvoæ</author>
 	<namespace>Accessibility</namespace>
@@ -16,7 +16,7 @@
 	<bugs>https://github.com/nextcloud/server/issues</bugs>
 
 	<dependencies>
-		<nextcloud min-version="21" max-version="21"/>
+		<nextcloud min-version="20" max-version="20"/>
 	</dependencies>
 
 	<repair-steps>

apps/accessibility/appinfo/routes.php

@@ -31,17 +31,17 @@ return [
 	'ocs' => [
 		[
 			'name' => 'Config#getConfig',
-			'url' => '/api/v1/config',
+			'url'  => '/api/v1/config',
 			'verb' => 'GET',
 		],
 		[
 			'name' => 'Config#setConfig',
-			'url' => '/api/v1/config/{key}',
+			'url'  => '/api/v1/config/{key}',
 			'verb' => 'PUT',
 		],
 		[
 			'name' => 'Config#deleteConfig',
-			'url' => '/api/v1/config/{key}',
+			'url'  => '/api/v1/config/{key}',
 			'verb' => 'DELETE',
 		],
 	]

apps/accessibility/composer/composer/ClassLoader.php

@@ -37,8 +37,8 @@ namespace Composer\Autoload;
  *
  * @author Fabien Potencier <fabien@symfony.com>
  * @author Jordi Boggiano <j.boggiano@seld.be>
- * @see    https://www.php-fig.org/psr/psr-0/
- * @see    https://www.php-fig.org/psr/psr-4/
+ * @see    http://www.php-fig.org/psr/psr-0/
+ * @see    http://www.php-fig.org/psr/psr-4/
  */
 class ClassLoader
 {

apps/accessibility/composer/composer/autoload_classmap.php

@@ -6,7 +6,6 @@ $vendorDir = dirname(dirname(__FILE__));
 $baseDir = $vendorDir;
 
 return array(
-    'Composer\\InstalledVersions' => $vendorDir . '/composer/InstalledVersions.php',
     'OCA\\Accessibility\\AccessibilityProvider' => $baseDir . '/../lib/AccessibilityProvider.php',
     'OCA\\Accessibility\\AppInfo\\Application' => $baseDir . '/../lib/AppInfo/Application.php',
     'OCA\\Accessibility\\Controller\\AccessibilityController' => $baseDir . '/../lib/Controller/AccessibilityController.php',

apps/accessibility/composer/composer/autoload_real.php

@@ -28,7 +28,7 @@ class ComposerAutoloaderInitAccessibility
 
         $useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION') && (!function_exists('zend_loader_file_encoded') || !zend_loader_file_encoded());
         if ($useStaticLoader) {
-            require __DIR__ . '/autoload_static.php';
+            require_once __DIR__ . '/autoload_static.php';
 
             call_user_func(\Composer\Autoload\ComposerStaticInitAccessibility::getInitializer($loader));
         } else {

apps/accessibility/composer/composer/autoload_static.php

@@ -21,7 +21,6 @@ class ComposerStaticInitAccessibility
     );
 
     public static $classMap = array (
-        'Composer\\InstalledVersions' => __DIR__ . '/..' . '/composer/InstalledVersions.php',
         'OCA\\Accessibility\\AccessibilityProvider' => __DIR__ . '/..' . '/../lib/AccessibilityProvider.php',
         'OCA\\Accessibility\\AppInfo\\Application' => __DIR__ . '/..' . '/../lib/AppInfo/Application.php',
         'OCA\\Accessibility\\Controller\\AccessibilityController' => __DIR__ . '/..' . '/../lib/Controller/AccessibilityController.php',

apps/accessibility/css/dark.scss

@@ -53,12 +53,11 @@ $color-border-dark: lighten($color-main-background, 14%);
 
 .bubble,
 .app-navigation-entry-menu,
-.popovermenu,
-.popover__menu {
+.popovermenu {
 	li {
 		> button,
 		> a,
-		> .menuitem, > .popover__menuitem {
+		> .menuitem {
 			> img {
 				filter: invert(100%);
 			}
@@ -72,22 +71,6 @@ $color-border-dark: lighten($color-main-background, 14%);
 	border: 1px solid var(--color-border);
 }
 
-.popover[x-placement^='top'] .popover__arrow {
-	border-top-color: var(--color-border);
-}
-.popover[x-placement^='bottom'] .popover__arrow {
-	border-bottom-color: var(--color-border);
-}
-.popover[x-placement^='left'] .popover__arrow {
-	border-left-color: var(--color-border);
-}
-.popover[x-placement^='right'] .popover__arrow {
-	border-right-color: var(--color-border);
-}
-.popover .popover__inner {
-	border: 1px solid var(--color-border);
-}
-
 // Prevent slideshow icons from going dark
 #slideshow {
 	[class^='icon-'], [class*=' icon-']{

apps/accessibility/l10n/de.js

@@ -6,7 +6,7 @@ OC.L10N.register(
     "A dark theme to ease your eyes by reducing the overall luminosity and brightness. It is still under development, so please report any issues you may find." : "Ein dunkles Design, das die Augen entspannt, indem es die allgemeine Lichtstärke und Helligkeit reduziert. Es befindet sich noch in der Entwicklung, also melde bitte alle Probleme, die Du findest.",
     "High contrast mode" : "Kontrastreicher Modus",
     "Enable high contrast mode" : "Kontrastreichen Modus aktivieren",
-    "A high contrast mode to ease your navigation. Visual quality will be reduced but clarity will be increased." : "Ein kontrastreicher Modus, der die Navigation erleichtert. Die Bildqualität wird reduziert, die Klarheit jedoch erhöht.",
+    "A high contrast mode to ease your navigation. Visual quality will be reduced but clarity will be increased." : "Ein kontrastreicher Modus, der die Navigation erleichtert. Die Bildqualität wird reduziert, die Übersichtlichkeit jedoch erhöht.",
     "Dyslexia font" : "Legasthenie-Schriftart",
     "Enable dyslexia font" : "Legasthenie-Schriftart aktivieren",
     "OpenDyslexic is a free typeface/font designed to mitigate some of the common reading errors caused by dyslexia." : "OpenDyslexic ist eine freie Schriftart, die entwickelt wurde, um einige der häufigsten Lesefehler, die durch Legasthenie verursacht werden, zu reduzieren.",

apps/accessibility/l10n/de.json

@@ -4,7 +4,7 @@
     "A dark theme to ease your eyes by reducing the overall luminosity and brightness. It is still under development, so please report any issues you may find." : "Ein dunkles Design, das die Augen entspannt, indem es die allgemeine Lichtstärke und Helligkeit reduziert. Es befindet sich noch in der Entwicklung, also melde bitte alle Probleme, die Du findest.",
     "High contrast mode" : "Kontrastreicher Modus",
     "Enable high contrast mode" : "Kontrastreichen Modus aktivieren",
-    "A high contrast mode to ease your navigation. Visual quality will be reduced but clarity will be increased." : "Ein kontrastreicher Modus, der die Navigation erleichtert. Die Bildqualität wird reduziert, die Klarheit jedoch erhöht.",
+    "A high contrast mode to ease your navigation. Visual quality will be reduced but clarity will be increased." : "Ein kontrastreicher Modus, der die Navigation erleichtert. Die Bildqualität wird reduziert, die Übersichtlichkeit jedoch erhöht.",
     "Dyslexia font" : "Legasthenie-Schriftart",
     "Enable dyslexia font" : "Legasthenie-Schriftart aktivieren",
     "OpenDyslexic is a free typeface/font designed to mitigate some of the common reading errors caused by dyslexia." : "OpenDyslexic ist eine freie Schriftart, die entwickelt wurde, um einige der häufigsten Lesefehler, die durch Legasthenie verursacht werden, zu reduzieren.",

apps/accessibility/l10n/de_DE.js

@@ -11,7 +11,7 @@ OC.L10N.register(
     "Enable dyslexia font" : "Legasthenie-Schriftart aktivieren",
     "OpenDyslexic is a free typeface/font designed to mitigate some of the common reading errors caused by dyslexia." : "OpenDyslexic ist eine freie Schriftart, die entwickelt wurde, um einige der häufigsten Lesefehler, die durch Legasthenie verursacht werden, zu reduzieren.",
     "Accessibility" : "Barrierefreiheit",
-    "Accessibility options for nextcloud" : "Optionen für Barrierefreiheit in Nextcloud",
+    "Accessibility options for nextcloud" : "Optionen zur Barrierefreiheit in Nextcloud",
     "Provides multiple accessibilities options to ease your use of Nextcloud" : "Bietet verschiedene Optionen für Barrierefreiheit, um die Nutzung von Nextcloud zu erleichtern.",
     "Universal access is very important to us. We follow web standards and check to make everything usable also without mouse, and assistive software such as screenreaders. We aim to be compliant with the {guidelines}Web Content Accessibility Guidelines{linkend} 2.1 on AA level, with the high contrast theme even on AAA level." : "Der universelle Zugang ist für uns sehr wichtig. Wir halten uns an Webstandards und prüfen, ob alles auch ohne Maus und unterstützende Software wie Screenreader nutzbar ist. Wir streben die Einhaltung der {guidelines}Web Content Accessibility Guidelines{linkend} 2.1 auf AA-Niveau an, mit dem kontrastreichen Design sogar auf AAA-Niveau.",
     "If you find any issues, don’t hesitate to report them on {issuetracker}our issue tracker{linkend}. And if you want to get involved, come join {designteam}our design team{linkend}!" : "Wenn Sie Fehler finden, melden Sie diese bitte im {issuetracker}Problemverfolgungssystem{linkend}. Und wenn Sie mithelfen möchten, treten Sie dem {designteam}Designteam{linkend} bei!",

apps/accessibility/l10n/de_DE.json

@@ -9,7 +9,7 @@
     "Enable dyslexia font" : "Legasthenie-Schriftart aktivieren",
     "OpenDyslexic is a free typeface/font designed to mitigate some of the common reading errors caused by dyslexia." : "OpenDyslexic ist eine freie Schriftart, die entwickelt wurde, um einige der häufigsten Lesefehler, die durch Legasthenie verursacht werden, zu reduzieren.",
     "Accessibility" : "Barrierefreiheit",
-    "Accessibility options for nextcloud" : "Optionen für Barrierefreiheit in Nextcloud",
+    "Accessibility options for nextcloud" : "Optionen zur Barrierefreiheit in Nextcloud",
     "Provides multiple accessibilities options to ease your use of Nextcloud" : "Bietet verschiedene Optionen für Barrierefreiheit, um die Nutzung von Nextcloud zu erleichtern.",
     "Universal access is very important to us. We follow web standards and check to make everything usable also without mouse, and assistive software such as screenreaders. We aim to be compliant with the {guidelines}Web Content Accessibility Guidelines{linkend} 2.1 on AA level, with the high contrast theme even on AAA level." : "Der universelle Zugang ist für uns sehr wichtig. Wir halten uns an Webstandards und prüfen, ob alles auch ohne Maus und unterstützende Software wie Screenreader nutzbar ist. Wir streben die Einhaltung der {guidelines}Web Content Accessibility Guidelines{linkend} 2.1 auf AA-Niveau an, mit dem kontrastreichen Design sogar auf AAA-Niveau.",
     "If you find any issues, don’t hesitate to report them on {issuetracker}our issue tracker{linkend}. And if you want to get involved, come join {designteam}our design team{linkend}!" : "Wenn Sie Fehler finden, melden Sie diese bitte im {issuetracker}Problemverfolgungssystem{linkend}. Und wenn Sie mithelfen möchten, treten Sie dem {designteam}Designteam{linkend} bei!",

apps/accessibility/l10n/el.js

@@ -9,11 +9,11 @@ OC.L10N.register(
     "A high contrast mode to ease your navigation. Visual quality will be reduced but clarity will be increased." : "Λειτουργία με υψηλή αντίθεση για να διευκολύνει την πλοήγηση σας. Η οπτική ποιότητα θα είναι μειωμένη αλλά θα έχετε υψηλότερη ευκρίνεια.",
     "Dyslexia font" : "Γραμματοσειρά για δυσλεκτικούς",
     "Enable dyslexia font" : "Ενεργοποίηση γραμματοσειράς για δυσλεκτικούς",
-    "OpenDyslexic is a free typeface/font designed to mitigate some of the common reading errors caused by dyslexia." : "Η OpenDyslexic είναι μία δωρεάν γραμματοσειρά σχεδιασμένη ώστε να περιορίζει ορισμένα από τα πιο συνήθη λάθη που προκαλεί η δυσλεξία στην ανάγνωση",
+    "OpenDyslexic is a free typeface/font designed to mitigate some of the common reading errors caused by dyslexia." : "Η OpenDyslexic είναι μία δωρεάν γραμματοσειρά σχεδιασμένη ώστε να περιορίζει ορισμένα από τα πιο συνήθη προβλήματα που προκαλεί η δυσλεξία στην ανάγνωση",
     "Accessibility" : "Προσβασιμότητα",
     "Accessibility options for nextcloud" : "Ρυθμίσεις προσβασιμότητας του nextcloud.",
     "Provides multiple accessibilities options to ease your use of Nextcloud" : "Προσφέρει πολλαπλές επιλογές προσβασιμότητας για να διευκολύνουν τη χρήση του Nextcloud",
-    "Universal access is very important to us. We follow web standards and check to make everything usable also without mouse, and assistive software such as screenreaders. We aim to be compliant with the {guidelines}Web Content Accessibility Guidelines{linkend} 2.1 on AA level, with the high contrast theme even on AAA level." : "Η γενική πρόσβαση είναι πολύ σημαντική για εμάς. Ακολουθούμε τα πρότυπα του διαδικτύου και ελέγχουμε ότι τα πάντα μπορούν να χρησιμοποιηθούν χωρίς ποντίκι και βοηθητικό λογισμικό όπως προγράμματα ανάγνωσης οθόνης. Στόχος μας είναι να συμμορφωνόμαστε με τις {προδιαγραφές} Προδιαγραφές πρόσβασης περιεχομένου Ιστού 2.1 σε επίπεδο AA, με το θέμα υψηλής αντίθεσης ακόμη και σε επίπεδο ΑΑΑ.",
+    "Universal access is very important to us. We follow web standards and check to make everything usable also without mouse, and assistive software such as screenreaders. We aim to be compliant with the {guidelines}Web Content Accessibility Guidelines{linkend} 2.1 on AA level, with the high contrast theme even on AAA level." : "Η γενική πρόσβαση είναι πολύ σημαντική για εμάς. Ακολουθούμε τα πρότυπα του διαδικτύου και ελέγχουμε ότι τα πάντα μπορούν να χρησιμοποιηθούν χωρίς ποντίκι και βοηθητικό λογισμικό όπως προγράμματα ανάγνωσης οθόνης. Στόχος μας είναι να συμμορφωνόμαστε με την {guidelines} Πρόσβαση Περιεχομένου Ιστού Guidelines{linkend} 2.1 σε επίπεδο AA, με το θέμα υψηλής αντίθεσης ακόμη και σε επίπεδο ΑΑΑ.",
     "If you find any issues, don’t hesitate to report them on {issuetracker}our issue tracker{linkend}. And if you want to get involved, come join {designteam}our design team{linkend}!" : "Αν διαπιστώσετε τυχόν προβλήματα, μη διστάσετε να τα αναφέρετε στον {issuetracker} στον διακομιστή προβλημάτων μας{linkend}. Και αν θέλετε να εμπλακείτε, ελάτε στο {designteam} στην ομάδα σχεδιασμού μας{linkend}!",
     "Enable" : "Ενεργοποίηση"
 },

apps/accessibility/l10n/el.json

@@ -7,11 +7,11 @@
     "A high contrast mode to ease your navigation. Visual quality will be reduced but clarity will be increased." : "Λειτουργία με υψηλή αντίθεση για να διευκολύνει την πλοήγηση σας. Η οπτική ποιότητα θα είναι μειωμένη αλλά θα έχετε υψηλότερη ευκρίνεια.",
     "Dyslexia font" : "Γραμματοσειρά για δυσλεκτικούς",
     "Enable dyslexia font" : "Ενεργοποίηση γραμματοσειράς για δυσλεκτικούς",
-    "OpenDyslexic is a free typeface/font designed to mitigate some of the common reading errors caused by dyslexia." : "Η OpenDyslexic είναι μία δωρεάν γραμματοσειρά σχεδιασμένη ώστε να περιορίζει ορισμένα από τα πιο συνήθη λάθη που προκαλεί η δυσλεξία στην ανάγνωση",
+    "OpenDyslexic is a free typeface/font designed to mitigate some of the common reading errors caused by dyslexia." : "Η OpenDyslexic είναι μία δωρεάν γραμματοσειρά σχεδιασμένη ώστε να περιορίζει ορισμένα από τα πιο συνήθη προβλήματα που προκαλεί η δυσλεξία στην ανάγνωση",
     "Accessibility" : "Προσβασιμότητα",
     "Accessibility options for nextcloud" : "Ρυθμίσεις προσβασιμότητας του nextcloud.",
     "Provides multiple accessibilities options to ease your use of Nextcloud" : "Προσφέρει πολλαπλές επιλογές προσβασιμότητας για να διευκολύνουν τη χρήση του Nextcloud",
-    "Universal access is very important to us. We follow web standards and check to make everything usable also without mouse, and assistive software such as screenreaders. We aim to be compliant with the {guidelines}Web Content Accessibility Guidelines{linkend} 2.1 on AA level, with the high contrast theme even on AAA level." : "Η γενική πρόσβαση είναι πολύ σημαντική για εμάς. Ακολουθούμε τα πρότυπα του διαδικτύου και ελέγχουμε ότι τα πάντα μπορούν να χρησιμοποιηθούν χωρίς ποντίκι και βοηθητικό λογισμικό όπως προγράμματα ανάγνωσης οθόνης. Στόχος μας είναι να συμμορφωνόμαστε με τις {προδιαγραφές} Προδιαγραφές πρόσβασης περιεχομένου Ιστού 2.1 σε επίπεδο AA, με το θέμα υψηλής αντίθεσης ακόμη και σε επίπεδο ΑΑΑ.",
+    "Universal access is very important to us. We follow web standards and check to make everything usable also without mouse, and assistive software such as screenreaders. We aim to be compliant with the {guidelines}Web Content Accessibility Guidelines{linkend} 2.1 on AA level, with the high contrast theme even on AAA level." : "Η γενική πρόσβαση είναι πολύ σημαντική για εμάς. Ακολουθούμε τα πρότυπα του διαδικτύου και ελέγχουμε ότι τα πάντα μπορούν να χρησιμοποιηθούν χωρίς ποντίκι και βοηθητικό λογισμικό όπως προγράμματα ανάγνωσης οθόνης. Στόχος μας είναι να συμμορφωνόμαστε με την {guidelines} Πρόσβαση Περιεχομένου Ιστού Guidelines{linkend} 2.1 σε επίπεδο AA, με το θέμα υψηλής αντίθεσης ακόμη και σε επίπεδο ΑΑΑ.",
     "If you find any issues, don’t hesitate to report them on {issuetracker}our issue tracker{linkend}. And if you want to get involved, come join {designteam}our design team{linkend}!" : "Αν διαπιστώσετε τυχόν προβλήματα, μη διστάσετε να τα αναφέρετε στον {issuetracker} στον διακομιστή προβλημάτων μας{linkend}. Και αν θέλετε να εμπλακείτε, ελάτε στο {designteam} στην ομάδα σχεδιασμού μας{linkend}!",
     "Enable" : "Ενεργοποίηση"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"

apps/accessibility/l10n/en_GB.js

@@ -13,8 +13,6 @@ OC.L10N.register(
     "Accessibility" : "Accessibility",
     "Accessibility options for nextcloud" : "Accessibility options for nextcloud",
     "Provides multiple accessibilities options to ease your use of Nextcloud" : "Provides multiple accessibilities options to ease your use of Nextcloud",
-    "Universal access is very important to us. We follow web standards and check to make everything usable also without mouse, and assistive software such as screenreaders. We aim to be compliant with the {guidelines}Web Content Accessibility Guidelines{linkend} 2.1 on AA level, with the high contrast theme even on AAA level." : "Universal access is very important to us. We follow web standards and check to make everything usable also without mouse, and assistive software such as screenreaders. We aim to be compliant with the {guidelines}Web Content Accessibility Guidelines{linkend} 2.1 on AA level, with the high contrast theme even on AAA level.",
-    "If you find any issues, don’t hesitate to report them on {issuetracker}our issue tracker{linkend}. And if you want to get involved, come join {designteam}our design team{linkend}!" : "If you find any issues, don’t hesitate to report them on {issuetracker}our issue tracker{linkend}. And if you want to get involved, come join {designteam}our design team{linkend}!",
     "Enable" : "Enable"
 },
 "nplurals=2; plural=(n != 1);");

apps/accessibility/l10n/en_GB.json

@@ -11,8 +11,6 @@
     "Accessibility" : "Accessibility",
     "Accessibility options for nextcloud" : "Accessibility options for nextcloud",
     "Provides multiple accessibilities options to ease your use of Nextcloud" : "Provides multiple accessibilities options to ease your use of Nextcloud",
-    "Universal access is very important to us. We follow web standards and check to make everything usable also without mouse, and assistive software such as screenreaders. We aim to be compliant with the {guidelines}Web Content Accessibility Guidelines{linkend} 2.1 on AA level, with the high contrast theme even on AAA level." : "Universal access is very important to us. We follow web standards and check to make everything usable also without mouse, and assistive software such as screenreaders. We aim to be compliant with the {guidelines}Web Content Accessibility Guidelines{linkend} 2.1 on AA level, with the high contrast theme even on AAA level.",
-    "If you find any issues, don’t hesitate to report them on {issuetracker}our issue tracker{linkend}. And if you want to get involved, come join {designteam}our design team{linkend}!" : "If you find any issues, don’t hesitate to report them on {issuetracker}our issue tracker{linkend}. And if you want to get involved, come join {designteam}our design team{linkend}!",
     "Enable" : "Enable"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }

apps/accessibility/l10n/es_DO.js

@@ -1,20 +0,0 @@
-OC.L10N.register(
-    "accessibility",
-    {
-    "Dark theme" : "Tema Oscuro",
-    "Enable dark theme" : "Habilita el tema oscuro",
-    "A dark theme to ease your eyes by reducing the overall luminosity and brightness. It is still under development, so please report any issues you may find." : "Usa el tema oscuro para ayudar a tus ojos reduciendo el brillo en general. Todavía esta en desarrollo, entonces reporta cualquier problemas que encuentres",
-    "High contrast mode" : "Modo de alto contraste",
-    "Enable high contrast mode" : "Habilita el modo de alto contraste",
-    "A high contrast mode to ease your navigation. Visual quality will be reduced but clarity will be increased." : "Un modo de alto contraste para mejorar tu navegacion. La calidad visual se vera reducida pero la claridad se mejorara.",
-    "Dyslexia font" : "Fuente para las personas con dislexia",
-    "Enable dyslexia font" : "Habilita la fuente de dislexia",
-    "OpenDyslexic is a free typeface/font designed to mitigate some of the common reading errors caused by dyslexia." : "OpenDyslexic es un tipo de letra o fuente gratuito diseñado para mitigar algunos de los errores de lectura comunes causados ​​por la dislexia.",
-    "Accessibility" : "Accesibilidad",
-    "Accessibility options for nextcloud" : "Opciones de accesibilidad para nexcloud",
-    "Provides multiple accessibilities options to ease your use of Nextcloud" : "Proporciona varias opciones de accesibilidad para facilitar el uso de Nextcloud",
-    "Universal access is very important to us. We follow web standards and check to make everything usable also without mouse, and assistive software such as screenreaders. We aim to be compliant with the {guidelines}Web Content Accessibility Guidelines{linkend} 2.1 on AA level, with the high contrast theme even on AAA level." : "El acceso universal es muy importante para nosotros. Seguimos los estándares web y verificamos que todo se pueda usar también sin mouse y software de asistencia, como lectores de pantalla. Nuestro objetivo es cumplir con las {guidelines}Pautas de accesibilidad al contenido web{linkend} 2.1 en el nivel AA, con el tema de alto contraste incluso en el nivel AAA.",
-    "If you find any issues, don’t hesitate to report them on {issuetracker}our issue tracker{linkend}. And if you want to get involved, come join {designteam}our design team{linkend}!" : "Si encuentras cualquier problemas, no dudes de reportarlos en {issuetracker}nuestro rastreador de problemas{linkend}. Y si quieres participar, únete a {designteam}nuestro equipo de diseño{linkend}.",
-    "Enable" : "Habilitar"
-},
-"nplurals=2; plural=(n != 1);");

apps/accessibility/l10n/es_DO.json

@@ -1,18 +0,0 @@
-{ "translations": {
-    "Dark theme" : "Tema Oscuro",
-    "Enable dark theme" : "Habilita el tema oscuro",
-    "A dark theme to ease your eyes by reducing the overall luminosity and brightness. It is still under development, so please report any issues you may find." : "Usa el tema oscuro para ayudar a tus ojos reduciendo el brillo en general. Todavía esta en desarrollo, entonces reporta cualquier problemas que encuentres",
-    "High contrast mode" : "Modo de alto contraste",
-    "Enable high contrast mode" : "Habilita el modo de alto contraste",
-    "A high contrast mode to ease your navigation. Visual quality will be reduced but clarity will be increased." : "Un modo de alto contraste para mejorar tu navegacion. La calidad visual se vera reducida pero la claridad se mejorara.",
-    "Dyslexia font" : "Fuente para las personas con dislexia",
-    "Enable dyslexia font" : "Habilita la fuente de dislexia",
-    "OpenDyslexic is a free typeface/font designed to mitigate some of the common reading errors caused by dyslexia." : "OpenDyslexic es un tipo de letra o fuente gratuito diseñado para mitigar algunos de los errores de lectura comunes causados ​​por la dislexia.",
-    "Accessibility" : "Accesibilidad",
-    "Accessibility options for nextcloud" : "Opciones de accesibilidad para nexcloud",
-    "Provides multiple accessibilities options to ease your use of Nextcloud" : "Proporciona varias opciones de accesibilidad para facilitar el uso de Nextcloud",
-    "Universal access is very important to us. We follow web standards and check to make everything usable also without mouse, and assistive software such as screenreaders. We aim to be compliant with the {guidelines}Web Content Accessibility Guidelines{linkend} 2.1 on AA level, with the high contrast theme even on AAA level." : "El acceso universal es muy importante para nosotros. Seguimos los estándares web y verificamos que todo se pueda usar también sin mouse y software de asistencia, como lectores de pantalla. Nuestro objetivo es cumplir con las {guidelines}Pautas de accesibilidad al contenido web{linkend} 2.1 en el nivel AA, con el tema de alto contraste incluso en el nivel AAA.",
-    "If you find any issues, don’t hesitate to report them on {issuetracker}our issue tracker{linkend}. And if you want to get involved, come join {designteam}our design team{linkend}!" : "Si encuentras cualquier problemas, no dudes de reportarlos en {issuetracker}nuestro rastreador de problemas{linkend}. Y si quieres participar, únete a {designteam}nuestro equipo de diseño{linkend}.",
-    "Enable" : "Habilitar"
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-}

apps/accessibility/l10n/fa.js

@@ -4,7 +4,7 @@ OC.L10N.register(
     "Dark theme" : "تم تاریک",
     "Enable dark theme" : "فعالسازی تم تاریک",
     "A dark theme to ease your eyes by reducing the overall luminosity and brightness. It is still under development, so please report any issues you may find." : "تم تاریک برای با کاهش نور و نیز شفافیت برای راحتی بیشتر چشمان شما در استفاده از نکست کلود تعبیه دیده شده است و این امکان در حال توسعه می باشد،به همین دلیل هرگونه ایراد پیش آمده را گزارش دهید.",
-    "High contrast mode" : "حالت با کنتراست بالا",
+    "High contrast mode" : "حالت کنتراست بالا",
     "Enable high contrast mode" : "فعالسازی حالت کنتراست بالا",
     "A high contrast mode to ease your navigation. Visual quality will be reduced but clarity will be increased." : "یک حالت کنتراست بالا برای سهولت در پیمایش. کیفیت بصری کاهش می یابد اما وضوح افزایش می یابد.",
     "Dyslexia font" : "فونت Dyslexia",

apps/accessibility/l10n/fa.json

@@ -2,7 +2,7 @@
     "Dark theme" : "تم تاریک",
     "Enable dark theme" : "فعالسازی تم تاریک",
     "A dark theme to ease your eyes by reducing the overall luminosity and brightness. It is still under development, so please report any issues you may find." : "تم تاریک برای با کاهش نور و نیز شفافیت برای راحتی بیشتر چشمان شما در استفاده از نکست کلود تعبیه دیده شده است و این امکان در حال توسعه می باشد،به همین دلیل هرگونه ایراد پیش آمده را گزارش دهید.",
-    "High contrast mode" : "حالت با کنتراست بالا",
+    "High contrast mode" : "حالت کنتراست بالا",
     "Enable high contrast mode" : "فعالسازی حالت کنتراست بالا",
     "A high contrast mode to ease your navigation. Visual quality will be reduced but clarity will be increased." : "یک حالت کنتراست بالا برای سهولت در پیمایش. کیفیت بصری کاهش می یابد اما وضوح افزایش می یابد.",
     "Dyslexia font" : "فونت Dyslexia",

apps/accessibility/l10n/fi.js

@@ -1,8 +1,8 @@
 OC.L10N.register(
     "accessibility",
     {
-    "Dark theme" : "Tummateema",
-    "Enable dark theme" : "Käytä tummaateemaa",
+    "Dark theme" : "Tumma teema",
+    "Enable dark theme" : "Käytä tummaa teemaa",
     "A dark theme to ease your eyes by reducing the overall luminosity and brightness. It is still under development, so please report any issues you may find." : "Tumma teema helpottaa silmien rasitusta vähentämällä kokonaiskirkkautta. Teemaa kehitetään edelleen, joten ilmoitathan mahdollisesti kohtaamasi ongelmat.",
     "High contrast mode" : "Suuren kontrastin tila",
     "Enable high contrast mode" : "Käytä suuren kontrastin tilaa",

apps/accessibility/l10n/fi.json

@@ -1,6 +1,6 @@
 { "translations": {
-    "Dark theme" : "Tummateema",
-    "Enable dark theme" : "Käytä tummaateemaa",
+    "Dark theme" : "Tumma teema",
+    "Enable dark theme" : "Käytä tummaa teemaa",
     "A dark theme to ease your eyes by reducing the overall luminosity and brightness. It is still under development, so please report any issues you may find." : "Tumma teema helpottaa silmien rasitusta vähentämällä kokonaiskirkkautta. Teemaa kehitetään edelleen, joten ilmoitathan mahdollisesti kohtaamasi ongelmat.",
     "High contrast mode" : "Suuren kontrastin tila",
     "Enable high contrast mode" : "Käytä suuren kontrastin tilaa",

apps/accessibility/l10n/is.js

@@ -13,8 +13,6 @@ OC.L10N.register(
     "Accessibility" : "Aukið aðgengi",
     "Accessibility options for nextcloud" : "Valkostir fyrir auðveldað aðgengi í Nextcloud",
     "Provides multiple accessibilities options to ease your use of Nextcloud" : "Býður upp á marga valkosti fyrir auðveldað aðgengi í Nextcloud",
-    "Universal access is very important to us. We follow web standards and check to make everything usable also without mouse, and assistive software such as screenreaders. We aim to be compliant with the {guidelines}Web Content Accessibility Guidelines{linkend} 2.1 on AA level, with the high contrast theme even on AAA level." : "Aðgengi fyrir alla er okkur mikilvægt. Við fylgjum vefstöðlum oggöngum úr skugga um að allt sé nothæft án þess að nota tölvumús, auk þess að hjálpartæki á borð við skjálesara virki. Við miðum að samhæfni við {guidelines}Web Content Accessibility Guidelines{linkend} 2.1 á stigi AA, og höfum meira að segja háskerpuþemað miðað við stig AAA.",
-    "If you find any issues, don’t hesitate to report them on {issuetracker}our issue tracker{linkend}. And if you want to get involved, come join {designteam}our design team{linkend}!" : "Ef þú rekst á einhver vandamál, ekki hika við að tilkynna þau á {issuetracker}verkbeiðnakerfinu okkar{linkend}. Og ef þig langar að taka þátt í þessu, gakktu þá til liðs við {designteam}hönnunarteymið okkar{linkend}!",
     "Enable" : "Virkja"
 },
 "nplurals=2; plural=(n % 10 != 1 || n % 100 == 11);");

apps/accessibility/l10n/is.json

@@ -11,8 +11,6 @@
     "Accessibility" : "Aukið aðgengi",
     "Accessibility options for nextcloud" : "Valkostir fyrir auðveldað aðgengi í Nextcloud",
     "Provides multiple accessibilities options to ease your use of Nextcloud" : "Býður upp á marga valkosti fyrir auðveldað aðgengi í Nextcloud",
-    "Universal access is very important to us. We follow web standards and check to make everything usable also without mouse, and assistive software such as screenreaders. We aim to be compliant with the {guidelines}Web Content Accessibility Guidelines{linkend} 2.1 on AA level, with the high contrast theme even on AAA level." : "Aðgengi fyrir alla er okkur mikilvægt. Við fylgjum vefstöðlum oggöngum úr skugga um að allt sé nothæft án þess að nota tölvumús, auk þess að hjálpartæki á borð við skjálesara virki. Við miðum að samhæfni við {guidelines}Web Content Accessibility Guidelines{linkend} 2.1 á stigi AA, og höfum meira að segja háskerpuþemað miðað við stig AAA.",
-    "If you find any issues, don’t hesitate to report them on {issuetracker}our issue tracker{linkend}. And if you want to get involved, come join {designteam}our design team{linkend}!" : "Ef þú rekst á einhver vandamál, ekki hika við að tilkynna þau á {issuetracker}verkbeiðnakerfinu okkar{linkend}. Og ef þig langar að taka þátt í þessu, gakktu þá til liðs við {designteam}hönnunarteymið okkar{linkend}!",
     "Enable" : "Virkja"
 },"pluralForm" :"nplurals=2; plural=(n % 10 != 1 || n % 100 == 11);"
 }

apps/accessibility/l10n/ru.js

@@ -6,7 +6,7 @@ OC.L10N.register(
     "A dark theme to ease your eyes by reducing the overall luminosity and brightness. It is still under development, so please report any issues you may find." : "Тёмное оформление снижает напряжение глаз за счёт уменьшения общей яркости. Тема находится в разработке. Сообщайте о всех найденных ошибках и недочётах.",
     "High contrast mode" : "Режим высокой контрастности",
     "Enable high contrast mode" : "Включить режим высокой контрастности",
-    "A high contrast mode to ease your navigation. Visual quality will be reduced but clarity will be increased." : "Этот режим делает ярлыки и кнопки меню более чёткими за счёт уменьшения качества.",
+    "A high contrast mode to ease your navigation. Visual quality will be reduced but clarity will be increased." : "Этот высококонтрастный режим облегчает навигацию по сайту. Качество изображения будет уменьшено за счёт увеличения чёткости.",
     "Dyslexia font" : "Шрифт Dyslexia",
     "Enable dyslexia font" : "Использовать шрифт Dyslexia",
     "OpenDyslexic is a free typeface/font designed to mitigate some of the common reading errors caused by dyslexia." : "OpenDyslexic — бесплатный шрифт, который смягчает некоторые распространённые ошибки чтения, вызываемые дислексией.",

apps/accessibility/l10n/ru.json

@@ -4,7 +4,7 @@
     "A dark theme to ease your eyes by reducing the overall luminosity and brightness. It is still under development, so please report any issues you may find." : "Тёмное оформление снижает напряжение глаз за счёт уменьшения общей яркости. Тема находится в разработке. Сообщайте о всех найденных ошибках и недочётах.",
     "High contrast mode" : "Режим высокой контрастности",
     "Enable high contrast mode" : "Включить режим высокой контрастности",
-    "A high contrast mode to ease your navigation. Visual quality will be reduced but clarity will be increased." : "Этот режим делает ярлыки и кнопки меню более чёткими за счёт уменьшения качества.",
+    "A high contrast mode to ease your navigation. Visual quality will be reduced but clarity will be increased." : "Этот высококонтрастный режим облегчает навигацию по сайту. Качество изображения будет уменьшено за счёт увеличения чёткости.",
     "Dyslexia font" : "Шрифт Dyslexia",
     "Enable dyslexia font" : "Использовать шрифт Dyslexia",
     "OpenDyslexic is a free typeface/font designed to mitigate some of the common reading errors caused by dyslexia." : "OpenDyslexic — бесплатный шрифт, который смягчает некоторые распространённые ошибки чтения, вызываемые дислексией.",

apps/accessibility/l10n/sc.js

@@ -1,20 +0,0 @@
-OC.L10N.register(
-    "accessibility",
-    {
-    "Dark theme" : "Tema iscuru ",
-    "Enable dark theme" : "Ativa su tema iscuru ",
-    "A dark theme to ease your eyes by reducing the overall luminosity and brightness. It is still under development, so please report any issues you may find." : "Unu tema iscuru pro agiudare is ogros tuos menguende sa luminosidade e su lugore generale. Est ancora in fase de isvilupu, duncas sinnala cale si siat problema.",
-    "High contrast mode" : "Modalidade cuntrastu artu",
-    "Enable high contrast mode" : "Ativa sa modalidade cuntrastu altu",
-    "A high contrast mode to ease your navigation. Visual quality will be reduced but clarity will be increased." : "Unu cuntrastu artu pro agiudare sa navigatzione tua. S'at a menguare sa calidade de visualizatzione, ma at a crèschere sa craresa.",
-    "Dyslexia font" : "Font pro dislessia",
-    "Enable dyslexia font" : "Ativa su font pro dislessia",
-    "OpenDyslexic is a free typeface/font designed to mitigate some of the common reading errors caused by dyslexia." : "OpenDyslexic est unu font lìberu pensadu pro illebiare unos cantos isbàllios comunes de leghidura causados dae sa dislessia.",
-    "Accessibility" : "Atzessibilidade",
-    "Accessibility options for nextcloud" : "Sèberos de atzessibilidade pro nextcloud",
-    "Provides multiple accessibilities options to ease your use of Nextcloud" : "Frunit sèberos de atzessibilidade pro agiudare s'impreu tuo de Nextcloud",
-    "Universal access is very important to us. We follow web standards and check to make everything usable also without mouse, and assistive software such as screenreaders. We aim to be compliant with the {guidelines}Web Content Accessibility Guidelines{linkend} 2.1 on AA level, with the high contrast theme even on AAA level." : "S'atzessu universale est de importu mannu pro nois. Sighimus is istandard de sa rete e chircamus de fàghere chi totu si potzat impreare chene cursore puru, e cun programmas de assistèntzia comente leghidores de ischermu. S'intentu nostru est de acumprire is inditos de is {lìniasghia}Lìinas ghia cuntenutos de rete{linkend} 2.1 a su livellu AA, cun su tema de cuntrastu artu a su livellu AAA.",
-    "If you find any issues, don’t hesitate to report them on {issuetracker}our issue tracker{linkend}. And if you want to get involved, come join {designteam}our design team{linkend}!" : "Si agatas problemas, no istentes a ddu sinnalare a {rastradoredeproblemas}su rastradore nostru{linkend}. E si nos cheres agiudare, intra in {grupudedisegnu}su grupu de disegnu nostru{linkend}!",
-    "Enable" : "Ativa"
-},
-"nplurals=2; plural=(n != 1);");

apps/accessibility/l10n/sc.json

@@ -1,18 +0,0 @@
-{ "translations": {
-    "Dark theme" : "Tema iscuru ",
-    "Enable dark theme" : "Ativa su tema iscuru ",
-    "A dark theme to ease your eyes by reducing the overall luminosity and brightness. It is still under development, so please report any issues you may find." : "Unu tema iscuru pro agiudare is ogros tuos menguende sa luminosidade e su lugore generale. Est ancora in fase de isvilupu, duncas sinnala cale si siat problema.",
-    "High contrast mode" : "Modalidade cuntrastu artu",
-    "Enable high contrast mode" : "Ativa sa modalidade cuntrastu altu",
-    "A high contrast mode to ease your navigation. Visual quality will be reduced but clarity will be increased." : "Unu cuntrastu artu pro agiudare sa navigatzione tua. S'at a menguare sa calidade de visualizatzione, ma at a crèschere sa craresa.",
-    "Dyslexia font" : "Font pro dislessia",
-    "Enable dyslexia font" : "Ativa su font pro dislessia",
-    "OpenDyslexic is a free typeface/font designed to mitigate some of the common reading errors caused by dyslexia." : "OpenDyslexic est unu font lìberu pensadu pro illebiare unos cantos isbàllios comunes de leghidura causados dae sa dislessia.",
-    "Accessibility" : "Atzessibilidade",
-    "Accessibility options for nextcloud" : "Sèberos de atzessibilidade pro nextcloud",
-    "Provides multiple accessibilities options to ease your use of Nextcloud" : "Frunit sèberos de atzessibilidade pro agiudare s'impreu tuo de Nextcloud",
-    "Universal access is very important to us. We follow web standards and check to make everything usable also without mouse, and assistive software such as screenreaders. We aim to be compliant with the {guidelines}Web Content Accessibility Guidelines{linkend} 2.1 on AA level, with the high contrast theme even on AAA level." : "S'atzessu universale est de importu mannu pro nois. Sighimus is istandard de sa rete e chircamus de fàghere chi totu si potzat impreare chene cursore puru, e cun programmas de assistèntzia comente leghidores de ischermu. S'intentu nostru est de acumprire is inditos de is {lìniasghia}Lìinas ghia cuntenutos de rete{linkend} 2.1 a su livellu AA, cun su tema de cuntrastu artu a su livellu AAA.",
-    "If you find any issues, don’t hesitate to report them on {issuetracker}our issue tracker{linkend}. And if you want to get involved, come join {designteam}our design team{linkend}!" : "Si agatas problemas, no istentes a ddu sinnalare a {rastradoredeproblemas}su rastradore nostru{linkend}. E si nos cheres agiudare, intra in {grupudedisegnu}su grupu de disegnu nostru{linkend}!",
-    "Enable" : "Ativa"
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-}

apps/accessibility/l10n/sv.js

@@ -7,9 +7,9 @@ OC.L10N.register(
     "High contrast mode" : "Läge med hög kontrast",
     "Enable high contrast mode" : "Aktivera läge med hög kontrast",
     "A high contrast mode to ease your navigation. Visual quality will be reduced but clarity will be increased." : "Ett läge med hög kontrast för att underlätta din navigering. Visuell kvalitet kommer att minska men tydligheten ökar.",
-    "Dyslexia font" : "Dyslexi-teckensnitt",
-    "Enable dyslexia font" : "Aktivera dyslexi-teckensnitt",
-    "OpenDyslexic is a free typeface/font designed to mitigate some of the common reading errors caused by dyslexia." : "OpenDyslexic är ett fritt teckensnitt/font som är utformat för att mildra några av de vanligaste lässvårigheterna som orsakas av dyslexi.",
+    "Dyslexia font" : "Dyslexi-typsnitt",
+    "Enable dyslexia font" : "Aktivera dyslexi-typsnitt",
+    "OpenDyslexic is a free typeface/font designed to mitigate some of the common reading errors caused by dyslexia." : "OpenDyslexic är ett fritt typsnitt/font som är utformat för att mildra några av de vanligaste lässvårigheterna som orsakas av dyslexi.",
     "Accessibility" : "Tillgänglighet",
     "Accessibility options for nextcloud" : "Tillgänglighetsalternativ för Nextcloud",
     "Provides multiple accessibilities options to ease your use of Nextcloud" : "Ger flera tillgänglighetsalternativ för att underlätta din användning av Nextcloud",

apps/accessibility/l10n/sv.json

@@ -5,9 +5,9 @@
     "High contrast mode" : "Läge med hög kontrast",
     "Enable high contrast mode" : "Aktivera läge med hög kontrast",
     "A high contrast mode to ease your navigation. Visual quality will be reduced but clarity will be increased." : "Ett läge med hög kontrast för att underlätta din navigering. Visuell kvalitet kommer att minska men tydligheten ökar.",
-    "Dyslexia font" : "Dyslexi-teckensnitt",
-    "Enable dyslexia font" : "Aktivera dyslexi-teckensnitt",
-    "OpenDyslexic is a free typeface/font designed to mitigate some of the common reading errors caused by dyslexia." : "OpenDyslexic är ett fritt teckensnitt/font som är utformat för att mildra några av de vanligaste lässvårigheterna som orsakas av dyslexi.",
+    "Dyslexia font" : "Dyslexi-typsnitt",
+    "Enable dyslexia font" : "Aktivera dyslexi-typsnitt",
+    "OpenDyslexic is a free typeface/font designed to mitigate some of the common reading errors caused by dyslexia." : "OpenDyslexic är ett fritt typsnitt/font som är utformat för att mildra några av de vanligaste lässvårigheterna som orsakas av dyslexi.",
     "Accessibility" : "Tillgänglighet",
     "Accessibility options for nextcloud" : "Tillgänglighetsalternativ för Nextcloud",
     "Provides multiple accessibilities options to ease your use of Nextcloud" : "Ger flera tillgänglighetsalternativ för att underlätta din användning av Nextcloud",

apps/accessibility/l10n/zh_CN.js

@@ -10,9 +10,9 @@ OC.L10N.register(
     "Dyslexia font" : "阅读障碍字体",
     "Enable dyslexia font" : "启用阅读障碍字体",
     "OpenDyslexic is a free typeface/font designed to mitigate some of the common reading errors caused by dyslexia." : "OpenDyslexic是一款免费的字样/字体，这款字体的设计目的是缓解由阅读障碍引起的一些常见阅读错误。",
-    "Accessibility" : "辅助功能",
-    "Accessibility options for nextcloud" : "Nextcloud的辅助功能",
-    "Provides multiple accessibilities options to ease your use of Nextcloud" : "提供多种辅助功能以便于您使用Nextcloud",
+    "Accessibility" : "易用性",
+    "Accessibility options for nextcloud" : "Nextcloud的易用性选项",
+    "Provides multiple accessibilities options to ease your use of Nextcloud" : "提供多种易用性选项以便于您使用Nextcloud",
     "Universal access is very important to us. We follow web standards and check to make everything usable also without mouse, and assistive software such as screenreaders. We aim to be compliant with the {guidelines}Web Content Accessibility Guidelines{linkend} 2.1 on AA level, with the high contrast theme even on AAA level." : "通用访问对我们非常重要。 我们遵循网络标准，并进行检查以确保所有内容都可以在没有鼠标或辅助软件（例如屏幕阅读器）的情况下使用。 我们的目标是遵守 {guidelines} Web 内容可访问性指南 {linkend} 2.1 能达到 AA 级别，具有高对比度主题甚至能达到 AAA 级别。",
     "If you find any issues, don’t hesitate to report them on {issuetracker}our issue tracker{linkend}. And if you want to get involved, come join {designteam}our design team{linkend}!" : "如果您发现任何问题，请随时在 {issuetracker} 我们的问题跟踪器 {linkend} 上报告。 如果您想参与其中，请加入 {designteam} 我们的设计团队 {linkend}！",
     "Enable" : "启用"

apps/accessibility/l10n/zh_CN.json

@@ -8,9 +8,9 @@
     "Dyslexia font" : "阅读障碍字体",
     "Enable dyslexia font" : "启用阅读障碍字体",
     "OpenDyslexic is a free typeface/font designed to mitigate some of the common reading errors caused by dyslexia." : "OpenDyslexic是一款免费的字样/字体，这款字体的设计目的是缓解由阅读障碍引起的一些常见阅读错误。",
-    "Accessibility" : "辅助功能",
-    "Accessibility options for nextcloud" : "Nextcloud的辅助功能",
-    "Provides multiple accessibilities options to ease your use of Nextcloud" : "提供多种辅助功能以便于您使用Nextcloud",
+    "Accessibility" : "易用性",
+    "Accessibility options for nextcloud" : "Nextcloud的易用性选项",
+    "Provides multiple accessibilities options to ease your use of Nextcloud" : "提供多种易用性选项以便于您使用Nextcloud",
     "Universal access is very important to us. We follow web standards and check to make everything usable also without mouse, and assistive software such as screenreaders. We aim to be compliant with the {guidelines}Web Content Accessibility Guidelines{linkend} 2.1 on AA level, with the high contrast theme even on AAA level." : "通用访问对我们非常重要。 我们遵循网络标准，并进行检查以确保所有内容都可以在没有鼠标或辅助软件（例如屏幕阅读器）的情况下使用。 我们的目标是遵守 {guidelines} Web 内容可访问性指南 {linkend} 2.1 能达到 AA 级别，具有高对比度主题甚至能达到 AAA 级别。",
     "If you find any issues, don’t hesitate to report them on {issuetracker}our issue tracker{linkend}. And if you want to get involved, come join {designteam}our design team{linkend}!" : "如果您发现任何问题，请随时在 {issuetracker} 我们的问题跟踪器 {linkend} 上报告。 如果您想参与其中，请加入 {designteam} 我们的设计团队 {linkend}！",
     "Enable" : "启用"

apps/accessibility/lib/AccessibilityProvider.php

@@ -53,41 +53,41 @@ class AccessibilityProvider {
 	public function __construct(string $appName,
 								IURLGenerator $urlGenerator,
 								IL10N $l) {
-		$this->appName = $appName;
+		$this->appName      = $appName;
 		$this->urlGenerator = $urlGenerator;
-		$this->l = $l;
+		$this->l            = $l;
 	}
 
 	public function getThemes() {
 		return [
 			[
-				'id' => 'dark',
-				'img' => $this->urlGenerator->imagePath($this->appName, 'theme-dark.jpg'),
+				'id'    => 'dark',
+				'img'   => $this->urlGenerator->imagePath($this->appName, 'theme-dark.jpg'),
 				'title' => $this->l->t('Dark theme'),
 				'enableLabel' => $this->l->t('Enable dark theme'),
-				'text' => $this->l->t('A dark theme to ease your eyes by reducing the overall luminosity and brightness. It is still under development, so please report any issues you may find.')
+				'text'  => $this->l->t('A dark theme to ease your eyes by reducing the overall luminosity and brightness. It is still under development, so please report any issues you may find.')
 			]
 		];
 	}
 
 	public function getHighContrast() {
 		return [
-			'id' => 'highcontrast',
-			'img' => $this->urlGenerator->imagePath($this->appName, 'mode-highcontrast.jpg'),
+			'id'    => 'highcontrast',
+			'img'   => $this->urlGenerator->imagePath($this->appName, 'mode-highcontrast.jpg'),
 			'title' => $this->l->t('High contrast mode'),
 			'enableLabel' => $this->l->t('Enable high contrast mode'),
-			'text' => $this->l->t('A high contrast mode to ease your navigation. Visual quality will be reduced but clarity will be increased.')
+			'text'  => $this->l->t('A high contrast mode to ease your navigation. Visual quality will be reduced but clarity will be increased.')
 		];
 	}
 
 	public function getFonts() {
 		return [
 			[
-				'id' => 'fontdyslexic',
-				'img' => $this->urlGenerator->imagePath($this->appName, 'font-opendyslexic.jpg'),
+				'id'    => 'fontdyslexic',
+				'img'   => $this->urlGenerator->imagePath($this->appName, 'font-opendyslexic.jpg'),
 				'title' => $this->l->t('Dyslexia font'),
 				'enableLabel' => $this->l->t('Enable dyslexia font'),
-				'text' => $this->l->t('OpenDyslexic is a free typeface/font designed to mitigate some of the common reading errors caused by dyslexia.')
+				'text'  => $this->l->t('OpenDyslexic is a free typeface/font designed to mitigate some of the common reading errors caused by dyslexia.')
 			]
 		];
 	}

apps/accessibility/lib/AppInfo/Application.php

@@ -5,6 +5,7 @@ declare(strict_types=1);
 /**
  * @copyright Copyright (c) 2018 John Molakvoæ <skjnldsv@protonmail.com>
  *
+ * @author Alexey Pyltsyn <lex61rus@gmail.com>
  * @author Christoph Wurst <christoph@winzerhof-wurst.at>
  * @author Joas Schilling <coding@schilljs.com>
  * @author John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
@@ -35,7 +36,9 @@ use OCP\AppFramework\App;
 use OCP\AppFramework\Bootstrap\IBootContext;
 use OCP\AppFramework\Bootstrap\IBootstrap;
 use OCP\AppFramework\Bootstrap\IRegistrationContext;
+use OCP\AppFramework\IAppContainer;
 use OCP\IConfig;
+use OCP\IInitialStateService;
 use OCP\IURLGenerator;
 use OCP\IUserSession;
 use function count;
@@ -52,11 +55,11 @@ class Application extends App implements IBootstrap {
 	}
 
 	public function register(IRegistrationContext $context): void {
-		$context->registerInitialStateProvider(JSDataService::class);
 	}
 
 	public function boot(IBootContext $context): void {
 		$context->injectFn([$this, 'injectCss']);
+		$context->injectFn([$this, 'registerInitialState']);
 	}
 
 	public function injectCss(IUserSession $userSession,
@@ -81,4 +84,13 @@ class Application extends App implements IBootstrap {
 			\OCP\Util::addHeader('link', ['rel' => 'stylesheet', 'media' => '(prefers-color-scheme: dark)', 'href' => $linkToCSS]);
 		}
 	}
+
+	public function registerInitialState(IInitialStateService $initialState,
+										  IAppContainer $container) {
+		$initialState->provideLazyInitialState(self::APP_ID, 'data', function () use ($container) {
+			/** @var JSDataService $data */
+			$data = $container->query(JSDataService::class);
+			return $data;
+		});
+	}
 }

apps/accessibility/lib/Controller/AccessibilityController.php

@@ -42,6 +42,8 @@ use OCP\AppFramework\Utility\ITimeFactory;
 use OCP\IConfig;
 use OCP\ILogger;
 use OCP\IRequest;
+use OCP\IURLGenerator;
+use OCP\IUserManager;
 use OCP\IUserSession;
 use ScssPhp\ScssPhp\Compiler;
 use ScssPhp\ScssPhp\Exception\ParserException;
@@ -58,15 +60,24 @@ class AccessibilityController extends Controller {
 	/** @var IConfig */
 	private $config;
 
+	/** @var IUserManager */
+	private $userManager;
+
 	/** @var ILogger */
 	private $logger;
 
+	/** @var IURLGenerator */
+	private $urlGenerator;
+
 	/** @var ITimeFactory */
 	protected $timeFactory;
 
 	/** @var IUserSession */
 	private $userSession;
 
+	/** @var IAppManager */
+	private $appManager;
+
 	/** @var IconsCacher */
 	protected $iconsCacher;
 
@@ -76,29 +87,45 @@ class AccessibilityController extends Controller {
 	/** @var null|string */
 	private $injectedVariables;
 
-	/** @var string */
-	private $appRoot;
-
+	/**
+	 * Account constructor.
+	 *
+	 * @param string $appName
+	 * @param IRequest $request
+	 * @param IConfig $config
+	 * @param IUserManager $userManager
+	 * @param ILogger $logger
+	 * @param IURLGenerator $urlGenerator
+	 * @param ITimeFactory $timeFactory
+	 * @param IUserSession $userSession
+	 * @param IAppManager $appManager
+	 * @param \OC_Defaults $defaults
+	 */
 	public function __construct(string $appName,
 								IRequest $request,
 								IConfig $config,
+								IUserManager $userManager,
 								ILogger $logger,
+								IURLGenerator $urlGenerator,
 								ITimeFactory $timeFactory,
 								IUserSession $userSession,
 								IAppManager $appManager,
 								IconsCacher $iconsCacher,
 								\OC_Defaults $defaults) {
 		parent::__construct($appName, $request);
-		$this->appName = $appName;
-		$this->config = $config;
-		$this->logger = $logger;
-		$this->timeFactory = $timeFactory;
-		$this->userSession = $userSession;
-		$this->iconsCacher = $iconsCacher;
-		$this->defaults = $defaults;
+		$this->appName      = $appName;
+		$this->config       = $config;
+		$this->userManager  = $userManager;
+		$this->logger       = $logger;
+		$this->urlGenerator = $urlGenerator;
+		$this->timeFactory  = $timeFactory;
+		$this->userSession  = $userSession;
+		$this->appManager   = $appManager;
+		$this->iconsCacher  = $iconsCacher;
+		$this->defaults     = $defaults;
 
 		$this->serverRoot = \OC::$SERVERROOT;
-		$this->appRoot = $appManager->getAppPath($this->appName);
+		$this->appRoot    = $this->appManager->getAppPath($this->appName);
 	}
 
 	/**
@@ -109,8 +136,8 @@ class AccessibilityController extends Controller {
 	 * @return DataDisplayResponse
 	 */
 	public function getCss(): DataDisplayResponse {
-		$css = '';
-		$imports = '';
+		$css        = '';
+		$imports    = '';
 		if ($this->userSession->isLoggedIn()) {
 			$userValues = $this->getUserValues();
 		} else {
@@ -155,7 +182,7 @@ class AccessibilityController extends Controller {
 
 		// Rebase all urls
 		$appWebRoot = substr($this->appRoot, strlen($this->serverRoot) - strlen(\OC::$WEBROOT));
-		$css = $this->rebaseUrls($css, $appWebRoot . '/css');
+		$css        = $this->rebaseUrls($css, $appWebRoot . '/css');
 
 		if (in_array('dark', $userValues) && $this->iconsCacher->getCachedList() && $this->iconsCacher->getCachedList()->getSize() > 0) {
 			$iconsCss = $this->invertSvgIconsColor($this->iconsCacher->getCachedList()->getContent());
@@ -188,7 +215,7 @@ class AccessibilityController extends Controller {
 	 */
 	private function getUserValues(): array {
 		$userTheme = $this->config->getUserValue($this->userSession->getUser()->getUID(), $this->appName, 'theme', false);
-		$userFont = $this->config->getUserValue($this->userSession->getUser()->getUID(), $this->appName, 'font', false);
+		$userFont  = $this->config->getUserValue($this->userSession->getUser()->getUID(), $this->appName, 'font', false);
 		$userHighContrast = $this->config->getUserValue($this->userSession->getUser()->getUID(), $this->appName, 'highcontrast', false);
 
 		return [$userTheme, $userHighContrast, $userFont];
@@ -213,7 +240,7 @@ class AccessibilityController extends Controller {
 	 * @return string
 	 */
 	private function rebaseUrls(string $css, string $webDir): string {
-		$re = '/url\([\'"]([^\/][\.\w?=\/-]*)[\'"]\)/x';
+		$re    = '/url\([\'"]([^\/][\.\w?=\/-]*)[\'"]\)/x';
 		$subst = 'url(\'' . $webDir . '/$1\')';
 
 		return preg_replace($re, $subst, $css);

apps/accessibility/lib/Controller/ConfigController.php

@@ -75,11 +75,11 @@ class ConfigController extends OCSController {
 								IUserSession $userSession,
 								AccessibilityProvider $accessibilityProvider) {
 		parent::__construct($appName, $request);
-		$this->appName = $appName;
-		$this->config = $config;
-		$this->userSession = $userSession;
+		$this->appName               = $appName;
+		$this->config                = $config;
+		$this->userSession           = $userSession;
 		$this->accessibilityProvider = $accessibilityProvider;
-		$this->userId = $userSession->getUser()->getUID();
+		$this->userId				 = $userSession->getUser()->getUID();
 	}
 
 	/**
@@ -115,7 +115,7 @@ class ConfigController extends OCSController {
 
 			$themes = $this->accessibilityProvider->getThemes();
 			$highcontrast = [$this->accessibilityProvider->getHighContrast()];
-			$fonts = $this->accessibilityProvider->getFonts();
+			$fonts  = $this->accessibilityProvider->getFonts();
 
 			$availableOptions = array_map(function ($option) {
 				return $option['id'];

apps/accessibility/lib/Service/JSDataService.php

@@ -27,11 +27,10 @@ declare(strict_types=1);
 namespace OCA\Accessibility\Service;
 
 use OCA\Accessibility\AppInfo\Application;
-use OCP\AppFramework\Services\InitialStateProvider;
 use OCP\IConfig;
 use OCP\IUserSession;
 
-class JSDataService extends InitialStateProvider {
+class JSDataService implements \JsonSerializable {
 	/** @var IUserSession */
 	private $userSession;
 	/** @var IConfig */
@@ -45,11 +44,7 @@ class JSDataService extends InitialStateProvider {
 		$this->config = $config;
 	}
 
-	public function getKey(): string {
-		return 'data';
-	}
-
-	public function getData() {
+	public function jsonSerialize() {
 		$user = $this->userSession->getUser();
 
 		if ($user === null) {

apps/accessibility/lib/Settings/Personal.php

@@ -3,7 +3,6 @@
  * @copyright Copyright (c) 2018 John Molakvoæ <skjnldsv@protonmail.com>
  * @copyright Copyright (c) 2019 Janis Köhr <janiskoehr@icloud.com>
  *
- * @author Christoph Wurst <christoph@winzerhof-wurst.at>
  * @author John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
  *
  * @license GNU AGPL version 3 or any later version
@@ -75,13 +74,13 @@ class Personal implements ISettings {
 								IURLGenerator $urlGenerator,
 								AccessibilityProvider $accessibilityProvider,
 								IInitialStateService $initialStateService) {
-		$this->appName = $appName;
-		$this->config = $config;
-		$this->userSession = $userSession;
-		$this->l = $l;
-		$this->urlGenerator = $urlGenerator;
+		$this->appName               = $appName;
+		$this->config                = $config;
+		$this->userSession           = $userSession;
+		$this->l                     = $l;
+		$this->urlGenerator          = $urlGenerator;
 		$this->accessibilityProvider = $accessibilityProvider;
-		$this->initialStateService = $initialStateService;
+		$this->initialStateService   = $initialStateService;
 	}
 
 	/**
@@ -94,14 +93,14 @@ class Personal implements ISettings {
 
 		$availableConfig = [
 			'themes' => $this->accessibilityProvider->getThemes(),
-			'fonts' => $this->accessibilityProvider->getFonts(),
+			'fonts'  => $this->accessibilityProvider->getFonts(),
 			'highcontrast' => $this->accessibilityProvider->getHighContrast()
 		];
 
 		$userConfig = [
 			'highcontrast' => $this->config->getUserValue($this->userSession->getUser()->getUID(), $this->appName, 'highcontrast', false),
-			'theme' => $this->config->getUserValue($this->userSession->getUser()->getUID(), $this->appName, 'theme', false),
-			'font' => $this->config->getUserValue($this->userSession->getUser()->getUID(), $this->appName, 'font', false)
+			'theme'  => $this->config->getUserValue($this->userSession->getUser()->getUID(), $this->appName, 'theme', false),
+			'font'   => $this->config->getUserValue($this->userSession->getUser()->getUID(), $this->appName, 'font', false)
 		];
 
 		$this->initialStateService->provideInitialState($this->appName, 'available-config', $availableConfig);

apps/accessibility/lib/Settings/PersonalSection.php

@@ -2,7 +2,6 @@
 /**
  * @copyright Copyright (c) 2018 John Molakvoæ <skjnldsv@protonmail.com>
  *
- * @author Christoph Wurst <christoph@winzerhof-wurst.at>
  * @author John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
  *
  * @license GNU AGPL version 3 or any later version
@@ -49,9 +48,9 @@ class PersonalSection implements IIconSection {
 	public function __construct(string $appName,
 								IURLGenerator $urlGenerator,
 								IL10N $l) {
-		$this->appName = $appName;
+		$this->appName      = $appName;
 		$this->urlGenerator = $urlGenerator;
-		$this->l = $l;
+		$this->l            = $l;
 	}
 
 	/**

apps/admin_audit/appinfo/info.xml

@@ -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.11.0</version>
+	<version>1.10.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="21" max-version="21"/>
+		<nextcloud min-version="20" max-version="20"/>
 	</dependencies>
 	<background-jobs>
 		<job>OCA\AdminAudit\BackgroundJobs\Rotate</job>

apps/admin_audit/composer/composer/ClassLoader.php

@@ -37,8 +37,8 @@ namespace Composer\Autoload;
  *
  * @author Fabien Potencier <fabien@symfony.com>
  * @author Jordi Boggiano <j.boggiano@seld.be>
- * @see    https://www.php-fig.org/psr/psr-0/
- * @see    https://www.php-fig.org/psr/psr-4/
+ * @see    http://www.php-fig.org/psr/psr-0/
+ * @see    http://www.php-fig.org/psr/psr-4/
  */
 class ClassLoader
 {

apps/admin_audit/composer/composer/autoload_classmap.php

@@ -6,7 +6,6 @@ $vendorDir = dirname(dirname(__FILE__));
 $baseDir = $vendorDir;
 
 return array(
-    'Composer\\InstalledVersions' => $vendorDir . '/composer/InstalledVersions.php',
     'OCA\\AdminAudit\\Actions\\Action' => $baseDir . '/../lib/Actions/Action.php',
     'OCA\\AdminAudit\\Actions\\AppManagement' => $baseDir . '/../lib/Actions/AppManagement.php',
     'OCA\\AdminAudit\\Actions\\Auth' => $baseDir . '/../lib/Actions/Auth.php',

apps/admin_audit/composer/composer/autoload_real.php

@@ -28,7 +28,7 @@ class ComposerAutoloaderInitAdminAudit
 
         $useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION') && (!function_exists('zend_loader_file_encoded') || !zend_loader_file_encoded());
         if ($useStaticLoader) {
-            require __DIR__ . '/autoload_static.php';
+            require_once __DIR__ . '/autoload_static.php';
 
             call_user_func(\Composer\Autoload\ComposerStaticInitAdminAudit::getInitializer($loader));
         } else {

apps/admin_audit/composer/composer/autoload_static.php

@@ -21,7 +21,6 @@ class ComposerStaticInitAdminAudit
     );
 
     public static $classMap = array (
-        'Composer\\InstalledVersions' => __DIR__ . '/..' . '/composer/InstalledVersions.php',
         'OCA\\AdminAudit\\Actions\\Action' => __DIR__ . '/..' . '/../lib/Actions/Action.php',
         'OCA\\AdminAudit\\Actions\\AppManagement' => __DIR__ . '/..' . '/../lib/Actions/AppManagement.php',
         'OCA\\AdminAudit\\Actions\\Auth' => __DIR__ . '/..' . '/../lib/Actions/Auth.php',

apps/admin_audit/l10n/ca.js

@@ -1,7 +1,7 @@
 OC.L10N.register(
     "admin_audit",
     {
-    "Auditing / Logging" : "Auditoria/registre",
-    "Provides logging abilities for Nextcloud such as logging file accesses or otherwise sensitive actions." : "Proporciona funcionalitats de registre per al Nextcloud, com ara un registre d'accés a fitxers o altres accions relacionades amb la confidencialitat."
+    "Auditing / Logging" : "Auditoria/Registre",
+    "Provides logging abilities for Nextcloud such as logging file accesses or otherwise sensitive actions." : "Proporciona capacitats de registre per a Nextcloud, com ara registre d’accés a fitxers o d’altres accions sensibles."
 },
 "nplurals=2; plural=(n != 1);");

apps/admin_audit/l10n/ca.json

@@ -1,5 +1,5 @@
 { "translations": {
-    "Auditing / Logging" : "Auditoria/registre",
-    "Provides logging abilities for Nextcloud such as logging file accesses or otherwise sensitive actions." : "Proporciona funcionalitats de registre per al Nextcloud, com ara un registre d'accés a fitxers o altres accions relacionades amb la confidencialitat."
+    "Auditing / Logging" : "Auditoria/Registre",
+    "Provides logging abilities for Nextcloud such as logging file accesses or otherwise sensitive actions." : "Proporciona capacitats de registre per a Nextcloud, com ara registre d’accés a fitxers o d’altres accions sensibles."
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }

apps/admin_audit/l10n/da.js

@@ -1,7 +0,0 @@
-OC.L10N.register(
-    "admin_audit",
-    {
-    "Auditing / Logging" : "Revision/Logning",
-    "Provides logging abilities for Nextcloud such as logging file accesses or otherwise sensitive actions." : "Bidrager med lognings funktionalitet til Nextcloud, såsom logning af fil tilgang eller andre sensitive handlinger"
-},
-"nplurals=2; plural=(n != 1);");

apps/admin_audit/l10n/da.json

@@ -1,5 +0,0 @@
-{ "translations": {
-    "Auditing / Logging" : "Revision/Logning",
-    "Provides logging abilities for Nextcloud such as logging file accesses or otherwise sensitive actions." : "Bidrager med lognings funktionalitet til Nextcloud, såsom logning af fil tilgang eller andre sensitive handlinger"
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-}

apps/admin_audit/l10n/el.js

@@ -1,7 +0,0 @@
-OC.L10N.register(
-    "admin_audit",
-    {
-    "Auditing / Logging" : "Έλεγχος/ Καταγραφή",
-    "Provides logging abilities for Nextcloud such as logging file accesses or otherwise sensitive actions." : "Παρέχει δυνατότητες καταγραφής για το Nextcloud όπως πρόσβαση σε αρχεία καταγραφής ή άλλες ευαίσθητες ενέργειες."
-},
-"nplurals=2; plural=(n != 1);");

apps/admin_audit/l10n/el.json

@@ -1,5 +0,0 @@
-{ "translations": {
-    "Auditing / Logging" : "Έλεγχος/ Καταγραφή",
-    "Provides logging abilities for Nextcloud such as logging file accesses or otherwise sensitive actions." : "Παρέχει δυνατότητες καταγραφής για το Nextcloud όπως πρόσβαση σε αρχεία καταγραφής ή άλλες ευαίσθητες ενέργειες."
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-}

apps/admin_audit/l10n/en_GB.js

@@ -1,7 +0,0 @@
-OC.L10N.register(
-    "admin_audit",
-    {
-    "Auditing / Logging" : "Auditing / Logging",
-    "Provides logging abilities for Nextcloud such as logging file accesses or otherwise sensitive actions." : "Provides logging abilities for Nextcloud such as logging file accesses or otherwise sensitive actions."
-},
-"nplurals=2; plural=(n != 1);");

apps/admin_audit/l10n/en_GB.json

@@ -1,5 +0,0 @@
-{ "translations": {
-    "Auditing / Logging" : "Auditing / Logging",
-    "Provides logging abilities for Nextcloud such as logging file accesses or otherwise sensitive actions." : "Provides logging abilities for Nextcloud such as logging file accesses or otherwise sensitive actions."
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-}

apps/admin_audit/l10n/es_DO.js

@@ -1,7 +0,0 @@
-OC.L10N.register(
-    "admin_audit",
-    {
-    "Auditing / Logging" : "Auditoría / Registro",
-    "Provides logging abilities for Nextcloud such as logging file accesses or otherwise sensitive actions." : "Proporciona capacidades de registro para Nextcloud, como el acceso a archivos de registro o acciones sensibles."
-},
-"nplurals=2; plural=(n != 1);");

apps/admin_audit/l10n/es_DO.json

@@ -1,5 +0,0 @@
-{ "translations": {
-    "Auditing / Logging" : "Auditoría / Registro",
-    "Provides logging abilities for Nextcloud such as logging file accesses or otherwise sensitive actions." : "Proporciona capacidades de registro para Nextcloud, como el acceso a archivos de registro o acciones sensibles."
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-}

apps/admin_audit/l10n/he.js

@@ -1,7 +0,0 @@
-OC.L10N.register(
-    "admin_audit",
-    {
-    "Auditing / Logging" : "פיקוח / תיעוד",
-    "Provides logging abilities for Nextcloud such as logging file accesses or otherwise sensitive actions." : "מספר יכולות תיעוד ל־Nextcloud כגון תיעוד גישה ליומן התיעוד או פעולות רגישות אחרות."
-},
-"nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n == 2 && n % 1 == 0) ? 1: (n % 10 == 0 && n % 1 == 0 && n > 10) ? 2 : 3;");

apps/admin_audit/l10n/he.json

@@ -1,5 +0,0 @@
-{ "translations": {
-    "Auditing / Logging" : "פיקוח / תיעוד",
-    "Provides logging abilities for Nextcloud such as logging file accesses or otherwise sensitive actions." : "מספר יכולות תיעוד ל־Nextcloud כגון תיעוד גישה ליומן התיעוד או פעולות רגישות אחרות."
-},"pluralForm" :"nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n == 2 && n % 1 == 0) ? 1: (n % 10 == 0 && n % 1 == 0 && n > 10) ? 2 : 3;"
-}

apps/admin_audit/l10n/hr.js

@@ -1,7 +0,0 @@
-OC.L10N.register(
-    "admin_audit",
-    {
-    "Auditing / Logging" : "Revizija/zapisivanje",
-    "Provides logging abilities for Nextcloud such as logging file accesses or otherwise sensitive actions." : "Omogućuje zapisivanje u Nextcloudu, primjerice radi bilježenja pristupa datotekama ili drugih osjetljivih radnji."
-},
-"nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;");

apps/admin_audit/l10n/hr.json

@@ -1,5 +0,0 @@
-{ "translations": {
-    "Auditing / Logging" : "Revizija/zapisivanje",
-    "Provides logging abilities for Nextcloud such as logging file accesses or otherwise sensitive actions." : "Omogućuje zapisivanje u Nextcloudu, primjerice radi bilježenja pristupa datotekama ili drugih osjetljivih radnji."
-},"pluralForm" :"nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;"
-}

apps/admin_audit/l10n/ko.js

@@ -1,7 +0,0 @@
-OC.L10N.register(
-    "admin_audit",
-    {
-    "Auditing / Logging" : "검사 / 로깅",
-    "Provides logging abilities for Nextcloud such as logging file accesses or otherwise sensitive actions." : "Nextcloud에게 로그 파일 접근 혹은 기타 민감한 작업과 같은 로깅 권한을 부여합니다."
-},
-"nplurals=1; plural=0;");

apps/admin_audit/l10n/ko.json

@@ -1,5 +0,0 @@
-{ "translations": {
-    "Auditing / Logging" : "검사 / 로깅",
-    "Provides logging abilities for Nextcloud such as logging file accesses or otherwise sensitive actions." : "Nextcloud에게 로그 파일 접근 혹은 기타 민감한 작업과 같은 로깅 권한을 부여합니다."
-},"pluralForm" :"nplurals=1; plural=0;"
-}

apps/admin_audit/l10n/lt_LT.js

@@ -1,7 +0,0 @@
-OC.L10N.register(
-    "admin_audit",
-    {
-    "Auditing / Logging" : "Auditas / Registravimas",
-    "Provides logging abilities for Nextcloud such as logging file accesses or otherwise sensitive actions." : "Suteikia „Nextcloud“ registravimo galimybes, pvz., Prieigų prie failų registravimą ar kitus neskelbtinus veiksmus."
-},
-"nplurals=4; plural=(n % 10 == 1 && (n % 100 > 19 || n % 100 < 11) ? 0 : (n % 10 >= 2 && n % 10 <=9) && (n % 100 > 19 || n % 100 < 11) ? 1 : n % 1 != 0 ? 2: 3);");

apps/admin_audit/l10n/lt_LT.json

@@ -1,5 +0,0 @@
-{ "translations": {
-    "Auditing / Logging" : "Auditas / Registravimas",
-    "Provides logging abilities for Nextcloud such as logging file accesses or otherwise sensitive actions." : "Suteikia „Nextcloud“ registravimo galimybes, pvz., Prieigų prie failų registravimą ar kitus neskelbtinus veiksmus."
-},"pluralForm" :"nplurals=4; plural=(n % 10 == 1 && (n % 100 > 19 || n % 100 < 11) ? 0 : (n % 10 >= 2 && n % 10 <=9) && (n % 100 > 19 || n % 100 < 11) ? 1 : n % 1 != 0 ? 2: 3);"
-}

apps/admin_audit/l10n/sc.js

@@ -1,7 +0,0 @@
-OC.L10N.register(
-    "admin_audit",
-    {
-    "Auditing / Logging" : "Verìfica / Registratzione",
-    "Provides logging abilities for Nextcloud such as logging file accesses or otherwise sensitive actions." : "Frunit is diritos de registratzione pro Nextcloud comente is atzessos a documentos de registrazione o àteras atziones sensìbiles."
-},
-"nplurals=2; plural=(n != 1);");

apps/admin_audit/l10n/sc.json

@@ -1,5 +0,0 @@
-{ "translations": {
-    "Auditing / Logging" : "Verìfica / Registratzione",
-    "Provides logging abilities for Nextcloud such as logging file accesses or otherwise sensitive actions." : "Frunit is diritos de registratzione pro Nextcloud comente is atzessos a documentos de registrazione o àteras atziones sensìbiles."
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-}

apps/admin_audit/l10n/sr.js

@@ -1,7 +0,0 @@
-OC.L10N.register(
-    "admin_audit",
-    {
-    "Auditing / Logging" : "Праћење / Бележење",
-    "Provides logging abilities for Nextcloud such as logging file accesses or otherwise sensitive actions." : "Даје Некстклауду могућност бележења, попут приступа фајловима или других осетљивих радњи."
-},
-"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);");

apps/admin_audit/l10n/sr.json

@@ -1,5 +0,0 @@
-{ "translations": {
-    "Auditing / Logging" : "Праћење / Бележење",
-    "Provides logging abilities for Nextcloud such as logging file accesses or otherwise sensitive actions." : "Даје Некстклауду могућност бележења, попут приступа фајловима или других осетљивих радњи."
-},"pluralForm" :"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);"
-}

apps/admin_audit/l10n/uk.js

@@ -1,7 +0,0 @@
-OC.L10N.register(
-    "admin_audit",
-    {
-    "Auditing / Logging" : "Аудит / журналювання",
-    "Provides logging abilities for Nextcloud such as logging file accesses or otherwise sensitive actions." : "Забезпечує можливості реєстрації для Nextcloud, такі як доступ до файлів журналу або інші дії, які є чутливими."
-},
-"nplurals=4; plural=(n % 1 == 0 && n % 10 == 1 && n % 100 != 11 ? 0 : n % 1 == 0 && n % 10 >= 2 && n % 10 <= 4 && (n % 100 < 12 || n % 100 > 14) ? 1 : n % 1 == 0 && (n % 10 ==0 || (n % 10 >=5 && n % 10 <=9) || (n % 100 >=11 && n % 100 <=14 )) ? 2: 3);");

apps/admin_audit/l10n/uk.json

@@ -1,5 +0,0 @@
-{ "translations": {
-    "Auditing / Logging" : "Аудит / журналювання",
-    "Provides logging abilities for Nextcloud such as logging file accesses or otherwise sensitive actions." : "Забезпечує можливості реєстрації для Nextcloud, такі як доступ до файлів журналу або інші дії, які є чутливими."
-},"pluralForm" :"nplurals=4; plural=(n % 1 == 0 && n % 10 == 1 && n % 100 != 11 ? 0 : n % 1 == 0 && n % 10 >= 2 && n % 10 <= 4 && (n % 100 < 12 || n % 100 > 14) ? 1 : n % 1 == 0 && (n % 10 ==0 || (n % 10 >=5 && n % 10 <=9) || (n % 100 >=11 && n % 100 <=14 )) ? 2: 3);"
-}

apps/admin_audit/l10n/zh_TW.js

@@ -1,7 +0,0 @@
-OC.L10N.register(
-    "admin_audit",
-    {
-    "Auditing / Logging" : "稽核 / 記錄",
-    "Provides logging abilities for Nextcloud such as logging file accesses or otherwise sensitive actions." : "提供 Nextcloud 的記錄功能，例如記錄檔存取或其他敏感操作。"
-},
-"nplurals=1; plural=0;");

apps/admin_audit/l10n/zh_TW.json

@@ -1,5 +0,0 @@
-{ "translations": {
-    "Auditing / Logging" : "稽核 / 記錄",
-    "Provides logging abilities for Nextcloud such as logging file accesses or otherwise sensitive actions." : "提供 Nextcloud 的記錄功能，例如記錄檔存取或其他敏感操作。"
-},"pluralForm" :"nplurals=1; plural=0;"
-}

apps/admin_audit/lib/Actions/Sharing.php

@@ -7,7 +7,6 @@ declare(strict_types=1);
  *
  * @author Daniel Calviño Sánchez <danxuliu@gmail.com>
  * @author Joas Schilling <coding@schilljs.com>
- * @author Julius Härtl <jus@bitgrid.net>
  * @author Lukas Reschke <lukas@statuscode.ch>
  * @author Sascha Wiswedel <sascha.wiswedel@nextcloud.com>
  *
@@ -147,19 +146,6 @@ class Sharing extends Action {
 					'id',
 				]
 			);
-		} elseif ($params['shareType'] === IShare::TYPE_DECK) {
-			$this->log(
-				'The %s "%s" with ID "%s" has been shared to the deck card "%s" with permissions "%s" (Share ID: %s)',
-				$params,
-				[
-					'itemType',
-					'itemTarget',
-					'itemSource',
-					'shareWith',
-					'permissions',
-					'id',
-				]
-			);
 		}
 	}
 
@@ -264,18 +250,6 @@ class Sharing extends Action {
 					'id',
 				]
 			);
-		} elseif ($params['shareType'] === IShare::TYPE_DECK) {
-			$this->log(
-				'The %s "%s" with ID "%s" has been unshared from the deck card "%s" (Share ID: %s)',
-				$params,
-				[
-					'itemType',
-					'fileTarget',
-					'itemSource',
-					'shareWith',
-					'id',
-				]
-			);
 		}
 	}
 

apps/admin_audit/lib/AppInfo/Application.php

@@ -8,7 +8,6 @@ declare(strict_types=1);
  * @author Arthur Schiwon <blizzz@arthur-schiwon.de>
  * @author Bjoern Schiessle <bjoern@schiessle.org>
  * @author Christoph Wurst <christoph@winzerhof-wurst.at>
- * @author Daniel Kesselberg <mail@danielkesselberg.de>
  * @author GrayFix <grayfix@gmail.com>
  * @author Joas Schilling <coding@schilljs.com>
  * @author Morris Jobke <hey@morrisjobke.de>

apps/admin_audit/lib/BackgroundJobs/Rotate.php

@@ -31,7 +31,7 @@ class Rotate extends TimedJob {
 	use RotationTrait;
 
 	public function __construct() {
-		$this->setInterval(60 * 60 * 3);
+		$this->setInterval(60*60*3);
 	}
 
 	protected function run($argument) {

apps/cloud_federation_api/appinfo/info.xml

@@ -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.4.0</version>
+	<version>1.3.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="21" max-version="21"/>
+		<nextcloud min-version="20" max-version="20"/>
 	</dependencies>
 </info>

apps/cloud_federation_api/composer/composer/ClassLoader.php

@@ -37,8 +37,8 @@ namespace Composer\Autoload;
  *
  * @author Fabien Potencier <fabien@symfony.com>
  * @author Jordi Boggiano <j.boggiano@seld.be>
- * @see    https://www.php-fig.org/psr/psr-0/
- * @see    https://www.php-fig.org/psr/psr-4/
+ * @see    http://www.php-fig.org/psr/psr-0/
+ * @see    http://www.php-fig.org/psr/psr-4/
  */
 class ClassLoader
 {

apps/cloud_federation_api/composer/composer/autoload_classmap.php

@@ -6,7 +6,6 @@ $vendorDir = dirname(dirname(__FILE__));
 $baseDir = $vendorDir;
 
 return array(
-    'Composer\\InstalledVersions' => $vendorDir . '/composer/InstalledVersions.php',
     'OCA\\CloudFederationAPI\\AppInfo\\Application' => $baseDir . '/../lib/AppInfo/Application.php',
     'OCA\\CloudFederationAPI\\Capabilities' => $baseDir . '/../lib/Capabilities.php',
     'OCA\\CloudFederationAPI\\Config' => $baseDir . '/../lib/Config.php',

apps/cloud_federation_api/composer/composer/autoload_real.php

@@ -28,7 +28,7 @@ class ComposerAutoloaderInitCloudFederationAPI
 
         $useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION') && (!function_exists('zend_loader_file_encoded') || !zend_loader_file_encoded());
         if ($useStaticLoader) {
-            require __DIR__ . '/autoload_static.php';
+            require_once __DIR__ . '/autoload_static.php';
 
             call_user_func(\Composer\Autoload\ComposerStaticInitCloudFederationAPI::getInitializer($loader));
         } else {

apps/cloud_federation_api/composer/composer/autoload_static.php

@@ -21,7 +21,6 @@ class ComposerStaticInitCloudFederationAPI
     );
 
     public static $classMap = array (
-        'Composer\\InstalledVersions' => __DIR__ . '/..' . '/composer/InstalledVersions.php',
         'OCA\\CloudFederationAPI\\AppInfo\\Application' => __DIR__ . '/..' . '/../lib/AppInfo/Application.php',
         'OCA\\CloudFederationAPI\\Capabilities' => __DIR__ . '/..' . '/../lib/Capabilities.php',
         'OCA\\CloudFederationAPI\\Config' => __DIR__ . '/..' . '/../lib/Config.php',

apps/cloud_federation_api/l10n/en_GB.js

@@ -1,8 +0,0 @@
-OC.L10N.register(
-    "cloud_federation_api",
-    {
-    "Cloud Federation API" : "Cloud Federation API",
-    "Enable clouds to communicate with each other and exchange data" : "Enable clouds to communicate with each other and exchange data",
-    "The Cloud Federation API enables various Nextcloud instances to communicate with each other and to exchange data." : "The Cloud Federation API enables various Nextcloud instances to communicate with each other and to exchange data."
-},
-"nplurals=2; plural=(n != 1);");

apps/cloud_federation_api/l10n/en_GB.json

@@ -1,6 +0,0 @@
-{ "translations": {
-    "Cloud Federation API" : "Cloud Federation API",
-    "Enable clouds to communicate with each other and exchange data" : "Enable clouds to communicate with each other and exchange data",
-    "The Cloud Federation API enables various Nextcloud instances to communicate with each other and to exchange data." : "The Cloud Federation API enables various Nextcloud instances to communicate with each other and to exchange data."
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-}

apps/cloud_federation_api/l10n/es.js

@@ -2,7 +2,7 @@ OC.L10N.register(
     "cloud_federation_api",
     {
     "Cloud Federation API" : "Cloud Federation API",
-    "Enable clouds to communicate with each other and exchange data" : "Permitir que las nubes se comuniquen entre ellas e intercambien datos",
-    "The Cloud Federation API enables various Nextcloud instances to communicate with each other and to exchange data." : "La API Cloud Federation permite que varias instancias de Nextcloud se comuniquen entre ellas e intercambien datos."
+    "Enable clouds to communicate with each other and exchange data" : "Habilitar las nubes para que se comuniquen entre ellas e intercambien datos",
+    "The Cloud Federation API enables various Nextcloud instances to communicate with each other and to exchange data." : "El API Cloud Federation permite que varias instancias de Nextcloud se comuniquen entre ellas e intercambien datos."
 },
 "nplurals=2; plural=(n != 1);");

apps/cloud_federation_api/l10n/es.json

@@ -1,6 +1,6 @@
 { "translations": {
     "Cloud Federation API" : "Cloud Federation API",
-    "Enable clouds to communicate with each other and exchange data" : "Permitir que las nubes se comuniquen entre ellas e intercambien datos",
-    "The Cloud Federation API enables various Nextcloud instances to communicate with each other and to exchange data." : "La API Cloud Federation permite que varias instancias de Nextcloud se comuniquen entre ellas e intercambien datos."
+    "Enable clouds to communicate with each other and exchange data" : "Habilitar las nubes para que se comuniquen entre ellas e intercambien datos",
+    "The Cloud Federation API enables various Nextcloud instances to communicate with each other and to exchange data." : "El API Cloud Federation permite que varias instancias de Nextcloud se comuniquen entre ellas e intercambien datos."
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }

apps/cloud_federation_api/l10n/eu.js

@@ -1,8 +0,0 @@
-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. "
-},
-"nplurals=2; plural=(n != 1);");

apps/cloud_federation_api/l10n/eu.json

@@ -1,6 +0,0 @@
-{ "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. "
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-}

apps/cloud_federation_api/l10n/hr.js

@@ -1,8 +0,0 @@
-OC.L10N.register(
-    "cloud_federation_api",
-    {
-    "Cloud Federation API" : "API udruženog oblaka",
-    "Enable clouds to communicate with each other and exchange data" : "Omogućite međusobnu komunikaciju i razmjenu podataka među oblacima",
-    "The Cloud Federation API enables various Nextcloud instances to communicate with each other and to exchange data." : "API udruženog oblaka omogućuje raznim instancama Nextclouda da međusobno komuniciraju i razmjenjuju podatke."
-},
-"nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;");