Merge branch 'master' of https://github.com/e-foundation/server into …

…dav/classification-index Signed-off-by: Akhil <[email protected]>
nextcloud · Oct 19, 2023 · 57ec1fb · 57ec1fb
2 parents c5327f0 + a572a54
commit 57ec1fb
Show file tree

Hide file tree

Showing 4,335 changed files with 148,737 additions and 102,029 deletions.
diff --git a/.codecov.yml b/.codecov.yml
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
@@ -3,6 +3,7 @@
 	"dockerComposeFile": "docker-compose.yml",
 	"service": "nextclouddev",
 	"postCreateCommand": ".devcontainer/setup.sh",
+	"postStartCommand": ".devcontainer/postStart.sh",
 	"forwardPorts": [
 		80,
 		8080,

diff --git a/.devcontainer/postStart.sh b/.devcontainer/postStart.sh
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+# Set git safe.directory
+git config --global --add safe.directory /var/www/html
+git config --global --add safe.directory /var/www/html/3rdparty
diff --git a/.devcontainer/setup.sh b/.devcontainer/setup.sh
@@ -3,10 +3,6 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )/../" >/dev/null 2>&1 && pwd )"
 
 cd $DIR/
 
-# Set git safe.directory
-git config --global --add safe.directory /var/www/html
-git config --global --add safe.directory /var/www/html/3rdparty
-
 git submodule update --init
 
 # Codespace config

diff --git a/.drone.yml b/.drone.yml
@@ -1,3 +1,4 @@
+---
 kind: pipeline
 name: checkers
 
@@ -1590,126 +1591,6 @@ trigger:
     - pull_request
     - push
 
----
-kind: pipeline
-name: acceptance-app-files
-
-steps:
-- name: submodules
-  image: ghcr.io/nextcloud/continuous-integration-alpine-git:latest
-  commands:
-    - git submodule update --init
-- name: acceptance-app-files
-  image: ghcr.io/nextcloud/continuous-integration-acceptance-php8.0:latest
-  commands:
-    - tests/acceptance/run-local.sh --timeout-multiplier 10 --nextcloud-server-domain acceptance-app-files --selenium-server selenium:4444 allow-git-repository-modifications features/app-files.feature
-
-services:
-- name: selenium
-  image: ghcr.io/nextcloud/continuous-integration-selenium:3.141.59
-  environment:
-    # Reduce default log level for Selenium server (INFO) as it is too
-    # verbose.
-    JAVA_OPTS: -Dselenium.LOGGER.level=WARNING
-
-trigger:
-  branch:
-    - master
-    - stable*
-  event:
-    - pull_request
-    - push
-
----
-kind: pipeline
-name: acceptance-app-files-sharing
-
-steps:
-- name: submodules
-  image: ghcr.io/nextcloud/continuous-integration-alpine-git:latest
-  commands:
-    - git submodule update --init
-- name: acceptance-app-files-sharing
-  image: ghcr.io/nextcloud/continuous-integration-acceptance-php8.0:latest
-  commands:
-    - tests/acceptance/run-local.sh --timeout-multiplier 10 --nextcloud-server-domain acceptance-app-files-sharing --selenium-server selenium:4444 allow-git-repository-modifications features/app-files-sharing.feature
-
-services:
-- name: selenium
-  image: ghcr.io/nextcloud/continuous-integration-selenium:3.141.59
-  environment:
-    # Reduce default log level for Selenium server (INFO) as it is too
-    # verbose.
-    JAVA_OPTS: -Dselenium.LOGGER.level=WARNING
-
-trigger:
-  branch:
-    - master
-    - stable*
-  event:
-    - pull_request
-    - push
-
----
-kind: pipeline
-name: acceptance-app-files-sharing-link
-
-steps:
-- name: submodules
-  image: ghcr.io/nextcloud/continuous-integration-alpine-git:latest
-  commands:
-    - git submodule update --init
-- name: acceptance-app-files-sharing-link
-  image: ghcr.io/nextcloud/continuous-integration-acceptance-php8.0:latest
-  commands:
-    - tests/acceptance/run-local.sh --timeout-multiplier 10 --nextcloud-server-domain acceptance-app-files-sharing-link --selenium-server selenium:4444 allow-git-repository-modifications features/app-files-sharing-link.feature
-
-services:
-- name: selenium
-  image: ghcr.io/nextcloud/continuous-integration-selenium:3.141.59
-  environment:
-    # Reduce default log level for Selenium server (INFO) as it is too
-    # verbose.
-    JAVA_OPTS: -Dselenium.LOGGER.level=WARNING
-
-trigger:
-  branch:
-    - master
-    - stable*
-  event:
-    - pull_request
-    - push
-
----
-kind: pipeline
-name: acceptance-app-files-tags
-
-steps:
-- name: submodules
-  image: ghcr.io/nextcloud/continuous-integration-alpine-git:latest
-  commands:
-    - git submodule update --init
-- name: acceptance-app-files-tags
-  image: ghcr.io/nextcloud/continuous-integration-acceptance-php8.0:latest
-  commands:
-    - tests/acceptance/run-local.sh --timeout-multiplier 10 --nextcloud-server-domain acceptance-app-files-tags --selenium-server selenium:4444 allow-git-repository-modifications features/app-files-tags.feature
-
-services:
-- name: selenium
-  image: ghcr.io/nextcloud/continuous-integration-selenium:3.141.59
-  environment:
-    # Reduce default log level for Selenium server (INFO) as it is too
-    # verbose.
-    JAVA_OPTS: -Dselenium.LOGGER.level=WARNING
-
-trigger:
-  branch:
-    - master
-    - stable*
-  event:
-    - pull_request
-    - push
-
 ---
 kind: pipeline
 name: acceptance-header
