-
-
Notifications
You must be signed in to change notification settings - Fork 4.2k
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(CalDav): add support for Microsoft time zones #49459
Conversation
b6b5030
to
8425ae8
Compare
/backport to stable30 |
8425ae8
to
dca1412
Compare
dca1412
to
2b6a44e
Compare
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.
Very nice! Thank you
private $vCalendar2; | ||
/** @var VCalendar */ | ||
private $vCalendar3; | ||
private VCalendar $vCalendar1a; |
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.
nitpick: try to avoid this in bug fixes, because it may make the backport process more complicated. I suggest to either have a separate commit for refactorings, which can be left out of the backport, or do this in a separate PR
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.
Okay, I normally don't, I only did it in this fix because this class was only introduced in version 30 and there are no differences.
@SebastianKrupinski please keep the original PR template from https://github.com/nextcloud/server/blob/master/.github/pull_request_template.md. Writing docs is very relevant here. Don't drop this. |
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.
Looks good otherwise
@@ -0,0 +1,49 @@ | |||
<?php |
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.
strict types
As written in #48079, thank you. This MR successfully resolves our issue! |
Signed-off-by: SebastianKrupinski <[email protected]>
4fad4d8
to
a925478
Compare
Thanks for testing, you should see the fix, included in the next release of NC30 |
Signed-off-by: SebastianKrupinski <[email protected]>
/backport to stable29 |
The backport to # Switch to the target branch and update it
git checkout stable30
git pull origin stable30
# Create the new backport branch
git checkout -b backport/49459/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 a9254788 58b04fa7
# Push the cherry pick commit to the remote repository and open a pull request
git push origin backport/49459/stable30 Error: No changes found in backport branch Learn more about backports at https://docs.nextcloud.com/server/stable/go.php?to=developer-backports. |
/backport to stable29 |
The backport to # Switch to the target branch and update it
git checkout stable29
git pull origin stable29
# Create the new backport branch
git checkout -b backport/49459/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 a9254788 58b04fa7
# Push the cherry pick commit to the remote repository and open a pull request
git push origin backport/49459/stable29 Error: No changes found in backport branch Learn more about backports at https://docs.nextcloud.com/server/stable/go.php?to=developer-backports. |
This does not exist in 29, 30+ only |
Summary
Checklist