-
-
Notifications
You must be signed in to change notification settings - Fork 4.1k
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
Fix event moving issues #37046
Fix event moving issues #37046
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Makes sense!
/backport to stable26 |
/backport to stable25 |
/backport to stable24 |
/rebase |
@max65482 could you please rebase your branch to latest origin/master? This will rerun CI and hopefully make all checks pass. |
Will this also fix #34162? It has been opened in nextcloud/server and I am waiting quite impatiently for a quite while now. The bug is existing in various versions. Thanks! |
038fd20
to
6cf2060
Compare
@ChristophWurst Done! |
Yes, it should! |
Awesome! |
One more rebase please 🙏 |
Signed-off-by: Maximilian Martin <maximilian_martin@gmx.de>
6cf2060
to
c898594
Compare
@tcitworld Done! |
The backport to stable26 failed. Please do this backport manually. # Switch to the target branch and update it
git checkout stable26
git pull origin/stable26
# Create the new backport branch
git checkout -b fix/foo-stable26
# Cherry pick the change from the commit sha1 of the change against the default branch
# This might cause conflicts. Resolve them.
git cherry-pick abc123
# Push the cherry pick commit to the remote repository and open a pull request
git push origin fix/foo-stable26 More info at https://docs.nextcloud.com/server/latest/developer_manual/getting_started/development_process.html#manual-backport |
The backport to stable25 failed. Please do this backport manually. # Switch to the target branch and update it
git checkout stable25
git pull origin/stable25
# Create the new backport branch
git checkout -b fix/foo-stable25
# Cherry pick the change from the commit sha1 of the change against the default branch
# This might cause conflicts. Resolve them.
git cherry-pick abc123
# Push the cherry pick commit to the remote repository and open a pull request
git push origin fix/foo-stable25 More info at https://docs.nextcloud.com/server/latest/developer_manual/getting_started/development_process.html#manual-backport |
The backport to stable24 failed. Please do this backport manually. # Switch to the target branch and update it
git checkout stable24
git pull origin/stable24
# Create the new backport branch
git checkout -b fix/foo-stable24
# Cherry pick the change from the commit sha1 of the change against the default branch
# This might cause conflicts. Resolve them.
git cherry-pick abc123
# Push the cherry pick commit to the remote repository and open a pull request
git push origin fix/foo-stable24 More info at https://docs.nextcloud.com/server/latest/developer_manual/getting_started/development_process.html#manual-backport |
We are still experiencing issue, mentioned in 4735 Moving an event from one calendar to another (by browser or client on macOS) leads to duplicated events on all other macOS and iOS clients. View by browser allways correct. |
Could not reproduce it with
Couldn't get my hands on any other iOS device yet. |
You are right. Given your result, I wiped the setup and reconfigured. Moving an event "1" on "userA" account from calendar "blue" to "red" is now being reflected on other device and "userB" (got shared access to "red" and "blue" from "userA"). First it was in the "blue", now it shows up in "red", while simultaneously being deleted from "red". |
Fixes #4735,
fixes #4538
in calendar app and
fixes #34162 in server.
A wrong assignment of change types in the CalDav backend prevented proper synchronization of duplicated/moved events.