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

Bugfix/hide encrypt from context menu #7016

Merged
merged 3 commits into from
Aug 22, 2024

Conversation

mgallien
Copy link
Collaborator

No description provided.

fix string data being invalid when using QStringView

Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
with current end-to-end encryption only top folders can be encrypted

limit the availability of the menu entry to top folders

Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
in the contextual menu shown in files explorer will show encrypt menu
entry only for top folders that are non-encrypted and empty

Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
@mgallien mgallien force-pushed the bugfix/hideEncryptFromContextMenu branch from 84c5580 to 539be0a Compare August 22, 2024 08:12
@mgallien mgallien merged commit aa1c83c into master Aug 22, 2024
10 of 14 checks passed
@mgallien mgallien deleted the bugfix/hideEncryptFromContextMenu branch August 22, 2024 08:12
@mgallien
Copy link
Collaborator Author

/backport to stable-3.13

@mgallien
Copy link
Collaborator Author

/backport to stable-3.12

Copy link

backportbot bot commented Aug 22, 2024

The backport to stable-3.12 failed. Please do this backport manually.

# Switch to the target branch and update it
git checkout stable-3.12
git pull origin stable-3.12

# Create the new backport branch
git checkout -b backport/7016/stable-3.12

# Cherry pick the change from the commit sha1 of the change against the default branch
# This might cause conflicts, resolve them
git cherry-pick 5bb90c78 1c3743d6 539be0a1

# Push the cherry pick commit to the remote repository and open a pull request
git push origin backport/7016/stable-3.12

Error: Failed to clone repository: Failed to checkout branches: error: Your local changes to the following files would be overwritten by checkout:
src/gui/macOS/ClientCommunicationProtocol.h
Please commit your changes or stash them before you switch branches.
Aborting


Learn more about backports at https://docs.nextcloud.com/server/stable/go.php?to=developer-backports.

@nextcloud-desktop-bot
Copy link

AppImage file: nextcloud-PR-7016-539be0a16a8ebc1996e43891c60ba76bd17c1bea-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.

Copy link

sonarcloud bot commented Aug 22, 2024

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.

3 participants