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

fix moving files of encrypted local storage to unencrypted local storage #35894

Merged
merged 1 commit into from
Jan 26, 2023
Merged

fix moving files of encrypted local storage to unencrypted local storage #35894

merged 1 commit into from
Jan 26, 2023

Conversation

icewind1991
Copy link
Member

for example when moving encrypted files to a groupfolder

Instead of doing the optimized local storage move, fallback to the generic implementation.

@icewind1991 icewind1991 added this to the Nextcloud 26 milestone Dec 27, 2022
@szaimen szaimen added the 3. to review Waiting for reviews label Jan 1, 2023
come-nc
come-nc approved these changes Jan 2, 2023
View reviewed changes
Copy link
Contributor

@come-nc come-nc left a comment

Choose a reason for hiding this comment

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

There is the same kind of trouble with versions when moving from groupfolder to non-groupfolder, I think?

@icewind1991 icewind1991 mentioned this pull request Jan 3, 2023
Merged
PVince81
PVince81 approved these changes Jan 4, 2023
View reviewed changes
Copy link
Member

@PVince81 PVince81 left a comment

Choose a reason for hiding this comment

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

👍

@PVince81
Copy link
Member

PVince81 commented Jan 4, 2023

/backport to stable25

@PVince81
Copy link
Member

PVince81 commented Jan 4, 2023

/backport to stable24

@icewind1991 icewind1991 mentioned this pull request Jan 10, 2023
Merged
@PVince81 PVince81 mentioned this pull request Jan 17, 2023
Closed
@PVince81
Copy link
Member

/rebase

@PVince81 PVince81 added 4. to release Ready to be released and/or waiting for tests to finish and removed 3. to review Waiting for reviews labels Jan 24, 2023
@icewind1991 @PVince81
fix moving files of encrypted local storage to unencrypted local storage
33b90d2 
for example when moving encrypted files to a groupfolder

Signed-off-by: Robin Appelman <robin@icewind.nl>
@PVince81 PVince81 merged commit 9ecec2f into master Jan 26, 2023
@PVince81 PVince81 deleted the move-from-encryption branch January 26, 2023 08:45
This was referenced Jan 26, 2023
Merged
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@PVince81 PVince81 PVince81 approved these changes

@come-nc come-nc come-nc approved these changes

@ArtificialOwl ArtificialOwl Awaiting requested review from ArtificialOwl

Assignees
No one assigned
Labels
4. to release Ready to be released and/or waiting for tests to finish
Projects
None yet
Milestone
Nextcloud 26
Development

Successfully merging this pull request may close these issues.
4 participants
@icewind1991 @PVince81 @come-nc @szaimen