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

Allow to force rename a conflicting calendar #24604

Merged
merged 1 commit into from
Dec 22, 2020
Merged

Allow to force rename a conflicting calendar #24604

merged 1 commit into from
Dec 22, 2020

Conversation

skjnldsv
Copy link
Member

@skjnldsv skjnldsv commented Dec 8, 2020

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

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

skjnldsv commented Dec 8, 2020

/backport to stable20

@wiswedel wiswedel 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 skjnldsv force-pushed the feat/dav/move-calendar-rename branch from 1013ca6 to 017d148 Compare December 8, 2020 09:32
@skjnldsv skjnldsv mentioned this pull request Dec 8, 2020
Merged
@skjnldsv
Copy link
Member Author

skjnldsv commented Dec 8, 2020

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

nextcloud/documentation#5590

@skjnldsv skjnldsv force-pushed the feat/dav/move-calendar-rename branch 2 times, most recently from 6f6521c to ae091cd Compare December 9, 2020 16:18
tcitworld
tcitworld previously requested changes Dec 9, 2020
View reviewed changes
apps/dav/lib/Command/MoveCalendar.php Outdated Show resolved Hide resolved
@skjnldsv
Allow to force rename a conflicting calendar
fd01d24 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
@skjnldsv skjnldsv force-pushed the feat/dav/move-calendar-rename branch from ae091cd to fd01d24 Compare December 10, 2020 08:12
juliushaertl
juliushaertl approved these changes Dec 11, 2020
View reviewed changes
Copy link
Member

@juliushaertl juliushaertl left a comment

Choose a reason for hiding this comment

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

Tested and works 👍

@skjnldsv
Copy link
Member Author

Test failure unrelated

@rullzer rullzer mentioned this pull request Dec 14, 2020
Merged
59 tasks
@skjnldsv
Copy link
Member Author

Ping everyone!

@rullzer rullzer mentioned this pull request Dec 18, 2020
Merged
39 tasks
@skjnldsv skjnldsv merged commit a5c5589 into master Dec 22, 2020
@skjnldsv skjnldsv deleted the feat/dav/move-calendar-rename branch December 22, 2020 07:33
@skjnldsv skjnldsv 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-nextcloud backportbot-nextcloud bot mentioned this pull request Dec 22, 2020
Merged
@skjnldsv skjnldsv removed the pending documentation This pull request needs an associated documentation update label Dec 22, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ChristophWurst ChristophWurst ChristophWurst approved these changes

@juliushaertl juliushaertl juliushaertl approved these changes

@rullzer rullzer Awaiting requested review from rullzer

@nickvergessen nickvergessen Awaiting requested review from nickvergessen

@PVince81 PVince81 Awaiting requested review from PVince81

@tcitworld tcitworld Awaiting requested review from tcitworld tcitworld is a code owner

Assignees

@skjnldsv skjnldsv

Labels
4. to release Ready to be released and/or waiting for tests to finish feature: dav
Projects
None yet
Milestone
Nextcloud 21
Development

Successfully merging this pull request may close these issues.

None yet
6 participants
@skjnldsv @wiswedel @nickvergessen @ChristophWurst @tcitworld @juliushaertl