Skip to content

Commit e7c9074

Browse files
authored
Merge branch 'nextcloud:master' into master
2 parents f1dd2bd + 4b19e84 commit e7c9074

File tree

6,470 files changed

+170338
-168549
lines changed

Some content is hidden

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

6,470 files changed

+170338
-168549
lines changed

.devcontainer/Dockerfile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,9 @@ RUN { \
5252
echo "xdebug.start_with_request=yes"; \
5353
} >> /etc/php/8.3/apache2/conf.d/20-xdebug.ini
5454

55+
# Increase PHP memory limit to 512mb
56+
RUN sed -i 's/memory_limit = .*/memory_limit = 512M/' /etc/php/8.3/apache2/php.ini
57+
5558
# Docker
5659
RUN apt-get -y install \
5760
apt-transport-https \

.eslintrc.js

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,4 +36,13 @@ module.exports = {
3636
mode: 'typescript',
3737
},
3838
},
39+
overrides: [
40+
// Allow any in tests
41+
{
42+
files: ['**/*.spec.ts'],
43+
rules: {
44+
'@typescript-eslint/no-explicit-any': 'warn',
45+
},
46+
}
47+
],
3948
}

.git-blame-ignore-revs

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
# .git-blame-ignore-revs
2+
3+
# SPDX-FileCopyrightText: 2024 Nextcloud GmbH and Nextcloud contributors
4+
# SPDX-License-Identifier: AGPL-3.0-or-later
5+
6+
# Format control structures
7+
caff1023ea72bb2ea94130e18a2a6e2ccf819e5f
8+
# Update to coding-standard 1.1.1
9+
aa5f037af71c915424c6dcfd5ad2dc82797dc0d6
10+
# Update to coding-standard 1.2.3
11+
af6de04e9e141466dc229e444ff3f146f4a34765
12+
0bd284cb81b6866338aaaa67aa1d81ef9bfbb2ab
13+
8af7ecb2576071f170ecbb0aa2311b26581e40e2
14+
# Update to coding-standard 1.3.1
15+
9836e9b16484582d309c8437ab46d82e34956941
16+
# Automated refactorings
17+
49dd79eabb2b8902559a7a4e8f8fcad54f46b604

.github/CODEOWNERS

Lines changed: 18 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,15 @@
11
# App maintainers
22
/apps/admin_audit/appinfo/info.xml @luka-nextcloud @blizzz
33
/apps/cloud_federation_api/appinfo/info.xml @mejo-
4-
/apps/comments/appinfo/info.xml @marcelklehr @Pytal
5-
/apps/contactsinteraction/appinfo/info.xml @kesselb @miaulalala @ChristophWurst @GretaD @hamza221 @st3iny
6-
/apps/dashboard/appinfo/info.xml @julien-nc @juliushaertl
7-
/apps/dav/lib/CalDAV @ChristophWurst @miaulalala @tcitworld
8-
/apps/dav/lib/CardDAV @ChristophWurst @miaulalala @tcitworld
4+
/apps/comments/appinfo/info.xml @edward-ly @Pytal
5+
/apps/contactsinteraction/appinfo/info.xml @kesselb @SebastianKrupinski
6+
/apps/contactsinteraction/lib @kesselb @SebastianKrupinski
7+
/apps/contactsinteraction/tests @kesselb @SebastianKrupinski
8+
/apps/dashboard/appinfo/info.xml @julien-nc @juliusknorr
9+
/apps/dav/lib/CalDAV @miaulalala @st3iny @SebastianKrupinski
10+
/apps/dav/lib/CardDAV @miaulalala @st3iny @SebastianKrupinski
11+
/apps/dav/tests/unit/CalDAV @miaulalala @st3iny @SebastianKrupinski
12+
/apps/dav/tests/unit/CardDAV @miaulalala @st3iny @SebastianKrupinski
913
/apps/encryption/appinfo/info.xml @come-nc @icewind1991
1014
/apps/federatedfilesharing/appinfo/info.xml @icewind1991 @danxuliu
1115
/apps/federation/appinfo/info.xml @datenangebot
@@ -20,13 +24,14 @@
2024
/apps/settings/appinfo/info.xml @Pytal @JuliaKirschenheuter
2125
/apps/sharebymail/appinfo/info.xml @Altahrim
2226
/apps/systemtags/appinfo/info.xml @Antreesy @marcelklehr
23-
/apps/theming/appinfo/info.xml @skjnldsv @juliushaertl
27+
/apps/theming/appinfo/info.xml @skjnldsv @juliusknorr
2428
/apps/twofactor_backupcodes/appinfo/info.xml @st3iny @miaulalala @ChristophWurst
2529
/apps/updatenotification/appinfo/info.xml @Pytal @JuliaKirschenheuter
2630
/apps/user_ldap/appinfo/info.xml @come-nc @blizzz
2731
/apps/user_status/appinfo/info.xml @Antreesy @nickvergessen
28-
/apps/weather_status/appinfo/info.xml @julien-nc @juliushaertl
29-
/apps/workflowengine/appinfo/info.xml @blizzz @juliushaertl
32+
/apps/weather_status/appinfo/info.xml @julien-nc @juliusknorr
33+
/apps/webhook_listeners/appinfo/info.xml @come-nc @julien-nc
34+
/apps/workflowengine/appinfo/info.xml @blizzz @juliusknorr
3035

