Do not auto merge package-lock.json, but treat as text file
If package-lock is specified to be a binary file, it becomes impossible
to diff any changes. Since we only want to prevent git from merging
changes in the lockfile, we can be more specific and tell it that binary
handling is only required as merge strategy.
[skip ci]
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
Prevent duplicate CalDAV availability slots for recurring slots
If there is the same time slot for more than one day, then we wrote two
recurring AVAILABILITY components before. With this patch equal blocks
are combined into one recurring component. This makes the generated
rules more compact and easier to work with.
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
This job can be initiated by a user to transfer a file/folder to a
target user.
The target user will have to accept the job.
Once that is done the transfers is initiated in the background.
Both parties get notified when the job is done.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>