Skip to content

Commit

Permalink
Release v3.26.1-beta.1 (#2054)
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
taratatach authored Mar 15, 2021
1 parent e92a8d7 commit 6218ece
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 1 deletion.
17 changes: 17 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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 <[email protected]> (https://cozycloud.cc/)",
Expand Down

0 comments on commit 6218ece

Please sign in to comment.