This repository was archived by the owner on Jul 14, 2026. It is now read-only.
[full-ci] Merge master in experimental#7611
Merged
Merged
Conversation
This reverts commit 83bc21c.
Revert "[full-ci] Merge master into experimental"
[tests-only][full-ci] Use latest selenium images
* Call update resource on file version restore
* Fix drag & drop without selection * Add changelog
If we don't return within the detected context other contexts would get resolve attempts as well.
* Fix: Sidebar cripples file name which is not visible
fix: context fallback to user instead of undefined
Hide share actions for space viewers/editors
* Fix sharesTree loading * Fix parent share fetching in sidebar * Remove logs * Minor adjustment * Add changelog item * Fix loading of share indicators * Move sharesTree loading to the sidebar component * Simplify code * Fix unit tests * Make share indicators in details panel reactive again * Fix space member loading * Fix sidebar panel opening * Remove unused method * Fix e2e tests * Apply small changes according to code review * Fix e2e tests * Import isEqual directly
* It aint much but it kinda works * Implement "keep both" * Add changelog * remove dev leftover * Fix folder name * Add isFolder * Make file conflict dialog work * Linting * Fix folder keep both * Check for folder to already exist * remove dev leftover * Address PR issues * Use store * Provide existing files with function parameter * Add type to interface * Refactor resolve file & folder conflicts * Refactor conflict dialog * Bugfix, remove dev leftover * Simplify conflict-array structure * Fix folder upload * Add merge to folders * Ignore existing folder errors for now * Make Merge reappear if "do for all" ticked * Address PR issues * Add unittests * Add more unittests * Fix e2e upload version * Fix file overwrite acceptance tests * Address PR issues Co-authored-by: Jannik Stehle <jannik.stehle@gmail.com>
[tests-only][full-ci]Bump ocis commit id for tests
Fix 'Private link'-button alignment
Fix `mtime` header for tus requests
* Add forbidden ids * Remove old code * Linting, Unittests * Add CustomKeyBindings directive * Use data-attribute instead of directive * Custom keyboard actions searchbar * Add custom keybindings to FileLinks, FileShares, SpaceMembers * Add changelog * Update snapshots * Make all keybinds global * Update changelog * Linting, Cleanup KeyboardActions * Add keycode lib * Fix custom key bindings errors * Linting, Snapshots * DEV * Linting * Sanity test * Sanity test 2 * Sanity test 3 * Make spacebar shortcut local * Update snapshots * Address PR issues, remove dev leftover * Fix Linting * Address PR issues
update proxy config of the deployment example
* Migrate deny-acl UI code from CERNbox Co-authored-by: Florian Schade <f.schade@icloud.com> Co-authored-by: Michael Barz <mbarz@owncloud.com> Co-authored-by: Benedikt Kulmann <benedikt@kulmann.biz>
Contributor
Author
|
Merged current master again |
|
SonarCloud Quality Gate failed. |
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 subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Description
Related Issue
Motivation and Context
How Has This Been Tested?
Screenshots (if appropriate):
Types of changes
Checklist:
Open tasks: