projects / nextcloud-desktop.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 4116c90) | patch
Use the ConflictDialog directly from the activity list
authorKevin Ottens <kevin.ottens@nextcloud.com>
Wed, 7 Oct 2020 16:05:21 +0000 (18:05 +0200)
committerKevin Ottens <kevin.ottens@nextcloud.com>
Thu, 22 Oct 2020 14:40:47 +0000 (16:40 +0200)
commitb835092ae9b3ca2859a830c7d485f0c9025a6399
tree6d52659ca3733855fbf649dc8430775e0255366etree | snapshot
parent4116c90c9cb0ee0e0a37affc3903e2965548b252commit | diff
Use the ConflictDialog directly from the activity list

No need to go to the file manager first to then have the user go through
the context menu, just popup the dialog directly.

Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>
src/gui/tray/ActivityListModel.cpp diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.