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

Age	Commit message (Collapse)	Author
2018-12-03	Test: fix compilaiton after merge	Olivier Goffart

2018-12-03	Merge branch 'readonly-restore-context-6252' into 'master'	Olivier Goffart
	Conflicts: src/gui/socketapi.cpp src/gui/socketapi.h src/libsync/syncengine.cpp
2018-10-16	Discovery: Remove stale DB entries	Olivier Goffart
	And test the Remove/Remove case. This means we need to always query the database for all the entries. This showed another small bug in the test in which sync item for virtual files at the root could have a slash in front of them.
2018-08-22	Conflicts: Rename BasePath to InitialBasePath #6709	Christian Kamm

2018-08-21	Fix test link with older Qt	Olivier Goffart

2018-08-19	Conflict handling: add the OC-ConflictBasePath header	Olivier Goffart
	Issue #6702
2018-05-23	SocketAPI: Introduce conflict resolution actions #6252	Christian Kamm
	For conflicts generally as well as new files in read-only directories the context menu will now present delete and move options.
2018-04-03	Conflicts: Change tags to be more user friendly #6365	Christian Kamm
	From "_conflict-user-yyyymmdd-hhmmss" to " (conflicted copy user yyyy-mm-dd hhmmss)"
2018-02-20	Conflicts with user name: Fix tests	Christian Kamm

2018-02-20	Conflicts: Add user name to conflict file name #6325	Christian Kamm
	For the case of uploading conflict files only.
2018-01-19	Sync: Deal with file/folder conflicts #6312	Christian Kamm
	Previously conflicts with a different type on both ends lead to sync errors. Now they are handled in the expected way: the local item gets renamed and the remote item gets propagated downwards. This also adds a unittest for the TYPE_CHANGE case. That one looks like parts of it might be unified with CONFLICT cases.
2017-12-15	Upload conflict files #4557	Christian Kamm
	If the server has the 'uploadConflictFiles' capability conflict files will be uploaded instead of ignored. Uploaded conflict files have the following headers set during upload OC-Conflict: 1 OC-ConflictBaseFileId: 172489174instanceid OC-ConflictBaseMtime: 1235789213 OC-ConflictBaseEtag: myetag when the data is available. Downloads accept the same headers in return when downloading a conflict file. In the absence of server support clients will identify conflict files through the file name pattern and attempt to deduce the base fileid. Base etag and mtime can't be deduced though. The upload job for a new conflict file will be triggered directly from the job that created the conflict file now. No second sync run is necessary anymore. This commit does not yet introduce a 'username' like identifier that automatically gets added to conflict file filenames (to name the files foo_conflict-Fred-1345.txt instead of just foo_conflict-1345.txt).