 Hannah von Reth
|
4d615c31da
Rename csync_instructions_e -> SyncInsturctions
|
%!s(int64=5) %!d(string=hai) anos |
 Olivier Goffart
|
390af4d41b
Tests: introduce ItemCompletedSpy to avoid a bit of code duplication
|
%!s(int64=6) %!d(string=hai) anos |
|
Olivier Goffart
|
f666511a4b
Discovery: Remove stale DB entries
|
%!s(int64=7) %!d(string=hai) anos |
 Christian Kamm
|
6b571b609c
Conflicts: Rename BasePath to InitialBasePath #6709
|
%!s(int64=7) %!d(string=hai) anos |
|
Olivier Goffart
|
9c99544e0b
Fix test link with older Qt
|
%!s(int64=7) %!d(string=hai) anos |
|
Olivier Goffart
|
c3f745fa76
Conflict handling: add the OC-ConflictBasePath header
|
%!s(int64=7) %!d(string=hai) anos |
|
Christian Kamm
|
00e901f5a7
SocketAPI: Introduce conflict resolution actions #6252
|
%!s(int64=5) %!d(string=hai) anos |
 asapelkin
|
17f39bd09d
little loops optimization
|
%!s(int64=6) %!d(string=hai) anos |
|
Christian Kamm
|
77fcff5bdf
Conflicts: Change tags to be more user friendly #6365
|
%!s(int64=8) %!d(string=hai) anos |
|
Christian Kamm
|
ea142b8018
Conflicts with user name: Fix tests
|
%!s(int64=8) %!d(string=hai) anos |
|
Christian Kamm
|
17d174e6fa
Conflicts: Add user name to conflict file name #6325
|
%!s(int64=8) %!d(string=hai) anos |
|
Christian Kamm
|
b9c7aa8df3
Sync: Deal with file/folder conflicts #6312
|
%!s(int64=8) %!d(string=hai) anos |
|
Christian Kamm
|
a7c0cfc8eb
Upload conflict files #4557
|
%!s(int64=8) %!d(string=hai) anos |
