[stable24] fix(caldav): Fix reminder timezone drift for all-day events#36662
Merged
[stable24] fix(caldav): Fix reminder timezone drift for all-day events#36662
Conversation
Merged
Member
|
moving to 24.0.11. also, conflicts. |
Member
|
/rebase |
9af2be6 to
77f6ed9
Compare
77f6ed9 to
51f828d
Compare
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
51f828d to
ba6e13d
Compare
Member
|
Conflict solved. 'id' => $reminder['object_id'],
], $reminder['event_hash'], $alarmHash, true, false);
- ], $reminder['event_hash'], $alarmHash, true, false);
+ ], $calendarTimeZone, $reminder['event_hash'], $alarmHash, true, false);
$this->writeRemindersToDatabase($alarms);Was not done automatically due to changed indentation. |
ChristophWurst
approved these changes
Feb 27, 2023
MichaIng
approved these changes
Feb 27, 2023
Merged
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
backport of #36192