Kh/dev/import v31 into v32 - #284
Closed
bromiesTM wants to merge 3850 commits into
Closed
Conversation
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
Signed-off-by: Kent Delante <kent.delante@proton.me>
Signed-off-by: nextcloud-command <nextcloud-command@users.noreply.github.com>
Bumps [cypress-split](https://github.com/bahmutov/cypress-split) from 1.24.14 to 1.24.17. - [Release notes](https://github.com/bahmutov/cypress-split/releases) - [Commits](bahmutov/cypress-split@v1.24.14...v1.24.17) --- updated-dependencies: - dependency-name: cypress-split dependency-version: 1.24.17 dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>
Signed-off-by: Alejo <xlejo@protonmail.com>
…yarn/stable31/cypress-split-1.24.17
Bumps [@babel/plugin-transform-private-methods](https://github.com/babel/babel/tree/HEAD/packages/babel-plugin-transform-private-methods) from 7.25.9 to 7.27.1. - [Release notes](https://github.com/babel/babel/releases) - [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md) - [Commits](https://github.com/babel/babel/commits/v7.27.1/packages/babel-plugin-transform-private-methods) --- updated-dependencies: - dependency-name: "@babel/plugin-transform-private-methods" dependency-version: 7.27.1 dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>
Signed-off-by: skjnldsv <skjnldsv@protonmail.com> Signed-off-by: nextcloud-command <nextcloud-command@users.noreply.github.com>
Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
Bumps [phpunit/phpunit](https://github.com/sebastianbergmann/phpunit) from 9.6.22 to 9.6.23. - [Release notes](https://github.com/sebastianbergmann/phpunit/releases) - [Changelog](https://github.com/sebastianbergmann/phpunit/blob/9.6.23/ChangeLog-9.6.md) - [Commits](sebastianbergmann/phpunit@9.6.22...9.6.23) --- updated-dependencies: - dependency-name: phpunit/phpunit dependency-version: 9.6.23 dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>
Signed-off-by: nextcloud-command <nextcloud-command@users.noreply.github.com>
…le31 [stable31] fix(share): assume download enabled on federated share
…yarn/stable31/babel/plugin-transform-private-methods-7.27.1
Bumps [@babel/preset-typescript](https://github.com/babel/babel/tree/HEAD/packages/babel-preset-typescript) from 7.27.0 to 7.27.1. - [Release notes](https://github.com/babel/babel/releases) - [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md) - [Commits](https://github.com/babel/babel/commits/v7.27.1/packages/babel-preset-typescript) --- updated-dependencies: - dependency-name: "@babel/preset-typescript" dependency-version: 7.27.1 dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>
…yarn/stable31/babel/preset-typescript-7.27.1
…/build/integration/stable31/phpunit/phpunit-9.6.23
Bumps [core-js](https://github.com/zloirock/core-js/tree/HEAD/packages/core-js) from 3.41.0 to 3.42.0. - [Release notes](https://github.com/zloirock/core-js/releases) - [Changelog](https://github.com/zloirock/core-js/blob/master/CHANGELOG.md) - [Commits](https://github.com/zloirock/core-js/commits/v3.42.0/packages/core-js) --- updated-dependencies: - dependency-name: core-js dependency-version: 3.42.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: nextcloud-command <nextcloud-command@users.noreply.github.com>
Signed-off-by: nextcloud-command <nextcloud-command@users.noreply.github.com>
…yarn/stable31/core-js-3.42.0 build(deps): bump core-js from 3.41.0 to 3.42.0
Bumps [sass](https://github.com/sass/dart-sass) from 1.87.0 to 1.89.0. - [Release notes](https://github.com/sass/dart-sass/releases) - [Changelog](https://github.com/sass/dart-sass/blob/main/CHANGELOG.md) - [Commits](sass/dart-sass@1.87.0...1.89.0) --- updated-dependencies: - dependency-name: sass dependency-version: 1.89.0 dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>
…yarn/stable31/sass-1.89.0 chore(deps-dev): Bump sass from 1.87.0 to 1.89.0
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
Signed-off-by: GitHub <noreply@github.com>
…le31-update-code-signing-crl [stable31] fix(security): Update code signing revocation list
…artbeats and GET requests Signed-off-by: Joas Schilling <coding@schilljs.com>
Signed-off-by: Robin Appelman <robin@icewind.nl>
Signed-off-by: Kai Henseler <kai.henseler@strato.de>
Signed-off-by: Kai Henseler <kai.henseler@strato.de>
https://github.com/IONOS-Productivity/nc-config/releases/tag/v30-b44953a https://github.com/IONOS-Productivity/nc-ionos-theme/releases/tag/30.0.7-1ffc0e5 Signed-off-by: Tatjana Kaschperko Lindt <kaschperko-lindt@strato.de>
Signed-off-by: Kai Henseler <kai.henseler@strato.de>
Signed-off-by: Kai Henseler <kai.henseler@strato.de>
Signed-off-by: Kai Henseler <kai.henseler@strato.de>
…ateData variables Extract the inline array literals passed to each createEMailTemplate() call into named $templateData variables. For sendNote(), which previously passed no data array, add a minimal array so all four send methods are consistent. Zero behaviour change — $templateData is passed straight through to createEMailTemplate() with identical contents.
…ach mail send
Dispatch a typed PSR-14 event immediately before every mailer->send() call
in ShareByMailProvider so that external listeners can intercept and replace
Nextcloud's native SMTP delivery.
Event hierarchy:
AbstractBeforeShareMailSentEvent (base: share, resolvedEmails, message,
markMailHandled / isMailHandled)
├── BeforeShareMailSentEvent – sendEmail()
├── BeforeSharePasswordMailSentEvent – sendPassword() + sendPasswordToOwner()
└── BeforeShareNoteMailSentEvent – sendNote()
Each concrete class holds its own typed $templateData (psalm array-shape)
and exposes named getters (getSenderUserId(), getFileName(), …) instead of
a generic getMailData(): array<string,mixed>. This avoids defensive
is_string() / null guards in listeners.
$templateData reuses the array already passed to createEMailTemplate(), with
one extra key added for sendEmail(): senderUserId (the raw user ID, distinct
from the display name stored under 'initiator').
The native mailer->send() is skipped when a listener calls markMailHandled().
If the listener's own send throws, the exception propagates and the native
send is also skipped — no silent SMTP fallback.
sendEmail() and sendPassword() are flattened from nested
if (!isMailHandled()) { ... } pyramids to early-return style.
Signed-off-by: Misha M.-Kupriyanov <kupriyanov@strato.de>
…ssmap autoload_real.php sets setClassMapAuthoritative(true), which disables PSR-4 fallback entirely. Any class not listed in $classMap is never found, regardless of whether PSR-4 would resolve it. Signed-off-by: Tatjana Kaschperko Lindt <kaschperko-lindt@strato.de>
…a and event refactors - Add senderUserId to the expected RecipientNotification templateData in 3 tests (added by the createEMailTemplate params refactor in 242b896) - Update dispatchTyped expectation from once(GenerateSecurePasswordEvent) to exactly(3) with withConsecutive for GenerateSecurePasswordEvent, BeforeShareMailSentEvent, and BeforeSharePasswordMailSentEvent (sendEmail() and sendPassword() now each dispatch a Before*Event) Signed-off-by: Tatjana Kaschperko Lindt <kaschperko-lindt@strato.de>
…t dispatch Signed-off-by: Tatjana Kaschperko Lindt <kaschperko-lindt@strato.de>
…s suppressed sendPassword() and sendPasswordToOwner() called createPasswordSendActivity() unconditionally outside the isMailHandled() guard. A listener intercepting the BeforeSharePasswordMailSentEvent would suppress the SMTP send but still cause a false activity-log entry for a mail that was never delivered. Apply the same early-return pattern used by sendEmail(): return immediately when isMailHandled() is true so no side effects run after the flag is set. Signed-off-by: Tatjana Kaschperko Lindt <kaschperko-lindt@strato.de>
…r "file request") https://github.com/IONOS-Productivity/nc-ionos-processes/releases/tag/1.0.0-9501a5e Signed-off-by: Misha M.-Kupriyanov <kupriyanov@strato.de> Co-authored-by: Tatjana Kaschperko Lindt <kaschperko-lindt@strato.de>
…-oidc) Signed-off-by: Kai Henseler <kai.henseler@strato.de>
Signed-off-by: Kai Henseler <kai.henseler@strato.de>
Introduce REMOTE_TRIGGER_NC_VERSION & REMOTE_TRIGGER_RC_BRANCH as gate to guard against unwanted automatic deploys of major releases Signed-off-by: Kai Henseler <kai.henseler@strato.de>
Signed-off-by: Kai Henseler <kai.henseler@strato.de>
Signed-off-by: Kai Henseler <kai.henseler@strato.de>
Signed-off-by: Kai Henseler <kai.henseler@strato.de>
Signed-off-by: Kai Henseler <kai.henseler@strato.de>
Signed-off-by: Kai Henseler <kai.henseler@strato.de>
Signed-off-by: Kai Henseler <kai.henseler@strato.de>
bromiesTM
force-pushed
the
kh/dev/import-v31-into-v32
branch
from
July 21, 2026 09:41
67aa17d to
23adf56
Compare
Signed-off-by: Kai Henseler <kai.henseler@strato.de>
|
IMO 3850 commits here are un-reviewable. I would propose another strategy. Lets take the as basis our upgrade to V32 ionos-dev-v32.0.6 and merge the changes from https://github.com/IONOS-Productivity/nc-server/tree/rc/web-3.5. Please consider 2 PRs: |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
20 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Created a new branch from rc/web-5
Merged ionos-dev-v31 into rc/web-5
ionos-dev-31 is based on v31 and received v30 EU Market Changes with HDNEXT-1969
Therefore this should be the logical successor of v31
Conflicts:
Our Build Job needed a small adjustment to support matrix building and EU market changes
All other conflicts have been resolved with
git checkout --ours .which accepts the base branches (rc/web-5) versions.For Files that had no ---ours version (because nextcloud removed the files in between versions and the old incomming version included changes on those files) i decided to "manually" remove those files so they dont reappear.
Simplesettings
Got EU Markets changes from v30 to old v32 branch
and migrated to vite and vue3. To support Node 24 and align with other modern nextcloud apps
Nc config was updated with EU market changes and matrix building from rc/web-5