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] Include more information in iMIP email and show diff information on updating an event #36601

Merged
merged 1 commit into from
Jul 13, 2023
Merged

[stable25] Include more information in iMIP email and show diff information on updating an event #36601

merged 1 commit into from
Jul 13, 2023

Conversation

backportbot-nextcloud[bot]
Copy link

@backportbot-nextcloud backportbot-nextcloud bot commented Feb 8, 2023 •
edited by blizzz
Loading

backport of #35743

@backportbot-nextcloud backportbot-nextcloud bot added bug feature: caldav Related to CalDAV internals labels Feb 8, 2023
@backportbot-nextcloud backportbot-nextcloud bot added this to the Nextcloud 25.0.4 milestone Feb 8, 2023
github-advanced-security[bot]
github-advanced-security bot found potential problems Feb 8, 2023
View reviewed changes
Copy link

@github-advanced-security github-advanced-security bot left a comment

Choose a reason for hiding this comment

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

Psalm found more than 10 potential problems in the proposed changes. Check the Files changed tab for more details.

@blizzz blizzz mentioned this pull request Feb 9, 2023
Merged
@blizzz
Copy link
Member

blizzz commented Feb 9, 2023

conflicts and moving to 25.0.5

@MichaIng MichaIng added the 2. developing Work in progress label Feb 27, 2023
@blizzz blizzz mentioned this pull request Mar 13, 2023
Merged
@blizzz
Copy link
Member

blizzz commented Mar 15, 2023

@miaulalala what's the outlook here?

@miaulalala miaulalala force-pushed the backport/35743/stable25 branch from 9a07b2d to de162dd Compare March 15, 2023 16:57
@miaulalala
Copy link
Contributor

Resolved conflicts and rebased @blizzz

@miaulalala miaulalala added 3. to review Waiting for reviews and removed 2. developing Work in progress labels Mar 15, 2023
@blizzz
Copy link
Member

blizzz commented Mar 16, 2023

→ 25.0.6

@ChristophWurst ChristophWurst added 2. developing Work in progress and removed 3. to review Waiting for reviews labels Apr 11, 2023
This was referenced Apr 13, 2023
Merged
Merged
@blizzz blizzz mentioned this pull request May 16, 2023
Merged
@blizzz blizzz removed this from the Nextcloud 25.0.7 milestone May 17, 2023
@blizzz blizzz added this to the Nextcloud 25.0.8 milestone May 17, 2023
@blizzz
Copy link
Member

blizzz commented May 17, 2023

moving to 25.0.8. CI is red @miaulalala

@blizzz blizzz mentioned this pull request Jun 12, 2023
Merged
@blizzz
Copy link
Member

blizzz commented Jun 13, 2023 

Error: apps/dav/lib/CalDAV/Schedule/IMipPlugin.php:241:12: InvalidArrayOffset: Cannot create offset of type false|string, expecting array-key (see https://psalm.dev/115)
Error: apps/dav/lib/CalDAV/Schedule/IMipPlugin.php:242:17: InvalidArrayOffset: Cannot create offset of type false|string, expecting array-key (see https://psalm.dev/115)

@blizzz
Copy link
Member

blizzz commented Jun 15, 2023

moving to 25.0.9

@blizzz blizzz mentioned this pull request Jul 10, 2023
Merged
@miaulalala miaulalala force-pushed the backport/35743/stable25 branch from c5c4a69 to 040d6f1 Compare July 11, 2023 10:23
@miaulalala
Use recurrence instance to build iMip email
183abe8 
instead of the main VEVENT of a repeating event

Fixes part of nextcloud/calendar#3919

Signed-off-by: Anna Larch <anna@nextcloud.com>
@miaulalala miaulalala force-pushed the backport/35743/stable25 branch from 040d6f1 to 183abe8 Compare July 11, 2023 10:52
@blizzz
Copy link
Member

blizzz commented Jul 11, 2023

failing tests are unrelated. Reviews? :)

@blizzz blizzz merged commit 4f78515 into stable25 Jul 13, 2023
@blizzz blizzz deleted the backport/35743/stable25 branch July 13, 2023 10:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@blizzz blizzz blizzz approved these changes

@miaulalala miaulalala miaulalala approved these changes

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

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

Assignees

@miaulalala miaulalala

Labels
2. developing Work in progress bug feature: caldav Related to CalDAV internals
Projects
None yet
Milestone
Nextcloud 25.0.9
Development

Successfully merging this pull request may close these issues.
5 participants
@blizzz @miaulalala @ChristophWurst @skjnldsv @MichaIng