In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

Christophe Giboudeaux authored Aug 17, 2020 and Volker Krause committed Sep 04, 2020

Relicensing allowed: lgplv2+ +eV gplv23 lgplv23 gplv2+

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

When a to-do in the time-of-day part of the agenda view is dragged, its
start time is reset to 30 minutes earlier than the due time, because the
agenda view bases its calculations on the size of the graphical item.
This patch shifts the start and the next recurrence, if present, to match
the change in the due date.

This patch fixes some bugs in the Event View:

 * If the Event List view contains a mix of events, to-dos, and journal
   entries, sorting by their start date/time does not order them correctly,
   because the start values for to-do and journal list items are undefined.

 * The sorting code does not consider recurring to-dos.

 * Sorting by end date/time puts the list items in the reverse of the
 Â correct order;  try sorting the end date/time column and the summary
   column into ascending order, and compare the up/down indicators in the
   column headers.

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

BUG: 94625

In the agenda view, dragging from the all-day area to the timed area
changes the incidence's start time to 00:00, so it likely will appear
outside the visible area.  This patch sets start and due times so that
th eincidence will appear near where it was dropped.