Skip to content

[stable25] fix event moving - #37813

Merged
blizzz merged 1 commit into
stable25from
backport/stable25-fix-event-moving
Jun 13, 2023
Merged

[stable25] fix event moving#37813
blizzz merged 1 commit into
stable25from
backport/stable25-fix-event-moving

Conversation

@tcitworld

@tcitworldtcitworld commented Apr 19, 2023

Copy link
Copy Markdown
Member

Manual backport of #37046

@tcitworldtcitworld added bug 3. to review Waiting for reviews feature: caldav Related to CalDAV internals labels Apr 19, 2023
@tcitworldtcitworld added this to the Nextcloud 25.0.7 milestone Apr 19, 2023
@tcitworld
tcitworld changed the base branch from master to stable25April 19, 2023 08:21
@tcitworldtcitworld mentioned this pull request Apr 19, 2023
Merged
@nickvergessen
nickvergessen removed their request for review April 19, 2023 08:45
@ChristophWurstChristophWurst added 4. to release Ready to be released and/or waiting for tests to finish and removed 3. to review Waiting for reviews labels Apr 19, 2023
@blizzzblizzz mentioned this pull request May 16, 2023
Merged
@blizzz

blizzz commented May 17, 2023•
edited
Loading

Copy link
Copy Markdown
Member

please fix the signoff (DCO check)

@blizzz

blizzz commented May 17, 2023

Copy link
Copy Markdown
Member

also drone is fully red

@tcitworld
tcitworldforce-pushed the backport/stable25-fix-event-moving branch from 949c71f to 6ce448fCompareMay 17, 2023 12:08
@tcitworld

tcitworld commented May 17, 2023

Copy link
Copy Markdown
MemberAuthor

Should be fine

@blizzz

blizzz commented May 17, 2023

Copy link
Copy Markdown
Member

related?

1) OCA\DAV\Tests\unit\CalDAV\CalDavBackendTest::testSearchPrincipal
Failed asserting that two strings are equal.
--- Expected
+++ Actual
@@ @@
END:VTIMEZONE\n
BEGIN:VEVENT\n
DTSTART;TZID=Europe/Berlin:20160419T130000\n
-SUMMARY:My Test (public)\n
-CLASS:PUBLIC\n
+SUMMARY:My Test (confidential)\n
+CLASS:CONFIDENTIAL\n
TRANSP:OPAQUE\n
STATUS:CONFIRMED\n
DTEND;TZID=Europe/Berlin:20160419T140000\n
@@ @@
LAST-MODIFIED:20160419T074202Z\n
DTSTAMP:20160419T074202Z\n
CREATED:20160419T074202Z\n
-UID:2e468c48-7860-492e-bc52-92fa0daeeccf.1461051722310-1\n
+UID:2e468c48-7860-492e-bc52-92fa0daeeccf.1461051722310-3\n
END:VEVENT\n
END:VCALENDAR'

@blizzz

blizzz commented May 17, 2023

Copy link
Copy Markdown
Member

→ 25.0.8

@blizzzblizzz mentioned this pull request Jun 12, 2023
Merged
@szaimenszaimen added 2. developing Work in progress and removed 4. to release Ready to be released and/or waiting for tests to finish labels Jun 12, 2023
@max65482@tcitworld
fix event move issue
77fa3d7
Signed-off-by: Maximilian Martin <maximilian_martin@gmx.de>
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
@tcitworld
tcitworldforce-pushed the backport/stable25-fix-event-moving branch from 6ce448f to 77fa3d7CompareJune 12, 2023 13:54
@szaimenszaimen added 3. to review Waiting for reviews and removed 2. developing Work in progress labels Jun 12, 2023
@tcitworld

tcitworld commented Jun 13, 2023

Copy link
Copy Markdown
MemberAuthor

(Relevant) CI is happy again.

@szaimen

szaimen commented Jun 13, 2023

Copy link
Copy Markdown
Contributor

So merge @ChristophWurst ?

@blizzzblizzz added 4. to release Ready to be released and/or waiting for tests to finish and removed 3. to review Waiting for reviews labels Jun 13, 2023
@blizzz
blizzz merged commit e21f846 into stable25Jun 13, 2023
@blizzz
blizzz deleted the backport/stable25-fix-event-moving branch June 13, 2023 15:35
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@ChristophWurstChristophWurstChristophWurst approved these changes
@miaulalalamiaulalalamiaulalala approved these changes
@solracsfsolracsfsolracsf approved these changes

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 25.0.8

Development

Successfully merging this pull request may close these issues.

7 participants

@tcitworld@blizzz@szaimen@ChristophWurst@miaulalala@solracsf@max65482