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.

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

[stable28] Expose subscription calendars #45225

Merged
merged 1 commit into from
May 31, 2024
Merged

Conversation

backportbot[bot]
Copy link

@backportbot backportbot bot commented May 7, 2024

Backport of #44752

Warning, This backport's changes differ from the original and might be incomplete ⚠️

Todo

  • Review and resolve any conflicts
  • Amend HEAD commit to remove the line stating to skip CI

Learn more about backports at https://docs.nextcloud.com/server/stable/go.php?to=developer-backports.

@backportbot backportbot bot added enhancement 3. to review Waiting for reviews labels May 7, 2024
@backportbot backportbot bot added this to the Nextcloud 28.0.6 milestone May 7, 2024
@@ -59,6 +61,10 @@ public function checkPrivileges($uri, $privileges, $recursion = self::R_PARENT,
case AddressBook::class:
$type = 'Addressbook';
break;
case Calendar::class:
Copy link
Contributor

Choose a reason for hiding this comment

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

The mapping for Calendar was added by https://github.com/nextcloud/server/pull/43117/files#diff-8df254811855b970fe5bc8f1cd91076b1b5e395a2a63d1af7c835274953d2ed8R62-R64 which was not backported to 28 and therefore caused the different diff. Backported the needed changes for the integration test (Node => Calendar) as well to make the test suite pass.

@kesselb kesselb marked this pull request as ready for review May 8, 2024 09:09
@kesselb kesselb requested a review from tcitworld as a code owner May 8, 2024 09:09
This was referenced May 15, 2024
@kesselb kesselb added 4. to release Ready to be released and/or waiting for tests to finish and removed 3. to review Waiting for reviews labels May 24, 2024
@kesselb kesselb merged commit 49b9704 into stable28 May 31, 2024
54 checks passed
@kesselb kesselb deleted the backport/44752/stable28 branch May 31, 2024 18:09
@blizzz blizzz mentioned this pull request Jun 11, 2024
6 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
4. to release Ready to be released and/or waiting for tests to finish enhancement
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants