7 Commits

Author	SHA1	Message	Date
Olivier Goffart	53080f4836	RemoteDiscoveryTest: Fix after the merge from 2.5 ... The new discovery's message is slightly different	2018-11-05 12:03:39 +01:00
Olivier Goffart	7941cd4b16	Merge remote-tracking branch 'origin/2.5' ... Conflicts: VERSION.cmake src/gui/generalsettings.ui src/libsync/propagateuploadng.cpp	2018-11-05 11:51:29 +01:00
Christian Kamm	29997bbe44	Test: Check for folder in error message #6826	2018-11-01 12:13:16 +01:00
Olivier Goffart	28f1c95b96	Merge remote-tracking branch 'origin/master' into new_discovery_algo ... Conflicts: src/csync/csync_reconcile.cpp src/csync/csync_update.cpp src/libsync/syncengine.cpp src/libsync/syncengine.h Note: csync changes from 5e442f588e are not included and will be fixed separately	2018-10-04 11:23:19 +02:00
Olivier Goffart	9f56db67ef	Delta-Sync: Fix test TestRemoteDiscovery::testRemoteDiscoveryError(MissingPermissions) ... The presence of a zsync meta data file should not prevent the client from detecting missing permissions	2018-09-14 16:13:15 +02:00
Olivier Goffart	835c916337	New Discovery Algorithm: handle server errors	2018-07-25 15:24:30 +02:00
Olivier Goffart	56166deb76	Added test that checks what happens when there is an error in the remote discovery ... (Many of the expected error string are left empty because the current error message is not insterresting	2018-07-25 13:48:58 +02:00