mirrors/nextcloud-desktop
1
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2024-12-20 21:02:02 +03:00
Code Issues Projects Releases Packages Wiki Activity
20110 commits 486 branches 258 tags 463 MiB
Commit graph

20110 commits

This branch
This branch
All branches
Author SHA1 Message Date
Matthieu Gallien
382a58c6bd allow the conflicts dialog to close 
Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
 2023-05-17 08:43:54 +02:00
Matthieu Gallien
30bba4c906 fix automated tests 
Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
 2023-05-17 08:43:54 +02:00
Matthieu Gallien
2e501f0c75 add some margins at bottom of items in conflicts list view 
Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
 2023-05-17 08:43:54 +02:00
Matthieu Gallien
6efa9f81be prevent close of conflicts dialog on focus lost 
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
789ca7230a plug models into the dialog 
Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
 2023-05-17 08:43:54 +02:00
Matthieu Gallien
f799d8c697 tune the pipes to really get a dialog to show for many conflicts 
Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
 2023-05-17 08:43:54 +02:00
Matthieu Gallien
c118958d3d do not show many conflicts dialog for a single conflict 
Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
 2023-05-17 08:43:54 +02:00
Matthieu Gallien
72b78c9011 replace "Sync now" button by "Solve all conflicts" for many conflicts 
offer an easy way to open a dialog to solve all conflicts at once
replacing the "Sync now" button

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
Matthieu Gallien
8f61d539da replace "OK" button by "Resolve conflicts" to help users 
Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
 2023-05-17 08:43:54 +02:00
Matthieu Gallien
4bd93e39d6 more qml feedback 
Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
 2023-05-17 08:43:54 +02:00
Matthieu Gallien
396accd208 feedback from design review 
Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
 2023-05-17 08:43:54 +02:00
Matthieu Gallien
1491c134c3 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>
 2023-05-17 08:43:54 +02:00
Matthieu Gallien
7b4245a3c3 fix #include header style 
Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
 2023-05-17 08:43:54 +02:00
Nextcloud bot
37bd3f3db5
Fix(l10n): Update translations from Transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2023-05-17 02:23:51 +00:00
Claudio Cambra
6ff45bf342
Merge pull request #5654 from nextcloud/bugfix/ask-before-importing-legacy 
Ask before importing accounts from legacy clients
 2023-05-16 22:01:00 +08:00
Claudio Cambra
3dd838d28d Rename forcelegacyimport option to clearer forcelegacyconfigimport 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
 2023-05-16 21:23:43 +08:00
Claudio Cambra
b864bef2e8 Add application argument to force import of legacy accounts 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
 2023-05-16 21:23:43 +08:00
Claudio Cambra
c8f8c9cd2c Don't ask user whether to import legacy account configs if forcing legacy import 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
 2023-05-16 21:23:43 +08:00
Claudio Cambra
e43f627c9f Add forceLegacyImport property to accountmanager 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
 2023-05-16 21:23:43 +08:00
Claudio Cambra
efce1b6abf Declare void setters and methods in accountmanager as slots 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
 2023-05-16 21:23:43 +08:00
Claudio Cambra
c3fda69e33 Place signals and slots for accountmanager in line with how this is done in other classes 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
 2023-05-16 21:23:43 +08:00
Claudio Cambra
6eb2fd1cc0 Notify result of attempted account import with messagebox 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
 2023-05-16 21:23:43 +08:00
Claudio Cambra
fba808103c Ask before attempting to import legacy accounts 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
 2023-05-16 21:23:43 +08:00
Claudio Cambra
4dfab45d5f
Merge pull request #5672 from nextcloud/bugfix/provide-feedback-on-share-link-copy 
Provide feedback on share link copy
 2023-05-16 21:18:52 +08:00
Claudio Cambra
a9375c4d64 Animate copy share link button in share delegate 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
 2023-05-16 21:16:11 +08:00
Claudio Cambra
0419e29395 Also customise appearance of copy button in sharedelegate when clicked 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
 2023-05-16 21:16:11 +08:00
Claudio Cambra
191d8350c1 Replace use of magic numbers for animation durations in copy share link button with constants defined in Style.qml 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
 2023-05-16 21:16:11 +08:00
Claudio Cambra
4e12bbf3e4 Smoothly animate change of state for copy share link button 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
 2023-05-16 21:16:11 +08:00
Claudio Cambra
7db143469a Reset state of copy share link button after 3 seconds 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
 2023-05-16 21:16:11 +08:00
Claudio Cambra
c345b22bf2 Upon copying share link, trigger a change in the button to make copy action completed obvious 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
 2023-05-16 21:16:11 +08:00
Claudio Cambra
eab342fadf Add positive colour to Style.qml 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
 2023-05-16 21:16:11 +08:00
allexzander
79c0fdc9f6
Merge pull request #5686 from nextcloud/bugfix/edit-locally-allow-opening-item-in-root 
Allow opening a file or folder in the local sync root.
 2023-05-16 13:33:33 +02:00
Claudio Cambra
90c34e9dfc
Merge pull request #5596 from nextcloud/feature/file-detail-tags 
Display file tags in File Details
 2023-05-16 19:12:57 +08:00
alex-z
81ecba8daa Allow opening a file or folder in the local sync root. 
Signed-off-by: alex-z <blackslayer4@gmail.com>
 2023-05-16 12:33:34 +02:00
Claudio Cambra
b440e3011d Display tooltip showing names of overflowing tags in FileDetailsPage's overflow tag 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
 2023-05-16 18:23:33 +08:00
Claudio Cambra
30830b44cc Add overflow tag string property to filetagmodel which stringifies omitted tags 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
 2023-05-16 18:23:33 +08:00
Claudio Cambra
ce22c409e1 Test important properties in testfiletagmodel 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
 2023-05-16 18:23:33 +08:00
Claudio Cambra
73b94bcf2f Add test for maxTags in FileTagModel 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
 2023-05-16 18:23:33 +08:00
Claudio Cambra
1bab57b176 Notify change in tags when maxTags set in filetagmodel 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
 2023-05-16 18:23:33 +08:00
Claudio Cambra
6c68341422 Add test for tags in filetagmodel 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
 2023-05-16 18:23:33 +08:00
Claudio Cambra
ccb07af56a Provide different propfind replies depending on request props in testfiletagmode 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
 2023-05-16 18:23:33 +08:00
Claudio Cambra
89d7e17674 Add FakePropfindReply that accepts raw QByteArray as payload 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
 2023-05-16 18:23:33 +08:00
Claudio Cambra
955f4de7d2 Add initial testing setup for file tag model 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
 2023-05-16 18:23:33 +08:00
Claudio Cambra
b79a038d92 Add support for system tags in filetagmodel 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
 2023-05-16 18:23:33 +08:00
Claudio Cambra
045541d323 Implement support for system tags in propfindjob 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>

fix
 2023-05-16 18:23:33 +08:00
Claudio Cambra
bfb720fc35 Extract propfind tag xml node processing into separate method 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
 2023-05-16 18:23:33 +08:00
Claudio Cambra
29c17132e9 Properly parse tags in propfind request 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
 2023-05-16 18:23:33 +08:00
Claudio Cambra
b5cc4b41ce Extract propfind result data processing into separate method 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
 2023-05-16 18:23:33 +08:00