Compare commits

...

9 Commits

Author SHA1 Message Date
Joas Schilling eee5f28eb5
Merge pull request #54868 from nextcloud/backport/54858/stable32
[stable32] fix(security): Update Expires time
2025-09-04 11:32:16 +07:00
Joas Schilling 92dc7a8416 fix(security): Update Expires time
Signed-off-by: Joas Schilling <coding@schilljs.com>
2025-09-04 09:32:00 +07:00
Benjamin Gaussorgues e5aae19cbb
Merge pull request #54864 from nextcloud/release/32.0.0_rc1 2025-09-04 11:29:55 +07:00
Joas Schilling 038196a82c
Merge pull request #54862 from nextcloud/branchoff/welcome-stable32
[stable32] Welcome stable32
2025-09-04 11:28:12 +07:00
Worker Builder 4c14af3859
build(hub): 32.0.0 RC1
Signed-off-by: Worker Builder <worker-builder@nextcloud.com>
2025-09-04 09:23:51 +07:00
Joas Schilling 394d5e2b1d
chore: Update 3rdparty/ commit hash
Signed-off-by: Joas Schilling <coding@schilljs.com>
2025-09-04 11:11:11 +07:00
Joas Schilling 595971729e
fix: Adjust branch name in server files
Signed-off-by: Joas Schilling <coding@schilljs.com>
2025-09-04 11:04:57 +07:00
Joas Schilling f296af3066
ci: Adjust branches of apps used in tests
Signed-off-by: Joas Schilling <coding@schilljs.com>
2025-09-04 11:03:04 +07:00
Joas Schilling 82aecde85d
build: Adjust checkout branch script
Signed-off-by: Joas Schilling <coding@schilljs.com>
2025-09-04 11:02:01 +07:00
9 changed files with 18 additions and 18 deletions

@ -74,8 +74,8 @@ jobs:
- 'videoverification_features'
php-versions: ['8.1']
spreed-versions: ['main']
activity-versions: ['master']
spreed-versions: ['stable32']
activity-versions: ['stable32']
services:
redis:

@ -71,7 +71,7 @@ jobs:
curl -s -u test:test -T README.md http://localhost:8080/remote.php/dav/files/test/new_file.txt
curl -s -u test:test -X DELETE http://localhost:8080/remote.php/dav/files/test/new_file.txt
output: before.json
profiler-branch: master
profiler-branch: stable32
- name: Apply PR # zizmor: ignore[template-injection]
run: |
@ -93,7 +93,7 @@ jobs:
curl -s -u test:test -T README.md http://localhost:8080/remote.php/dav/files/test/new_file.txt
curl -s -u test:test -X DELETE http://localhost:8080/remote.php/dav/files/test/new_file.txt
output: after.json
profiler-branch: master
profiler-branch: stable32
compare-with: before.json
- name: Upload profiles

@ -1 +1 @@
Subproject commit d93b7897adea5f63ba096a9a49b7c3f8167788df
Subproject commit 0c21a4712539d0ba43c863c28ae174755dd20556

@ -5,13 +5,13 @@
-->
# Nextcloud Server ☁
[![REUSE status](https://api.reuse.software/badge/github.com/nextcloud/server)](https://api.reuse.software/info/github.com/nextcloud/server)
[![codecov](https://codecov.io/gh/nextcloud/server/branch/master/graph/badge.svg)](https://codecov.io/gh/nextcloud/server)
[![codecov](https://codecov.io/gh/nextcloud/server/branch/stable32/graph/badge.svg)](https://codecov.io/gh/nextcloud/server)
[![CII Best Practices](https://bestpractices.coreinfrastructure.org/projects/209/badge)](https://bestpractices.coreinfrastructure.org/projects/209)
[![Design](https://contribute.design/api/shield/nextcloud/server)](https://contribute.design/nextcloud/server)
**A safe home for all your data.**
![](https://raw.githubusercontent.com/nextcloud/screenshots/master/nextcloud-hub-files-25-preview.png)
![](https://raw.githubusercontent.com/nextcloud/screenshots/stable32/nextcloud-hub-files-25-preview.png)
## Why is this so awesome? 🤩
@ -58,7 +58,7 @@ There are many ways to contribute, of which development is only one! Find out [h
Third-party components are handled as git submodules which have to be initialized first. So aside from the regular git checkout invoking `git submodule update --init` or a similar command is needed, for details see Git documentation.
Several apps that are included by default in regular releases such as [First run wizard](https://github.com/nextcloud/firstrunwizard) or [Activity](https://github.com/nextcloud/activity) are missing in `master` and have to be installed manually by cloning them into the `apps` subfolder.
Several apps that are included by default in regular releases such as [First run wizard](https://github.com/nextcloud/firstrunwizard) or [Activity](https://github.com/nextcloud/activity) are missing in `stable32` and have to be installed manually by cloning them into the `apps` subfolder.
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.

@ -22,7 +22,7 @@ class SecurityTxtHandler implements IHandler {
}
$response = 'Contact: https://hackerone.com/nextcloud
Expires: 2025-08-31T23:00:00.000Z
Expires: 2026-04-30T23:00:00.000Z
Acknowledgments: https://hackerone.com/nextcloud/thanks
Acknowledgments: https://github.com/nextcloud/security-advisories/security/advisories
Policy: https://hackerone.com/nextcloud

@ -3,16 +3,16 @@
# SPDX-FileCopyrightText: 2019 Nextcloud GmbH and Nextcloud contributors
# SPDX-License-Identifier: AGPL-3.0-or-later
#
# Update Nextcloud apps from latest git master
# Update Nextcloud apps from latest git stable32
# For local development environment
# Use from Nextcloud server folder with `./build/update-apps.sh`
#
# It automatically:
# - goes through all apps which are not shipped via server
# - shows the app name in bold and uses whitespace for separation
# - changes to master/main and pulls quietly
# - changes to stable32 and pulls quietly
# - shows the 3 most recent commits for context
# - removes branches merged into master/main
# - removes branches merged into stable32
# - … could even do the build steps if they are consistent for the apps (like `make`)
set -euo pipefail

@ -3,17 +3,17 @@
# SPDX-FileCopyrightText: 2019 Nextcloud GmbH and Nextcloud contributors
# SPDX-License-Identifier: AGPL-3.0-or-later
#
# Update Nextcloud server and apps from latest git master
# Update Nextcloud server and apps from latest git stable32
# For local development environment
# Use from Nextcloud server folder with `./build/update.sh`
# Update server
printf "\n\033[1m${PWD##*/}\033[0m\n"
git checkout master
git checkout stable32
git pull --quiet -p
git --no-pager log -3 --pretty=format:"%h %Cblue%ar%x09%an %Creset%s"
printf "\n"
git branch --merged master | grep -v "master$" | xargs git branch -d
git branch --merged stable32 | grep -v "stable32$" | xargs git branch -d
git submodule update --init
# Update apps

@ -1,7 +1,7 @@
# SPDX-FileCopyrightText: 2023 Nextcloud GmbH and Nextcloud contributors
# SPDX-License-Identifier: AGPL-3.0-or-later
codecov:
branch: master
branch: stable32
ci:
- drone.nextcloud.com
- '!scrutinizer-ci.com'

@ -9,10 +9,10 @@
// between betas, final and RCs. This is _not_ the public version number. Reset minor/patch level
// when updating major/minor version number.
$OC_Version = [32, 0, 0, 8];
$OC_Version = [32, 0, 0, 9];
// The human-readable string
$OC_VersionString = '32.0.0 beta 5';
$OC_VersionString = '32.0.0 RC1';
$OC_VersionCanBeUpgradedFrom = [
'nextcloud' => [