@@ -1995,3 +1876,6 @@ trigger:
   event:
     - pull_request
     - push
+---
+kind: signature
+hmac: 6814dc276b076a391796f3639b27499592e974db8e5e7a4043a120ce215b78cd
diff --git a/.editorconfig b/.editorconfig
@@ -24,6 +24,14 @@ trim_trailing_whitespace = false
 [*.svg]
 insert_final_newline = false
 
+[package*.json]
+indent_size = 2
+indent_style = space
+
 [build/psalm-baseline.xml]
 indent_size = 2
 indent_style = space
+
+[config/*config.php]
+indent_size = 2
+indent_style = space
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -3,21 +3,18 @@ module.exports = {
 		__webpack_nonce__: true,
 		_: true,
 		$: true,
-		moment: true,
-		escapeHTML: true,
-		oc_userconfig: true,
 		dayNames: true,
+		escapeHTML: true,
 		firstDay: true,
-		'cypress/globals': true,
-	},
-	parserOptions: {
-		parser: '@typescript-eslint/parser',
+		moment: true,
+		oc_userconfig: true,
+		sinon: true,
 	},
 	plugins: [
 		'cypress',
 	],
 	extends: [
-		'@nextcloud',
+		'@nextcloud/eslint-config/typescript',
 		'plugin:cypress/recommended',
 	],
 	rules: {

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -8,15 +8,17 @@
 /apps/dav/lib/CardDAV                         @ChristophWurst @miaulalala @tcitworld
 /apps/encryption/appinfo/info.xml             @come-nc @icewind1991
 /apps/federatedfilesharing/appinfo/info.xml   @icewind1991 @danxuliu
-/apps/federation/appinfo/info.xml             @vitormattos @datenangebot
+/apps/federation/appinfo/info.xml             @datenangebot
 /apps/files/appinfo/info.xml                  @skjnldsv @Pytal @ArtificialOwl @come-nc @artonge @icewind1991 @szaimen @susnux @Fenn-CS
 /apps/files_external/appinfo/info.xml         @icewind1991 @artonge
+/apps/files_reminders/appinfo/info.xml        @Pytal
 /apps/files_sharing/appinfo/info.xml          @skjnldsv @come-nc
 /apps/files_trashbin/appinfo/info.xml         @Pytal @icewind1991
 /apps/files_versions/appinfo/info.xml         @artonge @icewind1991
 /apps/oauth2/appinfo/info.xml                 @julien-nc @ChristophWurst
 /apps/provisioning_api/appinfo/info.xml       @provokateurin @nickvergessen
 /apps/settings/appinfo/info.xml               @Pytal @JuliaKirschenheuter
+/apps/sharebymail/appinfo/info.xml            @Altahrim
 /apps/systemtags/appinfo/info.xml             @Antreesy @marcelklehr
 /apps/theming/appinfo/info.xml                @skjnldsv @juliushaertl
 /apps/twofactor_backupcodes/appinfo/info.xml  @st3iny @miaulalala @ChristophWurst
@@ -28,12 +30,31 @@
 
 # Security team
 /resources/config/ca-bundle.crt     @ChristophWurst @miaulalala @nickvergessen
+/.drone.yml                         @nickvergessen
 
 # Two-Factor Authentication
 # https://github.com/nextcloud/wg-two-factor-authentication#members
-/apps/twofactor_backupcodes         @ChristophWurst @miaulalala @nickvergessen
-*/TwoFactorAuth/*                   @ChristophWurst @miaulalala @nickvergessen
-/core/templates/twofactor*          @ChristophWurst @miaulalala @nickvergessen
+**/TwoFactorAuth                    @ChristophWurst @miaulalala @nickvergessen @st3iny
+/apps/twofactor_backupcodes         @ChristophWurst @miaulalala @nickvergessen @st3iny
+/core/templates/twofactor*          @ChristophWurst @miaulalala @nickvergessen @st3iny
+
+# Limit login to IP
+# Watch login routes for https://github.com/nextcloud/limit_login_to_ip
+/core/routes.php	@Altahrim
+
+# OpenAPI
+openapi.json            @provokateurin
+ResponseDefinitions.php @provokateurin
+
+# Talk team
+/lib/private/Comments               @nickvergessen
+/lib/private/Federation             @nickvergessen
+/lib/private/Talk                   @nickvergessen
+/lib/public/Comments                @nickvergessen
+/lib/public/Federation              @nickvergessen
+/lib/public/OCM                     @nickvergessen
+/lib/public/Talk                    @nickvergessen
+/lib/public/UserStatus              @nickvergessen
 
 # Personal interest
 */Activity/*                        @nickvergessen

diff --git a/.github/ISSUE_TEMPLATE/BUG_REPORT.yml b/.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
@@ -62,14 +60,14 @@ body:
         Select installation method you've used.
         _Describe the method in the "Additional info" section if you chose "Other"._
       options:
-        - "Official All-in-One appliance"
         - "Community Web installer on a VPS or web space"
         - "Community Manual installation with Archive"
         - "Community Docker image"
         - "Community NextcloudPi appliance"
         - "Community SNAP package"
         - "Community VM appliance"
         - "Other Community project"
+        - "Official All-in-One appliance"
   - type: dropdown
     id: nextcloud-version
     attributes:
@@ -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:

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -171,3 +171,12 @@ updates:
     # ignore all GitHub linguist patch updates
     - dependency-name: "*"
       update-types: ["version-update:semver-major", "version-update:semver-minor", "version-update:semver-patch"]
+
+# GitHub Actions
+- package-ecosystem: "github-actions"
+  directory: "/"
+  schedule:
+    interval: weekly
+    day: saturday
+    time: "03:00"
+    timezone: Europe/Paris