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
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] <[email protected]>
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] <[email protected]>
Signed-off-by: nextcloud-command <[email protected]>
…le31

[stable31] fix: hide guests group from principal backend
Signed-off-by: Andy Scherzinger <[email protected]>
…le31

[stable31] feat: add command to clear contacts photo cache
…le31

[stable31] fix(files_external): Safely check if the timestamp is numeric
…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] <[email protected]>
Signed-off-by: nextcloud-command <[email protected]>
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] <[email protected]>
…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] <[email protected]>
skjnldsv and others added 28 commits June 5, 2025 08:56
Signed-off-by: nextcloud-command <[email protected]>
…le31-update-code-signing-crl

[stable31] fix(security): Update code signing revocation list
Signed-off-by: Worker Builder <[email protected]>
Signed-off-by: Worker Builder <[email protected]>
… better layout

in order to fix stylelint error

Signed-off-by: Misha M.-Kupriyanov <[email protected]>
…lity

in order to fix stylelint error

Signed-off-by: Misha M.-Kupriyanov <[email protected]>
@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.