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.

Sign up for GitHub

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

Jump to bottom

[stable27] Fix open locally with files lock and wopi allow list #3502

Merged
merged 2 commits into from
Feb 26, 2024
Merged

[stable27] Fix open locally with files lock and wopi allow list #3502

merged 2 commits into from
Feb 26, 2024

Conversation

backportbot[bot]
Copy link

@backportbot backportbot bot commented Feb 26, 2024

Backport of PR #3489

@juliushaertl @backportbot
fix: Add config option to disable edit locally
7c2d454 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
@juliushaertl @backportbot
fix: Allow to unlock through separate endpoint for edit locally
4c94643 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
@backportbot backportbot bot added bug Something isn't working 3. to review Ready to be reviewed labels Feb 26, 2024
@backportbot backportbot bot added this to the Nextcloud 27 milestone Feb 26, 2024
@cypress Cypress
Copy link

cypress bot commented Feb 26, 2024

Passing run #781 ↗︎

0 31 0 0 Flakiness 0
⚠️ You've recorded test results over your free plan limit.
Upgrade your plan to view test results.

Details:

[stable27] Fix open locally with files lock and wopi allow list
Project: Richdocuments Commit: 4c94643491
Status: Passed Duration: 04:34 💡
Started: Feb 26, 2024 7:31 AM Ended: Feb 26, 2024 7:35 AM

Review all test suite changes for PR #3502 ↗︎

max-nextcloud
max-nextcloud approved these changes Feb 26, 2024
View reviewed changes
Copy link
Contributor

@max-nextcloud max-nextcloud left a comment

Choose a reason for hiding this comment

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

same changes as in main branch

@max-nextcloud max-nextcloud merged commit 71c39f6 into stable27 Feb 26, 2024
45 checks passed
@delete-merged-branch delete-merged-branch bot deleted the backport/3489/stable27 branch February 26, 2024 07:48
@juliushaertl juliushaertl mentioned this pull request Feb 29, 2024
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@max-nextcloud max-nextcloud max-nextcloud approved these changes

@juliushaertl juliushaertl Awaiting requested review from juliushaertl

Assignees

@juliushaertl juliushaertl

Labels
3. to review Ready to be reviewed bug Something isn't working
Projects
None yet
Milestone
Nextcloud 27
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@max-nextcloud @juliushaertl