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

Feature/filelocking keep user lock #6347

Merged
merged 1 commit into from
Jan 18, 2024

Conversation

allexzander
Copy link
Contributor

Copy link
Collaborator

@claucambra claucambra left a comment

Choose a reason for hiding this comment

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

LGTM :)

src/gui/folder.cpp Outdated Show resolved Hide resolved
@mgallien mgallien force-pushed the feature/filelocking-keep-user-lock branch from 487cb5f to ec24d1f Compare January 18, 2024 08:17
@allexzander allexzander force-pushed the feature/filelocking-keep-user-lock branch 2 times, most recently from 764c141 to 916d547 Compare January 18, 2024 08:53
…vention. Set token lock instead of user lock when locking office files automatically.

Signed-off-by: alex-z <[email protected]>
@allexzander allexzander force-pushed the feature/filelocking-keep-user-lock branch from 916d547 to 2eaecb6 Compare January 18, 2024 09:21
Copy link

sonarcloud bot commented Jan 18, 2024

Quality Gate Failed Quality Gate failed

Failed conditions

38.9% Coverage on New Code (required ≥ 80%)
7 New Code Smells (required ≤ 0)

See analysis details on SonarCloud

idea Catch issues before they fail your Quality Gate with our IDE extension SonarLint SonarLint

@nextcloud-desktop-bot
Copy link

AppImage file: nextcloud-PR-6347-2eaecb6400b08677d0558eac0f251ecb09ffef15-x86_64.AppImage

To test this change/fix you can simply download above AppImage file and test it.

Please make sure to quit your existing Nextcloud app and backup your data.

@allexzander allexzander merged commit 8bb3656 into master Jan 18, 2024
7 of 11 checks passed
@allexzander allexzander deleted the feature/filelocking-keep-user-lock branch January 18, 2024 19:30
@allexzander
Copy link
Contributor Author

/backport to stable-3.11

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.

4 participants