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

Encrypted-shared folders should use the encrypted icon #36748

Merged
merged 1 commit into from
Feb 21, 2023

Conversation

artonge
Copy link
Contributor

@artonge artonge commented Feb 16, 2023

Before After
Screenshot from 2023-02-16 11-45-55 Screenshot from 2023-02-16 11-45-34

Summary

file_sharing override the folder icon when it is a share. This makes sure that an encrypted folder will always be shown as encrypted before shared.

This simply move an existing condition to the top.

Checklist

@artonge artonge self-assigned this Feb 16, 2023
@artonge artonge added this to the Nextcloud 26 milestone Feb 16, 2023
@artonge artonge added the 3. to review Waiting for reviews label Feb 16, 2023
@artonge artonge requested review from tobiasKaminsky, a team, skjnldsv, Pytal and szaimen and removed request for a team February 16, 2023 10:48
@artonge artonge changed the title Encrypted and shared folders should use the encrypted icon Encrypted-shared folders should use the encrypted icon Feb 16, 2023
Signed-off-by: Louis Chemineau <louis@chmn.me>
@artonge artonge force-pushed the artonge/fix/encrypted_shared_folder branch from 80ca23b to c09d4d3 Compare February 20, 2023 14:20
@artonge artonge merged commit b2d283b into master Feb 21, 2023
@artonge artonge deleted the artonge/fix/encrypted_shared_folder branch February 21, 2023 09:10
@skjnldsv skjnldsv mentioned this pull request Feb 23, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Securely shared e2e folder: better listing
3 participants