 Matthieu Gallien
|
31e4dede62
refactor common parts of conflict delegate into a separate component
|
2 yıl önce |
|
Matthieu Gallien
|
230e2de23a
solve multiple conflicts from choose resolution
|
2 yıl önce |
|
Matthieu Gallien
|
739c56c04a
allow selecting conflict resolutions for many conflicts
|
2 yıl önce |
|
Matthieu Gallien
|
8d52d4e4cc
implement more feedback
|
2 yıl önce |
|
Matthieu Gallien
|
fa135a4228
ensure the URL to mimetype icons are correct
|
2 yıl önce |
|
Matthieu Gallien
|
382a58c6bd
allow the conflicts dialog to close
|
2 yıl önce |
|
Matthieu Gallien
|
30bba4c906
fix automated tests
|
2 yıl önce |
|
Matthieu Gallien
|
2e501f0c75
add some margins at bottom of items in conflicts list view
|
2 yıl önce |
|
Matthieu Gallien
|
6efa9f81be
prevent close of conflicts dialog on focus lost
|
2 yıl önce |
|
Matthieu Gallien
|
779cc3a75b
display icons for files when solving many conflicts
|
2 yıl önce |
|
Matthieu Gallien
|
789ca7230a
plug models into the dialog
|
2 yıl önce |
|
Matthieu Gallien
|
f799d8c697
tune the pipes to really get a dialog to show for many conflicts
|
2 yıl önce |
|
Matthieu Gallien
|
c118958d3d
do not show many conflicts dialog for a single conflict
|
2 yıl önce |
|
Matthieu Gallien
|
72b78c9011
replace "Sync now" button by "Solve all conflicts" for many conflicts
|
2 yıl önce |
|
Matthieu Gallien
|
280094b220
model: first step
|
2 yıl önce |
|
Matthieu Gallien
|
8f61d539da
replace "OK" button by "Resolve conflicts" to help users
|
2 yıl önce |
|
Matthieu Gallien
|
4bd93e39d6
more qml feedback
|
2 yıl önce |
|
Matthieu Gallien
|
396accd208
feedback from design review
|
2 yıl önce |
|
Matthieu Gallien
|
1491c134c3
basic implementation of a dialog to resolve conflicts as a batch
|
2 yıl önce |
|
Matthieu Gallien
|
7b4245a3c3
fix #include header style
|
2 yıl önce |
 Nextcloud bot
|
37bd3f3db5
Fix(l10n): Update translations from Transifex
|
2 yıl önce |
 Claudio Cambra
|
6ff45bf342
Merge pull request #5654 from nextcloud/bugfix/ask-before-importing-legacy
|
2 yıl önce |
|
Claudio Cambra
|
3dd838d28d
Rename forcelegacyimport option to clearer forcelegacyconfigimport
|
2 yıl önce |
|
Claudio Cambra
|
b864bef2e8
Add application argument to force import of legacy accounts
|
2 yıl önce |
|
Claudio Cambra
|
c8f8c9cd2c
Don't ask user whether to import legacy account configs if forcing legacy import
|
2 yıl önce |
|
Claudio Cambra
|
e43f627c9f
Add forceLegacyImport property to accountmanager
|
2 yıl önce |
|
Claudio Cambra
|
efce1b6abf
Declare void setters and methods in accountmanager as slots
|
2 yıl önce |
|
Claudio Cambra
|
c3fda69e33
Place signals and slots for accountmanager in line with how this is done in other classes
|
2 yıl önce |
|
Claudio Cambra
|
6eb2fd1cc0
Notify result of attempted account import with messagebox
|
2 yıl önce |
|
Claudio Cambra
|
fba808103c
Ask before attempting to import legacy accounts
|
2 yıl önce |
