Merged
Conversation
Signed-off-by: Julius Härtl <jus@bitgrid.net>
rullzer
approved these changes
Mar 9, 2021
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 join this conversation on GitHub.
Already have an account?
Sign in to comment
2 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.
When restoring a version during editing we need to wait for Collabora to be ready and therefore richdocuments needs to trigger the restore MOVE action whenever that is done. In order to avoid a too early restore we need to workaround by disabling the default restore action from the files_versions app.
A proper solution is possible once we have some way to hook into the files sidebar restore process with nextcloud/server#26023 though this should at least make things work again for backward compatibility.