projects / nextcloud-desktop.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 7b4245a) | patch
basic implementation of a dialog to resolve conflicts as a batch
authorMatthieu Gallien <matthieu.gallien@nextcloud.com>
Fri, 28 Apr 2023 10:43:04 +0000 (12:43 +0200)
committerMatthieu Gallien <matthieu_gallien@yahoo.fr>
Wed, 17 May 2023 06:43:54 +0000 (08:43 +0200)
commit1491c134c3fd9326e401c31fd68db9c2328182ba
tree06b164e1abf2694bbdea9a3e3c1e3c8683979e51tree | snapshot
parent7b4245a3c3b65c8fc124f8d81523fdc3a7f1bfc0commit | diff
basic implementation of a dialog to resolve conflicts as a batch

will allow solving all conflicts at once

FIX #2786

Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
resources.qrc diff | blob | history
src/gui/ConflictDelegate.qml [new file with mode: 0644] blob
src/gui/ResolveConflictsDialog.qml [new file with mode: 0644] blob
src/gui/main.cpp diff | blob | history
src/gui/systray.cpp diff | blob | history
src/gui/systray.h diff | blob | history
src/gui/tray/activitylistmodel.cpp diff | blob | history
src/gui/tray/activitylistmodel.h diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.