Skip to content

Conversation

@printminion-co
Copy link

@printminion-co printminion-co commented Jul 3, 2025

Summary

  • generated the merge with ./<docs-n-tools/tools/git_upgrade_merge.sh in order exclude files not modified by us.
  • resolved conflicts. especially package.json, package-lock.json
  • compared result with the v31.0.6 e.g. git diff mk/dev/update-to-v31.0.6-20250702100826 v31.0.6
  • amended all files not touched by us to be v31.0.6

TODO

  • review

TODO after merge

Checklist

kesselb and others added 30 commits May 23, 2025 16:27
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
Signed-off-by: skjnldsv <skjnldsv@protonmail.com>
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
Bumps [@types/dockerode](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/dockerode) from 3.3.38 to 3.3.39.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/dockerode)

---
updated-dependencies:
- dependency-name: "@types/dockerode"
  dependency-version: 3.3.39
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Bumps [puppeteer](https://github.com/puppeteer/puppeteer) from 24.7.2 to 24.9.0.
- [Release notes](https://github.com/puppeteer/puppeteer/releases)
- [Changelog](https://github.com/puppeteer/puppeteer/blob/main/CHANGELOG.md)
- [Commits](puppeteer/puppeteer@puppeteer-v24.7.2...puppeteer-v24.9.0)

---
updated-dependencies:
- dependency-name: puppeteer
  dependency-version: 24.9.0
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Signed-off-by: Jérôme Herbinet <33763786+Jerome-Herbinet@users.noreply.github.com>
Signed-off-by: Jérôme Herbinet <33763786+Jerome-Herbinet@users.noreply.github.com>
Signed-off-by: nextcloud-command <nextcloud-command@users.noreply.github.com>
Signed-off-by: Marcel Klehr <mklehr@gmx.net>
…le31

[stable31] fix: hide guests group from principal backend
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
…ounts

Signed-off-by: provokateurin <kate@provokateurin.de>
…le31

[stable31] feat: add command to clear contacts photo cache
Signed-off-by: provokateurin <kate@provokateurin.de>
Signed-off-by: Git'Fellow <12234510+solracsf@users.noreply.github.com>
Signed-off-by: Robin Appelman <robin@icewind.nl>
…le31

[stable31] fix(files_external): Safely check if the timestamp is numeric
Signed-off-by: Robin Appelman <robin@icewind.nl>
Signed-off-by: Robin Appelman <robin@icewind.nl>
…le31

[stable31] fix: improve error message when cache rename source can't be found
Bumps [dompurify](https://github.com/cure53/DOMPurify) from 3.2.5 to 3.2.6.
- [Release notes](https://github.com/cure53/DOMPurify/releases)
- [Commits](cure53/DOMPurify@3.2.5...3.2.6)

---
updated-dependencies:
- dependency-name: dompurify
  dependency-version: 3.2.6
  dependency-type: direct:production
  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>
Bumps [@zip.js/zip.js](https://github.com/gildas-lormeau/zip.js) from 2.7.60 to 2.7.62.
- [Release notes](https://github.com/gildas-lormeau/zip.js/releases)
- [Commits](gildas-lormeau/zip.js@v2.7.60...v2.7.62)

---
updated-dependencies:
- dependency-name: "@zip.js/zip.js"
  dependency-version: 2.7.62
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
…le31

[stable31] feat: add command to get basic storage info
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:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
skjnldsv and others added 28 commits June 5, 2025 08:56
Signed-off-by: skjnldsv <skjnldsv@protonmail.com>
Signed-off-by: skjnldsv <skjnldsv@protonmail.com>
Signed-off-by: nextcloud-command <nextcloud-command@users.noreply.github.com>
…le31-update-code-signing-crl

[stable31] fix(security): Update code signing revocation list
Signed-off-by: skjnldsv <skjnldsv@protonmail.com>
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
Signed-off-by: Worker Builder <worker-builder@nextcloud.com>
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
Signed-off-by: John Molakvoæ <skjnldsv@users.noreply.github.com>
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
Signed-off-by: Worker Builder <worker-builder@nextcloud.com>
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
v31.0.6

Signed-off-by: Misha M.-Kupriyanov <kupriyanov@strato.de>
…ubuntu-latest-low

Signed-off-by: Misha M.-Kupriyanov <kupriyanov@strato.de>
Signed-off-by: Misha M.-Kupriyanov <kupriyanov@strato.de>
… better layout

in order to fix stylelint error

Signed-off-by: Misha M.-Kupriyanov <kupriyanov@strato.de>
…lity

in order to fix stylelint error

Signed-off-by: Misha M.-Kupriyanov <kupriyanov@strato.de>
@printminion-co printminion-co deleted the mk/dev/update-to-v31.0.6-20250702100826 branch July 18, 2025 12:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.