Skip to content

fix(caldav): respect federation settings#61293

Merged
ChristophWurst merged 1 commit into
masterfrom
fix/federation-settings-calendar
Jun 17, 2026
Merged

fix(caldav): respect federation settings#61293
ChristophWurst merged 1 commit into
masterfrom
fix/federation-settings-calendar

Conversation

@hamza221

@hamza221 hamza221 commented Jun 15, 2026

Copy link
Copy Markdown
Contributor

Summary

Respect federation settings when creating a federated calendar share

Checklist

AI (if applicable)

  • The content of this PR was partly or fully generated using AI

@hamza221 hamza221 self-assigned this Jun 15, 2026
@hamza221 hamza221 added bug 3. to review Waiting for reviews feature: caldav Related to CalDAV internals labels Jun 15, 2026
@hamza221 hamza221 added this to the Nextcloud 35 milestone Jun 15, 2026
@hamza221

Copy link
Copy Markdown
Contributor Author

/backport to stable34

@hamza221

Copy link
Copy Markdown
Contributor Author

/backport to stable33

@hamza221

Copy link
Copy Markdown
Contributor Author

/backport to stable32

@hamza221

Copy link
Copy Markdown
Contributor Author

/backport to stable31

@hamza221

Copy link
Copy Markdown
Contributor Author

/backport to stable30

@hamza221

Copy link
Copy Markdown
Contributor Author

/backport to stable29

@hamza221 hamza221 added 2. developing Work in progress and removed 3. to review Waiting for reviews labels Jun 15, 2026
Comment thread apps/dav/lib/CalDAV/Federation/CalendarFederationConfig.php Outdated
Comment thread apps/dav/lib/CalDAV/Federation/CalendarFederationConfig.php Outdated
Comment thread apps/dav/lib/CalDAV/Federation/CalendarFederationConfig.php Outdated
Comment thread apps/dav/lib/CalDAV/Federation/CalendarFederationConfig.php Outdated
Comment thread apps/dav/lib/CalDAV/Federation/FederationSharingService.php Outdated
@hamza221 hamza221 force-pushed the fix/federation-settings-calendar branch from 8eec68a to 2b026b1 Compare June 15, 2026 16:08
@hamza221 hamza221 added 3. to review Waiting for reviews and removed 2. developing Work in progress labels Jun 15, 2026
@hamza221 hamza221 force-pushed the fix/federation-settings-calendar branch from 2b026b1 to c967772 Compare June 16, 2026 14:44
Signed-off-by: Hamza <hamzamahjoubi221@gmail.com>
@hamza221 hamza221 force-pushed the fix/federation-settings-calendar branch from c967772 to 6280efc Compare June 16, 2026 14: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 Jun 17, 2026
@ChristophWurst ChristophWurst merged commit e9c95a0 into master Jun 17, 2026
213 of 224 checks passed
@ChristophWurst ChristophWurst deleted the fix/federation-settings-calendar branch June 17, 2026 12:43
@backportbot

backportbot Bot commented Jun 17, 2026

Copy link
Copy Markdown

The backport to stable29 failed. Please do this backport manually.

# Switch to the target branch and update it
git checkout stable29
git pull origin stable29

# Create the new backport branch
git checkout -b backport/61293/stable29

# Cherry pick the change from the commit sha1 of the change against the default branch
# This might cause conflicts, resolve them
git cherry-pick 6280efcf

# Push the cherry pick commit to the remote repository and open a pull request
git push origin backport/61293/stable29

Error: Failed to check for changes with origin/stable29: No changes found in backport branch


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

@backportbot

backportbot Bot commented Jun 17, 2026

Copy link
Copy Markdown

The backport to stable30 failed. Please do this backport manually.

# Switch to the target branch and update it
git checkout stable30
git pull origin stable30

# Create the new backport branch
git checkout -b backport/61293/stable30

# Cherry pick the change from the commit sha1 of the change against the default branch
# This might cause conflicts, resolve them
git cherry-pick 6280efcf

# Push the cherry pick commit to the remote repository and open a pull request
git push origin backport/61293/stable30

Error: Failed to check for changes with origin/stable30: No changes found in backport branch


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

@backportbot

backportbot Bot commented Jun 17, 2026

Copy link
Copy Markdown

The backport to stable31 failed. Please do this backport manually.

# Switch to the target branch and update it
git checkout stable31
git pull origin stable31

# Create the new backport branch
git checkout -b backport/61293/stable31

# Cherry pick the change from the commit sha1 of the change against the default branch
# This might cause conflicts, resolve them
git cherry-pick 6280efcf

# Push the cherry pick commit to the remote repository and open a pull request
git push origin backport/61293/stable31

Error: Failed to check for changes with origin/stable31: No changes found in backport branch


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

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 backport-request bug feature: caldav Related to CalDAV internals

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants