github.com/owncloud/client.git - Unnamed repository; edit this file 'description' to name the repository.

Age	Commit message (Collapse)	Author
2018-11-05	RemoteDiscoveryTest: Fix after the merge from 2.5	Olivier Goffart
	The new discovery's message is slightly different
2018-11-05	Merge remote-tracking branch 'origin/2.5'	Olivier Goffart
	Conflicts: VERSION.cmake src/gui/generalsettings.ui src/libsync/propagateuploadng.cpp
2018-11-01	Test: Check for folder in error message #6826	Christian Kamm

2018-10-04	Merge remote-tracking branch 'origin/master' into new_discovery_algo	Olivier Goffart
	Conflicts: src/csync/csync_reconcile.cpp src/csync/csync_update.cpp src/libsync/syncengine.cpp src/libsync/syncengine.h Note: csync changes from 5e442f588e86bb84a2e1cb31bce2c9311c58a990 are not included and will be fixed separately
2018-09-14	Delta-Sync: Fix test ↵	Olivier Goffart
	TestRemoteDiscovery::testRemoteDiscoveryError(MissingPermissions) The presence of a zsync meta data file should not prevent the client from detecting missing permissions
2018-07-25	New Discovery Algorithm: handle server errors	Olivier Goffart

2018-07-25	Added test that checks what happens when there is an error in the remote ↵	Olivier Goffart
	discovery (Many of the expected error string are left empty because the current error message is not insterresting