Valdnet
bca915a230
l10n: Correct word
...
Signed-off-by: Valdnet <47037905+Valdnet@users.noreply.github.com>
2023-01-31 12:59:01 +01:00
Claudio Cambra
4c4e8707da
Improve wording in the case clash resolution dialog
...
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
2023-01-25 16:37:36 +01:00
Claudio Cambra
64e585e5a2
Display both files and some metadata in the case clash conflict resolution dialog
...
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
2023-01-25 16:37:36 +01:00
Claudio Cambra
2359c80c13
Fix case clash dialog sizing issues
...
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
2023-01-25 16:37:36 +01:00
Matthieu Gallien
602b8db5e2
handle case clash conflicts in a similar way to content conflicts
...
introduce a new type of conflict for case clash filename conflicts
add proper handling including a new utility class to solve them and a
new dialog for the user to pick a fix
Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
2023-01-25 16:37:35 +01:00
