Skip to content

[stable22] Added support for transferring incoming file shares. - #28844

Merged
PVince81 merged 2 commits into
stable22from
backport/28118/stable22
Sep 15, 2021
Merged

[stable22] Added support for transferring incoming file shares.#28844
PVince81 merged 2 commits into
stable22from
backport/28118/stable22

Conversation

@backportbot-nextcloud

Copy link
Copy Markdown

backport of #28118

@backportbot-nextcloudbackportbot-nextcloudBot added enhancement feature: occ pending documentation This pull request needs an associated documentation update labels Sep 15, 2021
@backportbot-nextcloudbackportbot-nextcloudBot added this to the Nextcloud 22.1.2 milestone Sep 15, 2021
@PVince81PVince81 self-assigned this Sep 15, 2021
@PVince81

Copy link
Copy Markdown
Member

strange that the DCO bot accepted the mixed Author+Signed off by in the original PR but not this one

PVince81and others added 2 commits September 15, 2021 12:18
- new option --transfer-incoming-shares=1 | 0
- new config.php option 'transfer-incoming-shares' => true | false
The command line option overrules the config.php option.
Signed-off-by: Vincent Petry <vincent@nextcloud.com>
Co-authored-by: Immanuel Pasanec <immanuel.pasanec@compaso.de>
Signed-off-by: Vincent Petry <vincent@nextcloud.com>
@PVince81
PVince81force-pushed the backport/28118/stable22 branch from 8c2542c to 42239fcCompareSeptember 15, 2021 10:19
@PVince81

Copy link
Copy Markdown
Member

to fix the DCO issue I made myself main author of the first commit and added Immanuel as Co-Author.

@PVince81PVince81 left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

👍

@PVince81PVince81 added the 3. to review Waiting for reviews label Sep 15, 2021
@PVince81
PVince81 merged commit 4d5ee24 into stable22Sep 15, 2021
@PVince81
PVince81 deleted the backport/28118/stable22 branch September 15, 2021 14:56
@blizzzblizzz mentioned this pull request Sep 23, 2021
4 tasks
@MichaIngMichaIng modified the milestones: Nextcloud 22.1.2, Nextcloud 22.2.0Sep 24, 2021
@nickvergessennickvergessen removed the pending documentation This pull request needs an associated documentation update label Nov 8, 2022
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

@PVince81@blizzz@nickvergessen@MichaIng