alex-z
|
a7fdf14196
|
Display correct conflict part in multiple conflicts resolution dialog.
Signed-off-by: alex-z <blackslayer4@gmail.com>
|
2023-09-12 09:04:21 +02:00 |
|
Matthieu Gallien
|
5349395063
|
model improvements
Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
|
2023-05-17 08:43:54 +02:00 |
|
Matthieu Gallien
|
230e2de23a
|
solve multiple conflicts from choose resolution
Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
|
2023-05-17 08:43:54 +02:00 |
|
Matthieu Gallien
|
739c56c04a
|
allow selecting conflict resolutions for many conflicts
Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
|
2023-05-17 08:43:54 +02:00 |
|
Matthieu Gallien
|
fa135a4228
|
ensure the URL to mimetype icons are correct
Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
|
2023-05-17 08:43:54 +02:00 |
|
Matthieu Gallien
|
779cc3a75b
|
display icons for files when solving many conflicts
Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
|
2023-05-17 08:43:54 +02:00 |
|
Matthieu Gallien
|
280094b220
|
model: first step
Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
|
2023-05-17 08:43:54 +02:00 |
|