Skip to content

[stable27] fix(CalDAV): check birthday calendar owner - #40309

Merged
blizzz merged 1 commit into
stable27from
backport/40292/stable27
Sep 7, 2023
Merged

[stable27] fix(CalDAV): check birthday calendar owner#40309
blizzz merged 1 commit into
stable27from
backport/40292/stable27

Conversation

@backportbot-nextcloud

@backportbot-nextcloudbackportbot-nextcloudBot commented Sep 6, 2023

Copy link
Copy Markdown

Backport of #40292

@backportbot-nextcloudbackportbot-nextcloudBot added bug feature: caldav Related to CalDAV internals labels Sep 6, 2023
@backportbot-nextcloudbackportbot-nextcloudBot added this to the Nextcloud 27.1.0 milestone Sep 6, 2023
@miaulalala
miaulalalaforce-pushed the backport/40292/stable27 branch from 028cd7b to 38612fcCompareSeptember 7, 2023 06:58
@miaulalala
fix(CalDAV): check birthday calendar owner
9459352
Signed-off-by: Anna Larch <anna@nextcloud.com>
@miaulalala
miaulalalaforce-pushed the backport/40292/stable27 branch from 38612fc to 9459352CompareSeptember 7, 2023 07:25
@miaulalala

miaulalala commented Sep 7, 2023

Copy link
Copy Markdown
Contributor

Js fails with

TOTAL: 1 FAILED, 764 SUCCESS
1) shows conflict dialog when no client side conflict
OC.Upload tests Upload conflicts
Expected false to equal true.
at apps/files/tests/js/fileUploadSpec.js:224:42

@blizzzblizzz mentioned this pull request Sep 7, 2023
Merged
6 tasks
@blizzzblizzz added the 4. to release Ready to be released and/or waiting for tests to finish label Sep 7, 2023
@blizzz
blizzz merged commit ea48ef5 into stable27Sep 7, 2023
@blizzz
blizzz deleted the backport/40292/stable27 branch September 7, 2023 10:55
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@AndyScherzingerAndyScherzingerAndyScherzinger approved these changes
@bigcat88bigcat88bigcat88 approved these changes
@ChristophWurstChristophWurstAwaiting requested review from ChristophWurstChristophWurst is a code owner
@miaulalalamiaulalalaAwaiting requested review from miaulalalamiaulalala is a code owner
@tcitworldtcitworldAwaiting requested review from tcitworldtcitworld is a code owner
@AltahrimAltahrimAwaiting requested review from Altahrim
@provokateurinprovokateurinAwaiting requested review from provokateurin

Assignees

No one assigned

Labels

4. to releaseReady to be released and/or waiting for tests to finishbugfeature: caldavRelated to CalDAV internals

Projects

None yet

Milestone

Nextcloud 27.1.0

Development

Successfully merging this pull request may close these issues.

4 participants

@miaulalala@AndyScherzinger@bigcat88@blizzz