Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge stable 7.1 to master #9889

Merged
merged 17 commits into from
Oct 31, 2023
Merged

Conversation

JammingBen
Copy link
Collaborator

@JammingBen JammingBen commented Oct 30, 2023

Note that this does not include #9833 yet - we still need to solve that properly on master. see here for a proper port of the fix: #9891

nabim777 and others added 16 commits September 28, 2023 16:42
* Remove image preview when switching to folder

* moving image/folder preview to watch

* Revert "moving image/folder preview to watch"

This reverts commit 1893c71.

* skipping preview task if folder

* Revert "skipping preview task if folder"

This reverts commit ede2363.
[tests-only] [full-ci] bump latest stable commit id of ocis
…space in authenticated context (#9777)

Co-authored-by: Niraj Acharya <niraj@jankaritech.com>
[tests-only][full-ci] bump latest commit id
[tests-only][full-ci] Bump ocis commit id for tests
* fix: resolving external URLs via file ID

* test: fix unit tests

* improve method naming

* fix: redirect after closing external apps
chore: cherry-pick 7.1.1 version bump back to stable.7.1
@JammingBen JammingBen self-assigned this Oct 30, 2023
@update-docs
Copy link

update-docs bot commented Oct 30, 2023

Thanks for opening this pull request! The maintainers of this repository would appreciate it if you would create a changelog item based on your changes.

@JammingBen JammingBen force-pushed the merge-stable-7.1-to-master-20231030 branch from cd029ed to 73f4ffb Compare October 30, 2023 15:24
@sonarcloud
Copy link

sonarcloud bot commented Oct 30, 2023

Kudos, SonarCloud Quality Gate passed!    Quality Gate passed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 0 Code Smells

100.0% 100.0% Coverage
0.0% 0.0% Duplication

@JammingBen JammingBen merged commit f00d15a into master Oct 31, 2023
4 checks passed
@delete-merged-branch delete-merged-branch bot deleted the merge-stable-7.1-to-master-20231030 branch October 31, 2023 09:33
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.

10 participants