Skip to content

Commit 57ec1fb

Browse files
committed
Merge branch 'master' of https://github.com/e-foundation/server into dav/classification-index
Signed-off-by: Akhil <[email protected]>
2 parents c5327f0 + a572a54 commit 57ec1fb

File tree

4,335 files changed

+148737
-102029
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

4,335 files changed

+148737
-102029
lines changed

.codecov.yml

Lines changed: 0 additions & 15 deletions
This file was deleted.

.devcontainer/devcontainer.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
"dockerComposeFile": "docker-compose.yml",
44
"service": "nextclouddev",
55
"postCreateCommand": ".devcontainer/setup.sh",
6+
"postStartCommand": ".devcontainer/postStart.sh",
67
"forwardPorts": [
78
80,
89
8080,

.devcontainer/postStart.sh

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
#!/bin/bash
2+
3+
# Set git safe.directory
4+
git config --global --add safe.directory /var/www/html
5+
git config --global --add safe.directory /var/www/html/3rdparty

.devcontainer/setup.sh

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,6 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )/../" >/dev/null 2>&1 && pwd )"
33

44
cd $DIR/
55

6-
# Set git safe.directory
7-
git config --global --add safe.directory /var/www/html
8-
git config --global --add safe.directory /var/www/html/3rdparty
9-
106
git submodule update --init
117

128
# Codespace config

.drone.yml

Lines changed: 4 additions & 120 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
---
12
kind: pipeline
23
name: checkers
34

@@ -1590,126 +1591,6 @@ trigger:
15901591
- pull_request
15911592
- push
15921593

1593-
---
1594-
kind: pipeline
1595-
name: acceptance-app-files
1596-
1597-
steps:
1598-
- name: submodules
1599-
image: ghcr.io/nextcloud/continuous-integration-alpine-git:latest
1600-
commands:
1601-
- git submodule update --init
1602-
- name: acceptance-app-files
1603-
image: ghcr.io/nextcloud/continuous-integration-acceptance-php8.0:latest
1604-
commands:
1605-
- 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
1606-
1607-
services:
1608-
- name: selenium
1609-
image: ghcr.io/nextcloud/continuous-integration-selenium:3.141.59
1610-
environment:
1611-
# Reduce default log level for Selenium server (INFO) as it is too
1612-
# verbose.
1613-
JAVA_OPTS: -Dselenium.LOGGER.level=WARNING
1614-
1615-
trigger:
1616-
branch:
1617-
- master
1618-
- stable*
1619-
event:
1620-
- pull_request
1621-
- push
1622-
1623-
---
1624-
kind: pipeline
1625-
name: acceptance-app-files-sharing
1626-
1627-
steps:
1628-
- name: submodules
1629-
image: ghcr.io/nextcloud/continuous-integration-alpine-git:latest
1630-
commands:
1631-
- git submodule update --init
1632-
- name: acceptance-app-files-sharing
1633-
image: ghcr.io/nextcloud/continuous-integration-acceptance-php8.0:latest
1634-
commands:
1635-
- 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
1636-
1637-
services:
1638-
- name: selenium
1639-
image: ghcr.io/nextcloud/continuous-integration-selenium:3.141.59
1640-
environment:
1641-
# Reduce default log level for Selenium server (INFO) as it is too
1642-
# verbose.
1643-
JAVA_OPTS: -Dselenium.LOGGER.level=WARNING
1644-
1645-
trigger:
1646-
branch:
1647-
- master
1648-
- stable*
1649-
event:
1650-
- pull_request
1651-
- push
1652-
1653-
---
1654-
kind: pipeline
1655-
name: acceptance-app-files-sharing-link
1656-
1657-
steps:
1658-
- name: submodules
1659-
image: ghcr.io/nextcloud/continuous-integration-alpine-git:latest
1660-
commands:
1661-
- git submodule update --init
1662-
- name: acceptance-app-files-sharing-link
1663-
image: ghcr.io/nextcloud/continuous-integration-acceptance-php8.0:latest
1664-
commands:
1665-
- 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
1666-
1667-
services:
1668-
- name: selenium
1669-
image: ghcr.io/nextcloud/continuous-integration-selenium:3.141.59
1670-
environment:
1671-
# Reduce default log level for Selenium server (INFO) as it is too
1672-
# verbose.
1673-
JAVA_OPTS: -Dselenium.LOGGER.level=WARNING
1674-
1675-
trigger:
1676-
branch:
1677-
- master
1678-
- stable*
1679-
event:
1680-
- pull_request
1681-
- push
1682-
1683-
---
1684-
kind: pipeline
1685-
name: acceptance-app-files-tags
1686-
1687-
steps:
1688-
- name: submodules
1689-
image: ghcr.io/nextcloud/continuous-integration-alpine-git:latest
1690-
commands:
1691-
- git submodule update --init
1692-
- name: acceptance-app-files-tags
1693-
image: ghcr.io/nextcloud/continuous-integration-acceptance-php8.0:latest
1694-
commands:
1695-
- 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
1696-
1697-
services:
1698-
- name: selenium
1699-
image: ghcr.io/nextcloud/continuous-integration-selenium:3.141.59
1700-
environment:
1701-
# Reduce default log level for Selenium server (INFO) as it is too
1702-
# verbose.
1703-
JAVA_OPTS: -Dselenium.LOGGER.level=WARNING
1704-
1705-
trigger:
1706-
branch:
1707-
- master
1708-
- stable*
1709-
event:
1710-
- pull_request
1711-
- push
1712-
17131594
---
17141595
kind: pipeline
17151596
name: acceptance-header
@@ -1995,3 +1876,6 @@ trigger:
19951876
event:
19961877
- pull_request
19971878
- push
1879+
---
1880+
kind: signature
1881+
hmac: 6814dc276b076a391796f3639b27499592e974db8e5e7a4043a120ce215b78cd

.editorconfig

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,14 @@ trim_trailing_whitespace = false
2424
[*.svg]
2525
insert_final_newline = false
2626

27+
[package*.json]
28+
indent_size = 2
29+
indent_style = space
30+
2731
[build/psalm-baseline.xml]
2832
indent_size = 2
2933
indent_style = space
34+
35+
[config/*config.php]
36+
indent_size = 2
37+
indent_style = space

.eslintrc.js

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,21 +3,18 @@ module.exports = {
33
__webpack_nonce__: true,
44
_: true,
55
$: true,
6-
moment: true,
7-
escapeHTML: true,
8-
oc_userconfig: true,
96
dayNames: true,
7+
escapeHTML: true,
108
firstDay: true,
11-
'cypress/globals': true,
12-
},
13-
parserOptions: {
14-
parser: '@typescript-eslint/parser',
9+
moment: true,
10+
oc_userconfig: true,
11+
sinon: true,
1512
},
1613
plugins: [
1714
'cypress',
1815
],
1916
extends: [
20-
'@nextcloud',
17+
'@nextcloud/eslint-config/typescript',
2118
'plugin:cypress/recommended',
2219
],
2320
rules: {

.github/CODEOWNERS

Lines changed: 25 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,17 @@
88
/apps/dav/lib/CardDAV @ChristophWurst @miaulalala @tcitworld
99
/apps/encryption/appinfo/info.xml @come-nc @icewind1991
1010
/apps/federatedfilesharing/appinfo/info.xml @icewind1991 @danxuliu
11-
/apps/federation/appinfo/info.xml @vitormattos @datenangebot
11+
/apps/federation/appinfo/info.xml @datenangebot
1212
/apps/files/appinfo/info.xml @skjnldsv @Pytal @ArtificialOwl @come-nc @artonge @icewind1991 @szaimen @susnux @Fenn-CS
1313
/apps/files_external/appinfo/info.xml @icewind1991 @artonge
14+
/apps/files_reminders/appinfo/info.xml @Pytal
1415
/apps/files_sharing/appinfo/info.xml @skjnldsv @come-nc
1516
/apps/files_trashbin/appinfo/info.xml @Pytal @icewind1991
1617
/apps/files_versions/appinfo/info.xml @artonge @icewind1991
1718
/apps/oauth2/appinfo/info.xml @julien-nc @ChristophWurst
1819
/apps/provisioning_api/appinfo/info.xml @provokateurin @nickvergessen
1920
/apps/settings/appinfo/info.xml @Pytal @JuliaKirschenheuter
21+
/apps/sharebymail/appinfo/info.xml @Altahrim
2022
/apps/systemtags/appinfo/info.xml @Antreesy @marcelklehr
2123
/apps/theming/appinfo/info.xml @skjnldsv @juliushaertl
2224
/apps/twofactor_backupcodes/appinfo/info.xml @st3iny @miaulalala @ChristophWurst
@@ -28,12 +30,31 @@
2830

2931
# Security team
3032
/resources/config/ca-bundle.crt @ChristophWurst @miaulalala @nickvergessen
33+
/.drone.yml @nickvergessen
3134

3235
# Two-Factor Authentication
3336
# https://github.com/nextcloud/wg-two-factor-authentication#members
34-
/apps/twofactor_backupcodes @ChristophWurst @miaulalala @nickvergessen
35-
*/TwoFactorAuth/* @ChristophWurst @miaulalala @nickvergessen
36-
/core/templates/twofactor* @ChristophWurst @miaulalala @nickvergessen
37+
**/TwoFactorAuth @ChristophWurst @miaulalala @nickvergessen @st3iny
38+
/apps/twofactor_backupcodes @ChristophWurst @miaulalala @nickvergessen @st3iny
39+
/core/templates/twofactor* @ChristophWurst @miaulalala @nickvergessen @st3iny
40+
41+
# Limit login to IP
42+
# Watch login routes for https://github.com/nextcloud/limit_login_to_ip
43+
/core/routes.php @Altahrim
44+
45+
# OpenAPI
46+
openapi.json @provokateurin
47+
ResponseDefinitions.php @provokateurin
48+
49+
# Talk team
50+
/lib/private/Comments @nickvergessen
51+
/lib/private/Federation @nickvergessen
52+
/lib/private/Talk @nickvergessen
53+
/lib/public/Comments @nickvergessen
54+
/lib/public/Federation @nickvergessen
55+
/lib/public/OCM @nickvergessen
56+
/lib/public/Talk @nickvergessen
57+
/lib/public/UserStatus @nickvergessen
3758

3859
# Personal interest
3960
*/Activity/* @nickvergessen

.github/ISSUE_TEMPLATE/BUG_REPORT.yml

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,10 @@ body:
1717
options:
1818
- label: This is a **bug**, not a question or a configuration/webserver/proxy issue.
1919
required: true
20-
- label: This issue is **not** already reported on Github _(I've searched it)_.
20+
- 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)_.
2121
required: true
2222
- 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.
2323
required: true
24-
- label: Nextcloud Server **is** running on 64bit capable CPU, PHP and OS.
25-
required: true
2624
- label: I agree to follow Nextcloud's [Code of Conduct](https://nextcloud.com/contribute/code-of-conduct/).
2725
required: true
2826
- type: textarea
@@ -62,14 +60,14 @@ body:
6260
Select installation method you've used.
6361
_Describe the method in the "Additional info" section if you chose "Other"._
6462
options:
65-
- "Official All-in-One appliance"
6663
- "Community Web installer on a VPS or web space"
6764
- "Community Manual installation with Archive"
6865
- "Community Docker image"
6966
- "Community NextcloudPi appliance"
7067
- "Community SNAP package"
7168
- "Community VM appliance"
7269
- "Other Community project"
70+
- "Official All-in-One appliance"
7371
- type: dropdown
7472
id: nextcloud-version
7573
attributes:
@@ -78,9 +76,9 @@ body:
7876
Select Nextcloud Server version.
7977
_Versions not listed here are not maintained and not supported anymore_
8078
options:
81-
- "24"
8279
- "25"
8380
- "26"
81+
- "27"
8482
- "master"
8583
validations:
8684
required: true
@@ -103,10 +101,10 @@ body:
103101
Select PHP engine version serving Nextcloud Server.
104102
_Describe in the "Additional info" section if you chose "Other"._
105103
options:
106-
- "PHP 7.3"
107104
- "PHP 7.4"
108105
- "PHP 8.0"
109106
- "PHP 8.1"
107+
- "PHP 8.2"
110108
- "Other"
111109
- type: dropdown
112110
id: webserver
@@ -118,7 +116,6 @@ body:
118116
options:
119117
- "Apache (supported)"
120118
- "Nginx"
121-
- "Lighttpd"
122119
- "Other"
123120
- type: dropdown
124121
id: database
@@ -141,8 +138,8 @@ body:
141138
description: |
142139
Select if bug is present after an update or on a fresh install.
143140
options:
144-
- "Updated from a minor version (ex. 22.2.3 to 22.2.4)"
145-
- "Updated to a major version (ex. 22.2.3 to 23.0.1)"
141+
- "Updated from a MINOR version (ex. 22.1 to 22.2)"
142+
- "Upgraded to a MAJOR version (ex. 22 to 23)"
146143
- "Fresh Nextcloud Server install"
147144
- type: dropdown
148145
id: encryption
@@ -192,8 +189,6 @@ body:
192189
```
193190
> NOTE: This will be automatically formatted into code for better readability.
194191
render: shell
195-
validations:
196-
required: true
197192
- type: textarea
198193
id: nextcloud-signingstatus
199194
attributes:

.github/dependabot.yml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -171,3 +171,12 @@ updates:
171171
# ignore all GitHub linguist patch updates
172172
- dependency-name: "*"
173173
update-types: ["version-update:semver-major", "version-update:semver-minor", "version-update:semver-patch"]
174+
175+
# GitHub Actions
176+
- package-ecosystem: "github-actions"
177+
directory: "/"
178+
schedule:
179+
interval: weekly
180+
day: saturday
181+
time: "03:00"
182+
timezone: Europe/Paris

0 commit comments

Comments
 (0)