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

[stable29] fix: Bring back federated editing in viewer iframe #3939

Merged
merged 3 commits into from
Aug 21, 2024

Conversation

backportbot[bot]
Copy link

@backportbot backportbot bot commented Aug 21, 2024

Backport of #3669

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 bug Something isn't working 3. to review Ready to be reviewed labels Aug 21, 2024
@backportbot backportbot bot added this to the Nextcloud 29 milestone Aug 21, 2024
Signed-off-by: Julius Härtl <jus@bitgrid.net>

chore: Move to route attributes

Signed-off-by: Julius Härtl <jus@bitgrid.net>
Signed-off-by: Julius Härtl <jus@bitgrid.net>
This reverts commit f790b57.

Signed-off-by: Julius Härtl <jus@bitgrid.net>
@juliushaertl juliushaertl marked this pull request as ready for review August 21, 2024 11:30
@juliushaertl juliushaertl merged commit ba2f01f into stable29 Aug 21, 2024
58 checks passed
@juliushaertl juliushaertl deleted the backport/3669/stable29 branch August 21, 2024 13:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
3. to review Ready to be reviewed bug Something isn't working
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant