SocketAPI: Introduce conflict resolution actions #6252
authorChristian Kamm <mail@ckamm.de>
Wed, 7 Oct 2020 12:51:04 +0000 (14:51 +0200)
committerKevin Ottens <kevin.ottens@nextcloud.com>
Thu, 22 Oct 2020 14:40:10 +0000 (16:40 +0200)
commit00e901f5a712e778c987b71a09b5816450bce8d6
tree3c2bb05b65f703044622671eee66d9aaa1c87efd
parentf62be57ef2c1c81a1c161411f1293572486ae0a9
SocketAPI: Introduce conflict resolution actions #6252

For conflicts generally as well as new files in read-only directories
the context menu will now present delete and move options.

Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>
src/common/syncjournaldb.cpp
src/common/syncjournaldb.h
src/common/utility.cpp
src/common/utility.h
src/gui/socketapi.cpp
src/gui/socketapi.h
src/libsync/filesystem.h
src/libsync/syncengine.cpp
test/testsyncconflict.cpp