Merge branch 'master' into replace_strpos_calls_in_settings_app

Signed-off-by: Faraz Samapoor <[email protected]>

.github/ISSUE_TEMPLATE/BUG_REPORT.yml

@@ -17,12 +17,10 @@ body:
       options:
         - label: This is a **bug**, not a question or a configuration/webserver/proxy issue.
           required: true
-        - label: This issue is **not** already reported on Github _(I've searched it)_.
+        - label: This issue is **not** already reported on [Github](https://github.com/nextcloud/server/issues?q=is%3Aopen+is%3Aissue+label%3Abug) OR [Nextcloud Community Forum](https://help.nextcloud.com/) _(I've searched it)_.
           required: true
         - label: Nextcloud Server **is** up to date. See [Maintenance and Release Schedule](https://github.com/nextcloud/server/wiki/Maintenance-and-Release-Schedule) for supported versions.
           required: true
-        - label: Nextcloud Server **is** running on 64bit capable CPU, PHP and OS.
-          required: true
         - label: I agree to follow Nextcloud's [Code of Conduct](https://nextcloud.com/contribute/code-of-conduct/).
           required: true
   - type: textarea
@@ -78,9 +76,9 @@ body:
         Select Nextcloud Server version.
         _Versions not listed here are not maintained and not supported anymore_
       options:
-        - "24"
         - "25"
         - "26"
+        - "27"
         - "master"
     validations:
       required: true
@@ -103,10 +101,10 @@ body:
         Select PHP engine version serving Nextcloud Server.
         _Describe in the "Additional info" section if you chose "Other"._
       options:
-        - "PHP 7.3"
         - "PHP 7.4"
         - "PHP 8.0"
         - "PHP 8.1"
+        - "PHP 8.2"
         - "Other"
   - type: dropdown
     id: webserver
@@ -118,7 +116,6 @@ body:
       options:
         - "Apache (supported)"
         - "Nginx"
-        - "Lighttpd"
         - "Other"
   - type: dropdown
     id: database
@@ -141,8 +138,8 @@ body:
       description: |
         Select if bug is present after an update or on a fresh install.
       options:
-        - "Updated from a minor version (ex. 22.2.3 to 22.2.4)"
-        - "Updated to a major version (ex. 22.2.3 to 23.0.1)"
+        - "Updated from a MINOR version (ex. 22.1 to 22.2)"
+        - "Upgraded to a MAJOR version (ex. 22 to 23)"
         - "Fresh Nextcloud Server install"
   - type: dropdown
     id: encryption
@@ -192,8 +189,6 @@ body:
         ```
         > NOTE: This will be automatically formatted into code for better readability.
       render: shell
-    validations:
-      required: true
   - type: textarea
     id: nextcloud-signingstatus
     attributes:

.github/workflows/cypress.yml

@@ -8,31 +8,32 @@ on:
       - stable*
 
 env:
-  APP_NAME: viewer
-  BRANCH: ${{ github.ref }}
+  APP_NAME: server
+  BRANCH: ${{ github.base_ref }}
   TESTING: true
 
 jobs:
   init:
     runs-on: ubuntu-latest
-
-    if: ${{ github.repository_owner != 'nextcloud-gmbh' }}
+    outputs:
+      nodeVersion: ${{ steps.versions.outputs.nodeVersion }}
+      npmVersion: ${{ steps.versions.outputs.npmVersion }}
 
     steps:
-      - name: Checkout server
-        uses: actions/checkout@v3
+      - name: Checkout app
+        uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
 
       - name: Read package.json node and npm engines version
-        uses: skjnldsv/read-package-engines-version-actions@v1.2
+        uses: skjnldsv/read-package-engines-version-actions@0ce2ed60f6df073a62a77c0a4958dd0fc68e32e7 # v2.1
         id: versions
         with:
-          fallbackNode: "^12"
-          fallbackNpm: "^6"
+          fallbackNode: "^14"
+          fallbackNpm: "^7"
 
       - name: Set up node ${{ steps.versions.outputs.nodeVersion }}
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@64ed1c7eab4cce3362f8c340dee64e5eaeef8f7c # v3.6.0
         with:
-          cache: "npm"
+          cache: 'npm'
           node-version: ${{ steps.versions.outputs.nodeVersion }}
 
       - name: Set up npm ${{ steps.versions.outputs.npmVersion }}
@@ -44,10 +45,10 @@ jobs:
           TESTING=true npm run build --if-present
 
       - name: Save context
-        uses: actions/cache@v3
+        uses: actions/cache@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3.3.1
         with:
           key: cypress-context-${{ github.run_id }}
-          path: /home/runner/work/server
+          path: ./
 
   cypress:
     runs-on: ubuntu-latest
@@ -63,14 +64,24 @@ jobs:
 
     steps:
       - name: Restore context
-        uses: actions/cache@v3
+        uses: actions/cache@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3.3.1
         with:
+          fail-on-cache-miss: true
           key: cypress-context-${{ github.run_id }}
-          path: /home/runner/work/server
+          path: ./
 
-      - name: Run ${{ matrix.containers == 'component' && 'component' || 'E2E' }} cypress tests
+      - name: Set up node ${{ needs.init.outputs.nodeVersion }}
+        uses: actions/setup-node@64ed1c7eab4cce3362f8c340dee64e5eaeef8f7c # v3.6.0
+        with:
+          cache: 'npm'
+          node-version: ${{ needs.init.outputs.nodeVersion }}
 
-        uses: cypress-io/github-action@v5
+      - name: Set up npm ${{ needs.init.outputs.npmVersion }}
+        run: npm i -g npm@"${{ needs.init.outputs.npmVersion }}"
+
+
+      - name: Run ${{ matrix.containers == 'component' && 'component' || 'E2E' }} cypress tests
+        uses: cypress-io/github-action@db1693016f23ccf9043f4b2428f9b04e5d502a73 # v5.8.1
         with:
           record: true
           parallel: true
@@ -96,7 +107,7 @@ jobs:
         run: docker logs nextcloud-cypress-tests-server > nextcloud.log
 
       - name: Upload NC logs
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v3.1.2
         if: failure() && matrix.containers != 'component'
         with:
           name: nc_logs_${{ matrix.containers }}
@@ -107,7 +118,7 @@ jobs:
         run: docker exec nextcloud-cypress-tests-server tar -cvjf - data > data.tar
 
       - name: Upload data dir archive
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v3.1.2
         if: failure() && matrix.containers != 'component'
         with:
           name: nc_data_${{ matrix.containers }}

.htaccess

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

apps/cloud_federation_api/l10n/uk.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" : "Увімкніть хмари для спілкування один з одним і обміну даними",
-    "The Cloud Federation API enables various Nextcloud instances to communicate with each other and to exchange data." : "API Cloud Federation дозволяє різним примірникам Nextcloud спілкуватися один з одним і обмінюватися даними."
+    "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." : "Cloud Federation API дозволяє різним екземплярам 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/cloud_federation_api/l10n/uk.json

@@ -1,6 +1,6 @@
 { "translations": {
     "Cloud Federation API" : "Cloud Federation API",
-    "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." : "API Cloud Federation дозволяє різним примірникам Nextcloud спілкуватися один з одним і обмінюватися даними."
+    "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." : "Cloud Federation API дозволяє різним екземплярам 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/comments/l10n/fi.js

@@ -17,6 +17,7 @@ OC.L10N.register(
     "No comments yet, start the conversation!" : "Ei kommentteja vielä. Aloita keskustelu!",
     "No more messages" : "Ei enempää viestejä",
     "Retry" : "Yritä uudelleen",
+    "Failed to mark comments as read" : "Kommenttien merkitseminen luetuksi epäonnistui",
     "Unable to load the comments list" : "Kommenttilistaa ei voitu ladata",
     "_%n unread comment_::_%n unread comments_" : ["%n lukematon kommentti","%n lukematonta kommenttia"],
     "_1 new comment_::_{unread} new comments_" : ["1 uusi kommentti","{unread} uutta kommenttia"],

apps/comments/l10n/fi.json

@@ -15,6 +15,7 @@
     "No comments yet, start the conversation!" : "Ei kommentteja vielä. Aloita keskustelu!",
     "No more messages" : "Ei enempää viestejä",
     "Retry" : "Yritä uudelleen",
+    "Failed to mark comments as read" : "Kommenttien merkitseminen luetuksi epäonnistui",
     "Unable to load the comments list" : "Kommenttilistaa ei voitu ladata",
     "_%n unread comment_::_%n unread comments_" : ["%n lukematon kommentti","%n lukematonta kommenttia"],
     "_1 new comment_::_{unread} new comments_" : ["1 uusi kommentti","{unread} uutta kommenttia"],

apps/comments/l10n/hu.js

@@ -19,6 +19,7 @@ OC.L10N.register(
     "No comments yet, start the conversation!" : "Még nincsenek hozzászólások, kezdje el a beszélgetést!",
     "No more messages" : "Nincs több üzenet",
     "Retry" : "Újra",
+    "Failed to mark comments as read" : "A hozzászólások olvasottnak jelölése sikertelen",
     "Unable to load the comments list" : "A hozzászólások betöltése sikertelen",
     "_%n unread comment_::_%n unread comments_" : ["%n olvasatlan hozzászólás","%n olvasatlan hozzászólás"],
     "_1 new comment_::_{unread} new comments_" : ["1 új hozzászólás","{unread} új hozzászólás"],

apps/comments/l10n/hu.json

@@ -17,6 +17,7 @@
     "No comments yet, start the conversation!" : "Még nincsenek hozzászólások, kezdje el a beszélgetést!",
     "No more messages" : "Nincs több üzenet",
     "Retry" : "Újra",
+    "Failed to mark comments as read" : "A hozzászólások olvasottnak jelölése sikertelen",
     "Unable to load the comments list" : "A hozzászólások betöltése sikertelen",
     "_%n unread comment_::_%n unread comments_" : ["%n olvasatlan hozzászólás","%n olvasatlan hozzászólás"],
     "_1 new comment_::_{unread} new comments_" : ["1 új hozzászólás","{unread} új hozzászólás"],

apps/dashboard/l10n/ar.js

@@ -1,8 +1,8 @@
 OC.L10N.register(
     "dashboard",
     {
-    "Dashboard" : "لوحة التحكم",
-    "Dashboard app" : "تطبيق لوحة التحكم",
+    "Dashboard" : "الرئيسية",
+    "Dashboard app" : "تطبيق الصفحة الرئيسية",
     "Customize" : "تعديل",
     "Edit widgets" : "تعديل الودجات",
     "Weather service" : "خدمة احوال الطقس",

apps/dashboard/l10n/ar.json

@@ -1,6 +1,6 @@
 { "translations": {
-    "Dashboard" : "لوحة التحكم",
-    "Dashboard app" : "تطبيق لوحة التحكم",
+    "Dashboard" : "الرئيسية",
+    "Dashboard app" : "تطبيق الصفحة الرئيسية",
     "Customize" : "تعديل",
     "Edit widgets" : "تعديل الودجات",
     "Weather service" : "خدمة احوال الطقس",