Skip to content

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

Merged
blizzz merged 1 commit into
stable25from
backport/35743/stable25
Jul 13, 2023
Merged

[stable25] Include more information in iMIP email and show diff information on updating an event#36601
blizzz merged 1 commit into
stable25from
backport/35743/stable25

Conversation

@backportbot-nextcloud

@backportbot-nextcloudbackportbot-nextcloudBot commented Feb 8, 2023•
edited by blizzz
Loading

Copy link
Copy Markdown

backport of #35743

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

@github-advanced-securitygithub-advanced-securityAI left a comment

Copy link
Copy Markdown

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.

@blizzzblizzz mentioned this pull request Feb 9, 2023
Merged
@blizzz

blizzz commented Feb 9, 2023

Copy link
Copy Markdown
Member

conflicts and moving to 25.0.5

@MichaIngMichaIng added the 2. developing Work in progress label Feb 27, 2023
@blizzzblizzz mentioned this pull request Mar 13, 2023
Merged
@blizzz

blizzz commented Mar 15, 2023

Copy link
Copy Markdown
Member

@miaulalala what's the outlook here?

@miaulalala
miaulalalaforce-pushed the backport/35743/stable25 branch from 9a07b2d to de162ddCompareMarch 15, 2023 16:57
@miaulalala

miaulalala commented Mar 15, 2023

Copy link
Copy Markdown
Contributor

Resolved conflicts and rebased @blizzz

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

blizzz commented Mar 16, 2023

Copy link
Copy Markdown
Member

→ 25.0.6

@ChristophWurstChristophWurst 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
@blizzzblizzz mentioned this pull request May 16, 2023
Merged
@blizzzblizzz removed this from the Nextcloud 25.0.7 milestone May 17, 2023
@blizzzblizzz added this to the Nextcloud 25.0.8 milestone May 17, 2023
@blizzz

blizzz commented May 17, 2023

Copy link
Copy Markdown
Member

moving to 25.0.8. CI is red @miaulalala

@blizzzblizzz mentioned this pull request Jun 12, 2023
Merged
@blizzz

blizzz commented Jun 13, 2023

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

blizzz commented Jun 15, 2023

Copy link
Copy Markdown
Member

moving to 25.0.9

@blizzzblizzz mentioned this pull request Jul 10, 2023
Merged
@miaulalala
miaulalalaforce-pushed the backport/35743/stable25 branch from c5c4a69 to 040d6f1CompareJuly 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
miaulalalaforce-pushed the backport/35743/stable25 branch from 040d6f1 to 183abe8CompareJuly 11, 2023 10:52
@blizzz

blizzz commented Jul 11, 2023

Copy link
Copy Markdown
Member

failing tests are unrelated. Reviews? :)

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

Reviewers

@blizzzblizzzblizzz approved these changes
@miaulalalamiaulalalamiaulalala approved these changes
@ChristophWurstChristophWurstAwaiting requested review from ChristophWurstChristophWurst is a code owner
@tcitworldtcitworldAwaiting requested review from tcitworldtcitworld is a code owner

Assignees

@miaulalalamiaulalala

Labels

2. developingWork in progressbugfeature: caldavRelated to CalDAV internals

Projects

None yet

Milestone

Nextcloud 25.0.9

Development

Successfully merging this pull request may close these issues.

6 participants

@blizzz@miaulalala@github-advanced-security@ChristophWurst@skjnldsv@MichaIng