From 6218ece628897dcbe96f4484a73360590c937e54 Mon Sep 17 00:00:00 2001 From: Erwan Guyader Date: Mon, 15 Mar 2021 11:49:03 +0100 Subject: [PATCH] Release v3.26.1-beta.1 (#2054) Improvements for all users: - The mechanism we introduced in the last version to reseolve conflicts from the synchronization process when we've run out of options was assuming that the current date of the computer would always be greater than the last modification date of the document being renamed on the remote Cozy. Since this is not always the case and the remote Cozy will refuse the renaming in those situations, we'll use the same workaround than for the other requests and send the most recent date between the current local date and the last modification date of the remote document. --- CHANGELOG.md | 17 +++++++++++++++++ package.json | 2 +- 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 89b960882..4ea232e00 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,22 @@ # Cozy Drive for Desktop: Changelog +## 3.26.1-beta.1 - 2021-03-15 + +Improvements for all users: + +- The mechanism we introduced in the last version to resolve conflicts from the + synchronization process when we've run out of options was assuming that the + current date of the computer would always be greater than the last + modification date of the document being renamed on the remote Cozy. + Since this is not always the case and the remote Cozy will refuse the renaming + in those situations, we'll use the same workaround than for the other requests + and send the most recent date between the current local date and the last + modification date of the remote document. + +See also [known issues](https://github.com/cozy-labs/cozy-desktop/blob/master/KNOWN_ISSUES.md). + +Happy syncing! + ## 3.26.0 - 2021-03-08 Improvements for all users: diff --git a/package.json b/package.json index 2955c9841..b9581e678 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "CozyDrive", "productName": "Cozy Drive", "private": true, - "version": "3.26.0", + "version": "3.26.1-beta.1", "description": "Cozy Drive is a synchronization tool for your files and folders with Cozy Cloud.", "homepage": "https://github.com/cozy-labs/cozy-desktop", "author": "Cozy Cloud (https://cozycloud.cc/)",