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

[stable25] fix event moving #37813

Merged
merged 1 commit into from
Jun 13, 2023
Merged

[stable25] fix event moving #37813

merged 1 commit into from
Jun 13, 2023

Conversation

tcitworld
Copy link
Member

Manual backport of #37046

@tcitworld tcitworld added bug 3. to review Waiting for reviews feature: caldav Related to CalDAV internals labels Apr 19, 2023
@tcitworld tcitworld added this to the Nextcloud 25.0.7 milestone Apr 19, 2023
@tcitworld tcitworld changed the base branch from master to stable25 April 19, 2023 08:21
@tcitworld tcitworld mentioned this pull request Apr 19, 2023
Merged
@nickvergessen nickvergessen removed their request for review April 19, 2023 08:45
@ChristophWurst ChristophWurst 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
@blizzz blizzz mentioned this pull request May 16, 2023
Merged
@blizzz
Copy link
Member

blizzz commented May 17, 2023 •
edited
Loading

please fix the signoff (DCO check)

@blizzz
Copy link
Member

blizzz commented May 17, 2023

also drone is fully red

@tcitworld tcitworld force-pushed the backport/stable25-fix-event-moving branch from 949c71f to 6ce448f Compare May 17, 2023 12:08
@tcitworld
Copy link
Member Author

Should be fine

@blizzz
Copy link
Member

blizzz commented May 17, 2023

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
Copy link
Member

blizzz commented May 17, 2023

→ 25.0.8

@blizzz blizzz mentioned this pull request Jun 12, 2023
Merged
@szaimen szaimen 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 tcitworld force-pushed the backport/stable25-fix-event-moving branch from 6ce448f to 77fa3d7 Compare June 12, 2023 13:54
@szaimen szaimen added 3. to review Waiting for reviews and removed 2. developing Work in progress labels Jun 12, 2023
@tcitworld
Copy link
Member Author

(Relevant) CI is happy again.

@szaimen
Copy link
Contributor

szaimen commented Jun 13, 2023

So merge @ChristophWurst ?

@blizzz blizzz 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 stable25 Jun 13, 2023
@blizzz blizzz deleted the backport/stable25-fix-event-moving branch June 13, 2023 15:35
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

@miaulalala miaulalala miaulalala approved these changes

@solracsf solracsf solracsf approved these changes

Assignees
No one assigned
Labels
4. to release Ready to be released and/or waiting for tests to finish bug feature: caldav Related 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