Skip to content

Conversation

@printminion-co
Copy link

@printminion-co printminion-co commented Jun 26, 2025

changed two commits before merge:

git fetch --all --tags -p

git checkout ionos-dev
git reset --hard  ionos/ionos-dev

git checkout -b mk/dev/merge-test-merge-test-31.0.6-try3

git merge v31.0.6

git merge --continue

git push ionos mk/dev/merge-test-merge-test-31.0.6-try3

test

  • checkout vanilla v31.0.6
  • build viewer app
git checkout nextcloud-v31.0.6
cd apps/viewer
npm install
npm run dev

renovate bot and others added 30 commits September 18, 2024 21:19
Signed-off-by: nextcloud-command <nextcloud-command@users.noreply.github.com>
…cloud

fix(deps): update dependency @nextcloud/axios to ^2.5.1 (master)
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
Signed-off-by: nextcloud-command <nextcloud-command@users.noreply.github.com>
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
Bumps [peter-evans/create-pull-request](https://github.com/peter-evans/create-pull-request) from 6.1.0 to 7.0.5.
- [Release notes](https://github.com/peter-evans/create-pull-request/releases)
- [Commits](peter-evans/create-pull-request@c5a7806...5e91468)

---
updated-dependencies:
- dependency-name: peter-evans/create-pull-request
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Signed-off-by: Julius Knorr <jus@bitgrid.net>
Signed-off-by: nextcloud-command <nextcloud-command@users.noreply.github.com>
Bumps [actions/checkout](https://github.com/actions/checkout) from 4.1.7 to 4.2.0.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](actions/checkout@692973e...d632683)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Bumps [vite](https://github.com/vitejs/vite/tree/HEAD/packages/vite) from 5.4.5 to 5.4.8.
- [Release notes](https://github.com/vitejs/vite/releases)
- [Changelog](https://github.com/vitejs/vite/blob/v5.4.8/packages/vite/CHANGELOG.md)
- [Commits](https://github.com/vitejs/vite/commits/v5.4.8/packages/vite)

---
updated-dependencies:
- dependency-name: vite
  dependency-type: direct:development
...

Signed-off-by: dependabot[bot] <support@github.com>
Bumps [shivammathur/setup-php](https://github.com/shivammathur/setup-php) from 2.31.0 to 2.31.1.
- [Release notes](https://github.com/shivammathur/setup-php/releases)
- [Commits](shivammathur/setup-php@2e947f1...c541c15)

---
updated-dependencies:
- dependency-name: shivammathur/setup-php
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Signed-off-by: GitHub <noreply@github.com>
Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 4.4.0 to 4.4.3.
- [Release notes](https://github.com/actions/upload-artifact/releases)
- [Commits](actions/upload-artifact@5076954...b4b15b8)

---
updated-dependencies:
- dependency-name: actions/upload-artifact
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
Signed-off-by: Julius Knorr <jus@bitgrid.net>
Signed-off-by: nextcloud-command <nextcloud-command@users.noreply.github.com>
fix: Fix error when viewing current version
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
nextcloud-bot and others added 25 commits June 3, 2025 02:03
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
The filename is empty and is alerady set on page load

Signed-off-by: Julius Knorr <jus@bitgrid.net>
Signed-off-by: nextcloud-command <nextcloud-command@users.noreply.github.com>
Signed-off-by: Julius Knorr <jus@bitgrid.net>
[stable31] fix: Do not update page title for single file public shares
Signed-off-by: Julius Knorr <jus@bitgrid.net>
…t directory

Signed-off-by: Julius Knorr <jus@bitgrid.net>
Signed-off-by: nextcloud-command <nextcloud-command@users.noreply.github.com>
[stable31] perf: Set and show current file before running heavier request to list directory
Signed-off-by: Hamza Mahjoubi <hamzamahjoubi221@gmail.com>
Signed-off-by: Hamza <hamzamahjoubi221@gmail.com>
[stable31] fix(image-editor): remove hamburger menu button and show close button
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: 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: Misha M.-Kupriyanov <kupriyanov@strato.de>
…iable"

partial revert commit 992158f
in order to easier the merge with original code

Signed-off-by: Misha M.-Kupriyanov <kupriyanov@strato.de>
v31.0.6

Signed-off-by: Misha M.-Kupriyanov <kupriyanov@strato.de>
Copy link

@tanyaka tanyaka left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Review OK.

@printminion-co printminion-co merged commit ce151d0 into ionos-dev Jul 10, 2025
6 of 16 checks passed
@printminion-co printminion-co deleted the mk/dev/merge-test-merge-test-31.0.6-try3 branch July 10, 2025 16:16
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.