Skip to content

Allow to force rename a conflicting calendar - #24604

Merged
skjnldsv merged 1 commit into
masterfrom
feat/dav/move-calendar-rename
Dec 22, 2020
Merged

Allow to force rename a conflicting calendar#24604
skjnldsv merged 1 commit into
masterfrom
feat/dav/move-calendar-rename

Conversation

@skjnldsv

@skjnldsvskjnldsv commented Dec 8, 2020

Copy link
Copy Markdown
Member

Signed-off-by: John Molakvoæ (skjnldsv) skjnldsv@protonmail.com

@skjnldsvskjnldsv self-assigned this Dec 8, 2020
@skjnldsvskjnldsv added 3. to review Waiting for reviews feature: dav labels Dec 8, 2020
@skjnldsvskjnldsv added this to the Nextcloud 21 milestone Dec 8, 2020
@skjnldsv

skjnldsv commented Dec 8, 2020

Copy link
Copy Markdown
MemberAuthor

/backport to stable20

skjnldsv
skjnldsv commented Dec 8, 2020
View reviewed changes
Comment threadapps/dav/lib/CalDAV/CalDavBackend.php
@wiswedelwiswedel added the pending documentation This pull request needs an associated documentation update label Dec 8, 2020
@wiswedel

This comment has been minimized.

Sign in to view
@skjnldsv
skjnldsvforce-pushed the feat/dav/move-calendar-rename branch from 1013ca6 to 017d148CompareDecember 8, 2020 09:32
@skjnldsvskjnldsv mentioned this pull request Dec 8, 2020
Merged
@skjnldsv

skjnldsv commented Dec 8, 2020

Copy link
Copy Markdown
MemberAuthor

@skjnldsv
Please don't forget to document the new parameter in nextcloud/documentation@master/admin_manual/configuration_server/occ_command.rst.

nextcloud/documentation#5590

tcitworld
tcitworld reviewed Dec 9, 2020
View reviewed changes
Comment threadapps/dav/lib/Command/MoveCalendar.php
Comment threadapps/dav/lib/CalDAV/CalDavBackend.php
@skjnldsv
skjnldsvforce-pushed the feat/dav/move-calendar-rename branch 2 times, most recently from 6f6521c to ae091cdCompareDecember 9, 2020 16:18
tcitworld
tcitworld previously requested changes Dec 9, 2020
View reviewed changes
Comment threadapps/dav/lib/Command/MoveCalendar.php Outdated
@skjnldsv
Allow to force rename a conflicting calendar
fd01d24
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
@skjnldsv
skjnldsvforce-pushed the feat/dav/move-calendar-rename branch from ae091cd to fd01d24CompareDecember 10, 2020 08:12
juliusknorr
juliusknorr approved these changes Dec 11, 2020
View reviewed changes

@juliusknorrjuliusknorr 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.

Tested and works 👍

@skjnldsv

skjnldsv commented Dec 11, 2020

Copy link
Copy Markdown
MemberAuthor

Test failure unrelated

@rullzerrullzer mentioned this pull request Dec 14, 2020
Merged
59 tasks
@skjnldsv

skjnldsv commented Dec 15, 2020

Copy link
Copy Markdown
MemberAuthor

Ping everyone!

@rullzerrullzer mentioned this pull request Dec 18, 2020
Merged
39 tasks
@skjnldsv
skjnldsv merged commit a5c5589 into masterDec 22, 2020
@skjnldsv
skjnldsv deleted the feat/dav/move-calendar-rename branch December 22, 2020 07:33
@skjnldsvskjnldsv added 4. to release Ready to be released and/or waiting for tests to finish and removed 3. to review Waiting for reviews labels Dec 22, 2020
@backportbot-nextcloudbackportbot-nextcloudBot mentioned this pull request Dec 22, 2020
Merged
@skjnldsvskjnldsv removed the pending documentation This pull request needs an associated documentation update label Dec 22, 2020
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@ChristophWurstChristophWurstChristophWurst approved these changes
@juliusknorrjuliusknorrjuliusknorr approved these changes
@rullzerrullzerAwaiting requested review from rullzer
@nickvergessennickvergessenAwaiting requested review from nickvergessen
@PVince81PVince81Awaiting requested review from PVince81
@tcitworldtcitworldAwaiting requested review from tcitworldtcitworld is a code owner

Assignees

@skjnldsvskjnldsv

Labels

4. to releaseReady to be released and/or waiting for tests to finishfeature: dav

Projects

None yet

Milestone

Nextcloud 21

Development

Successfully merging this pull request may close these issues.

6 participants

@skjnldsv@wiswedel@nickvergessen@ChristophWurst@tcitworld@juliusknorr