-
Notifications
You must be signed in to change notification settings - Fork 116
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
Fix open locally with files lock and wopi allow list #3489
Conversation
Signed-off-by: Julius Härtl <[email protected]>
Signed-off-by: Julius Härtl <[email protected]>
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Code changes look good. did not test it though.
/backport to stable28 |
/backport to stable27 |
/backport to stable26 |
The backport to # Switch to the target branch and update it
git checkout stable26
git pull origin stable26
# Create the new backport branch
git checkout -b backport/3489/stable26
# Cherry pick the change from the commit sha1 of the change against the default branch
# This might cause conflicts, resolve them
git cherry-pick 5570aa7b 3c583055
# Push the cherry pick commit to the remote repository and open a pull request
git push origin backport/3489/stable26 Error: No changes found in backport branch Learn more about backports at https://docs.nextcloud.com/server/stable/go.php?to=developer-backports. |
is it going to backport to 26? should I backport it manually? @juliushaertl |
Sorry I've missed that, the automatic one failed so a manual one is needed. I can check, but if you want to help preparing that, just opening a pr is of course much appreciated. |
Fix #3487
Fix #3299
Summary
We add a config value for disabling but also address that unlocking the file was no longer working with a WOPI allow list. We now move this to a separate endpoint to handle any prepare steps we need to do before moving to the local editor.
In a second iteration we can further extend this to update the other views to read only or notify them through Collabora.
Configuration option to disable local editing