3136
# Frontend expertise
3237
/apps/files/src* @skjnldsv
@@ -36,9 +41,9 @@
3641
/apps/files_trashbin/src* @skjnldsv
3742

3843
# Security team
44+
/build/psalm-baseline-security.xml @nickvergessen
3945
/resources/codesigning @mgallien @miaulalala @nickvergessen
4046
/resources/config/ca-bundle.crt @ChristophWurst @miaulalala @nickvergessen
41-
/.drone.yml @nickvergessen
4247

4348
# Two-Factor Authentication
4449
# https://github.com/nextcloud/wg-two-factor-authentication#members
@@ -64,6 +69,10 @@ ResponseDefinitions.php @provokateurin
6469
/lib/public/Talk @nickvergessen
6570
/lib/public/UserStatus @nickvergessen
6671

72+
# Groupware
73+
/build/integration/dav_features/caldav.feature @miaulalala @st3iny @SebastianKrupinski
74+
/build/integration/dav_features/carddav.feature @miaulalala @st3iny @SebastianKrupinski
75+
6776
# Personal interest
6877
*/Activity/* @nickvergessen
6978
*/Notifications/* @nickvergessen

.github/CONTRIBUTING.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
-->
55
## Submitting issues
66

7-
If you have questions about how to install or use Nextcloud, please direct these to our [forum][forum]. We are also available on [IRC][irc].
7+
If you have questions about how to install or use Nextcloud, please direct these to our [forum][forum]. We are also available on [IRC][irc] (unofficial).
88

99
### Short version
1010

@@ -25,7 +25,7 @@ Help us to maximize the effort we can spend fixing issues and adding new feature
2525

2626
[templates]: ./ISSUE_TEMPLATE
2727
[forum]: https://help.nextcloud.com/
28-
[irc]: https://webchat.freenode.net/?channels=nextcloud
28+
[irc]: https://web.libera.chat/#nextcloud
2929

3030
## Contributing to Source Code
3131

@@ -48,7 +48,7 @@ In some areas unit testing is hard (aka almost impossible) as of today - in thes
4848

4949
### Sign your work
5050

51-
We use the Developer Certificate of Origin (DCO) as a additional safeguard
51+
We use the Developer Certificate of Origin (DCO) as an additional safeguard
5252
for the Nextcloud project. This is a well established and widely used
5353
mechanism to assure contributors have confirmed their right to license
5454
their contribution under the project's license.

.github/ISSUE_TEMPLATE/BUG_REPORT.yml

Lines changed: 8 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -62,22 +62,6 @@ body:
6262
description: Describe what you expected to happen instead.
6363
validations:
6464
required: true
65-
- type: dropdown
66-
id: install-method
67-
attributes:
68-
label: Installation method
69-
description: |
70-
Select installation method you've used.
71-
_Describe the method in the "Additional info" section if you chose "Other"._
72-
options:
73-
- "Community Web installer on a VPS or web space"
74-
- "Community Manual installation with Archive"
75-
- "Community Docker image"
76-
- "Community NextcloudPi appliance"
77-
- "Community SNAP package"
78-
- "Community VM appliance"
79-
- "Other Community project"
80-
- "Official All-in-One appliance"
8165
- type: dropdown
8266
id: nextcloud-version
8367
attributes:
@@ -88,6 +72,7 @@ body:
8872
options:
8973
- "28"
9074
- "29"
75+
- "30"
9176
- "master"
9277
validations:
9378
required: true
@@ -110,10 +95,10 @@ body:
11095
Select PHP engine version serving Nextcloud Server.
11196
_Describe in the "Additional info" section if you chose "Other"._
11297
options:
113-
- "PHP 8.0"
114-
- "PHP 8.1"
115-
- "PHP 8.2"
11698
- "PHP 8.3"
99+
- "PHP 8.2"
100+
- "PHP 8.1"
101+
- "PHP 8.0"
117102
- "Other"
118103
- type: dropdown
119104
id: webserver
@@ -183,7 +168,7 @@ body:
183168
./occ config:list system
184169
```
185170
> NOTE: This will be automatically formatted into code for better readability.
186-
render: shell
171+
render: json
187172
- type: textarea
188173
id: apps
189174
attributes:
@@ -215,10 +200,10 @@ body:
215200
attributes:
216201
label: Nextcloud Logs
217202
description: |
218-
Provide Nextcloud logs lines.
219-
Copy all contents from `data/nextcloud.log` or a RAW from `/settings/admin/logging` section:
203+
Provide relevant Nextcloud log entries (e.g. from the time period you reproduced the problem).
204+
Copy full individual entries from `data/nextcloud.log` or use `Copy raw entry` from `/settings/admin/logging` section:
220205
> NOTE: This will be automatically formatted into code for better readability.
221-
render: shell
206+
render: json
222207
- type: textarea
223208
id: additional-info
224209
attributes:

.github/dependabot.yml

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,20 @@ updates:
5959
reviewers:
6060
- "nextcloud/server-dependabot"
6161

62+
# phpunit
63+
- package-ecosystem: composer
64+
directory: "/vendor-bin/phpunit"
65+
schedule:
66+
interval: weekly
67+
day: saturday
68+
time: "04:40"
69+
timezone: Europe/Madrid
70+
labels:
71+
- "3. to review"
72+
- "feature: dependencies"
73+
reviewers:
74+
- "nextcloud/server-dependabot"
75+
6276
# Main master npm
6377
- package-ecosystem: npm
6478
directory: "/"
@@ -138,6 +152,25 @@ updates:
138152
# Disable automatic rebasing because without a build CI will likely fail anyway
139153
rebase-strategy: "disabled"
140154

155+
- package-ecosystem: npm
156+
directory: "/"
157+
schedule:
158+
interval: weekly
159+
day: saturday
160+
time: "03:00"
161+
timezone: Europe/Paris
162+
target-branch: stable30
163+
labels:
164+
- "3. to review"
165+
- "feature: dependencies"
166+
reviewers:
167+
- "nextcloud/server-dependabot"
168+
ignore:
169+
- dependency-name: "*"
170+
update-types: ["version-update:semver-major", "version-update:semver-minor"]
171+
# Disable automatic rebasing because without a build CI will likely fail anyway
172+
rebase-strategy: "disabled"
173+
141174
- package-ecosystem: composer
142175
directory: "/build/integration"
143176
schedule:
@@ -174,6 +207,24 @@ updates:
174207
- dependency-name: "*"
175208
update-types: ["version-update:semver-major", "version-update:semver-minor", "version-update:semver-patch"]
176209

210+
- package-ecosystem: composer
211+
directory: "/build/integration"
212+
schedule:
213+
interval: weekly
214+
day: saturday
215+
time: "03:00"
216+
timezone: Europe/Paris
217+
target-branch: stable30
218+
labels:
219+
- "3. to review"
220+
- "feature: dependencies"
221+
reviewers:
222+
- "nextcloud/server-dependabot"
223+
ignore:
224+
# ignore all GitHub linguist patch updates
225+
- dependency-name: "*"
226+
update-types: ["version-update:semver-major", "version-update:semver-minor", "version-update:semver-patch"]
227+
177228
# GitHub Actions
178229
- package-ecosystem: "github-actions"
179230
directory: "/"

.github/workflows/autocheckers.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,21 +45,21 @@ jobs:
4545

4646
strategy:
4747
matrix:
48-
php-versions: ['8.3']
48+
php-versions: ['8.1']
4949

5050
name: PHP checkers
5151

5252
steps:
5353
- name: Checkout server
54-
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332
54+
uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938
5555
with:
5656
submodules: true
5757

5858
- name: Set up php ${{ matrix.php-versions }}
59-
uses: shivammathur/setup-php@2e947f1f6932d141d076ca441d0e1e881775e95b #v2.31.0
59+
uses: shivammathur/setup-php@c541c155eee45413f5b09a52248675b1a2575231 #v2.31.1
6060
with:
6161
php-version: ${{ matrix.php-versions }}
62-
extensions: ctype, json, mbstring
62+
extensions: bz2, ctype, curl, dom, fileinfo, gd, iconv, intl, json, libxml, mbstring, openssl, pcntl, posix, session, simplexml, xmlreader, xmlwriter, zip, zlib, sqlite, pdo_sqlite
6363
coverage: none
6464
ini-file: development
6565
env:

.github/workflows/block-outdated-3rdparty.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
- 'version.php'
3232
3333
- name: Checkout
34-
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
34+
uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
3535

3636
- name: 3rdparty commit hash on current branch
3737
id: actual

.github/workflows/block-unconventional-commits.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727

2828
steps:
2929
- name: Checkout
30-
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
30+
uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
3131

3232
- uses: webiny/action-conventional-commits@8bc41ff4e7d423d56fa4905f6ff79209a78776c7 # v1.3.0
3333
with:

0 commit comments

Comments
 (0)