Matthieu Gallien [Mon, 13 Feb 2023 20:18:41 +0000 (21:18 +0100)]
to store subjectRichParameters use a QVariantMap that is qml friendly
will make it much easier to access fom qml in order to use the data
inside to improve activity list items
Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
Matthieu Gallien [Mon, 13 Feb 2023 18:12:58 +0000 (19:12 +0100)]
repay some desbt in ActivityListModel::data
only valid index are sent to QAbstractItemModel::data
we may want to do more checks in debug mode, let's do it
if we are going to show data, let's use a const variable to contain the
current activity item
Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
Matthieu Gallien [Mon, 13 Feb 2023 17:46:46 +0000 (18:46 +0100)]
remove scary warning that is a false alarm
Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
Matthieu Gallien [Mon, 13 Feb 2023 17:08:15 +0000 (18:08 +0100)]
remove custom property to set a source model in a sort proxy model
custom property for source model is not needed
remove code that is not needed
Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
Matthieu Gallien [Mon, 13 Feb 2023 17:02:14 +0000 (18:02 +0100)]
remove custom property and use standard sourceModel for our proxy model
a QSortFilterProxyModel will trigger a new sort whenever needed, so
custom code is not needed
we might have someone that would use the standard property and loose teh
side effects of setting the source model via thet non standard property
this makes it more complicated to read as one might wonder why a custom
property was needed
deletes a bunch of code not really needed
Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
Matthieu Gallien [Mon, 13 Feb 2023 14:19:54 +0000 (15:19 +0100)]
prevent a 0 size to assert when creating icon from svg
Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
Matthieu Gallien [Mon, 13 Feb 2023 14:19:14 +0000 (15:19 +0100)]
fix a few debug logs to use proper categorized logging
Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
Matthieu Gallien [Tue, 16 May 2023 14:48:30 +0000 (16:48 +0200)]
add missing copyright notices and upgrade qml module imports
Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
Camila [Wed, 17 May 2023 16:10:10 +0000 (13:10 -0300)]
Merge pull request #5706 from nextcloud/update/changelog
Update CHANGELOG.
Camila [Tue, 16 May 2023 15:33:29 +0000 (17:33 +0200)]
Update CHANGELOG.
Signed-off-by: Camila <hello@camila.codes>
Matthieu Gallien [Wed, 17 May 2023 08:35:04 +0000 (10:35 +0200)]
Merge pull request #5635 from nextcloud/feature/resolveAllConflicts
Feature/resolve all conflicts
Matthieu Gallien [Tue, 16 May 2023 09:54:32 +0000 (11:54 +0200)]
improve code in activity list model
Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
Matthieu Gallien [Tue, 16 May 2023 09:36:59 +0000 (11:36 +0200)]
small qml cleanup to make code faster to read
Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
Matthieu Gallien [Tue, 16 May 2023 09:36:46 +0000 (11:36 +0200)]
improve automated tests
Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
Matthieu Gallien [Tue, 16 May 2023 09:30:45 +0000 (11:30 +0200)]
improve reliability of memeory management when creating conflicts dialog
use more automatyed memory management to reduce possible errors
Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
Matthieu Gallien [Tue, 16 May 2023 08:37:40 +0000 (10:37 +0200)]
model improvements
Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
Matthieu Gallien [Tue, 16 May 2023 07:54:09 +0000 (09:54 +0200)]
improve translations for strings with placeholder to display numbers
Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
Matthieu Gallien [Tue, 16 May 2023 07:37:45 +0000 (09:37 +0200)]
define minimum sizes of conflict dialogs in Style component
Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
Matthieu Gallien [Tue, 16 May 2023 07:04:11 +0000 (09:04 +0200)]
define constants specific for font sizes in conflict dialog
Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
Matthieu Gallien [Tue, 16 May 2023 07:37:45 +0000 (09:37 +0200)]
refactor common parts of conflict delegate into a separate component
Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
Matthieu Gallien [Fri, 12 May 2023 13:01:28 +0000 (15:01 +0200)]
solve multiple conflicts from choose resolution
Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
Matthieu Gallien [Fri, 12 May 2023 11:17:38 +0000 (13:17 +0200)]
allow selecting conflict resolutions for many conflicts
Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
Matthieu Gallien [Thu, 4 May 2023 14:23:50 +0000 (16:23 +0200)]
implement more feedback
Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
Matthieu Gallien [Thu, 4 May 2023 10:30:13 +0000 (12:30 +0200)]
ensure the URL to mimetype icons are correct
Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
Matthieu Gallien [Thu, 4 May 2023 10:29:54 +0000 (12:29 +0200)]
allow the conflicts dialog to close
Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
Matthieu Gallien [Thu, 4 May 2023 10:29:41 +0000 (12:29 +0200)]
fix automated tests
Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
Matthieu Gallien [Thu, 4 May 2023 08:47:45 +0000 (10:47 +0200)]
add some margins at bottom of items in conflicts list view
Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
Matthieu Gallien [Thu, 4 May 2023 08:32:56 +0000 (10:32 +0200)]
prevent close of conflicts dialog on focus lost
Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
Matthieu Gallien [Wed, 3 May 2023 17:17:11 +0000 (19:17 +0200)]
display icons for files when solving many conflicts
Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
Matthieu Gallien [Wed, 3 May 2023 16:40:15 +0000 (18:40 +0200)]
plug models into the dialog
Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
Matthieu Gallien [Wed, 3 May 2023 16:33:19 +0000 (18:33 +0200)]
tune the pipes to really get a dialog to show for many conflicts
Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
Matthieu Gallien [Wed, 3 May 2023 16:28:55 +0000 (18:28 +0200)]
do not show many conflicts dialog for a single conflict
Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
Matthieu Gallien [Wed, 3 May 2023 16:09:12 +0000 (18:09 +0200)]
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>
Matthieu Gallien [Tue, 2 May 2023 11:55:17 +0000 (13:55 +0200)]
model: first step
Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
Matthieu Gallien [Wed, 3 May 2023 11:59:29 +0000 (13:59 +0200)]
replace "OK" button by "Resolve conflicts" to help users
Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
Matthieu Gallien [Tue, 2 May 2023 12:53:53 +0000 (14:53 +0200)]
more qml feedback
Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
Matthieu Gallien [Fri, 28 Apr 2023 12:54:55 +0000 (14:54 +0200)]
feedback from design review
Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
Matthieu Gallien [Fri, 28 Apr 2023 10:43:04 +0000 (12:43 +0200)]
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>
Matthieu Gallien [Fri, 28 Apr 2023 10:43:41 +0000 (12:43 +0200)]
fix #include header style
Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
Nextcloud bot [Wed, 17 May 2023 02:23:51 +0000 (02:23 +0000)]
Fix(l10n): Update translations from Transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
Claudio Cambra [Tue, 16 May 2023 14:01:00 +0000 (22:01 +0800)]
Merge pull request #5654 from nextcloud/bugfix/ask-before-importing-legacy
Ask before importing accounts from legacy clients
Claudio Cambra [Mon, 8 May 2023 12:24:20 +0000 (20:24 +0800)]
Rename forcelegacyimport option to clearer forcelegacyconfigimport
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
Claudio Cambra [Fri, 5 May 2023 02:44:49 +0000 (10:44 +0800)]
Add application argument to force import of legacy accounts
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
Claudio Cambra [Mon, 8 May 2023 12:24:41 +0000 (20:24 +0800)]
Don't ask user whether to import legacy account configs if forcing legacy import
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
Claudio Cambra [Fri, 5 May 2023 02:44:10 +0000 (10:44 +0800)]
Add forceLegacyImport property to accountmanager
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
Claudio Cambra [Fri, 5 May 2023 02:36:43 +0000 (10:36 +0800)]
Declare void setters and methods in accountmanager as slots
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
Claudio Cambra [Fri, 5 May 2023 02:34:11 +0000 (10:34 +0800)]
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>
Claudio Cambra [Fri, 5 May 2023 02:22:38 +0000 (10:22 +0800)]
Notify result of attempted account import with messagebox
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
Claudio Cambra [Fri, 5 May 2023 02:17:45 +0000 (10:17 +0800)]
Ask before attempting to import legacy accounts
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
Claudio Cambra [Tue, 16 May 2023 13:18:52 +0000 (21:18 +0800)]
Merge pull request #5672 from nextcloud/bugfix/provide-feedback-on-share-link-copy
Provide feedback on share link copy
Claudio Cambra [Thu, 11 May 2023 06:10:47 +0000 (14:10 +0800)]
Animate copy share link button in share delegate
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
Claudio Cambra [Thu, 11 May 2023 06:10:30 +0000 (14:10 +0800)]
Also customise appearance of copy button in sharedelegate when clicked
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
Claudio Cambra [Wed, 10 May 2023 04:38:27 +0000 (12:38 +0800)]
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>
Claudio Cambra [Wed, 10 May 2023 03:25:32 +0000 (11:25 +0800)]
Smoothly animate change of state for copy share link button
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
Claudio Cambra [Wed, 10 May 2023 03:25:18 +0000 (11:25 +0800)]
Reset state of copy share link button after 3 seconds
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
Claudio Cambra [Wed, 10 May 2023 03:24:55 +0000 (11:24 +0800)]
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>
Claudio Cambra [Wed, 10 May 2023 03:22:37 +0000 (11:22 +0800)]
Add positive colour to Style.qml
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
allexzander [Tue, 16 May 2023 11:33:33 +0000 (13:33 +0200)]
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.
Claudio Cambra [Tue, 16 May 2023 11:12:57 +0000 (19:12 +0800)]
Merge pull request #5596 from nextcloud/feature/file-detail-tags
Display file tags in File Details
alex-z [Thu, 11 May 2023 16:29:58 +0000 (18:29 +0200)]
Allow opening a file or folder in the local sync root.
Signed-off-by: alex-z <blackslayer4@gmail.com>
Claudio Cambra [Thu, 27 Apr 2023 14:08:28 +0000 (22:08 +0800)]
Display tooltip showing names of overflowing tags in FileDetailsPage's overflow tag
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
Claudio Cambra [Thu, 27 Apr 2023 13:23:40 +0000 (21:23 +0800)]
Add overflow tag string property to filetagmodel which stringifies omitted tags
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
Claudio Cambra [Tue, 25 Apr 2023 14:18:36 +0000 (22:18 +0800)]
Test important properties in testfiletagmodel
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
Claudio Cambra [Tue, 25 Apr 2023 03:45:08 +0000 (11:45 +0800)]
Add test for maxTags in FileTagModel
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
Claudio Cambra [Tue, 25 Apr 2023 03:44:47 +0000 (11:44 +0800)]
Notify change in tags when maxTags set in filetagmodel
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
Claudio Cambra [Mon, 24 Apr 2023 11:07:42 +0000 (19:07 +0800)]
Add test for tags in filetagmodel
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
Claudio Cambra [Mon, 24 Apr 2023 11:02:02 +0000 (19:02 +0800)]
Provide different propfind replies depending on request props in testfiletagmode
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
Claudio Cambra [Mon, 24 Apr 2023 11:01:18 +0000 (19:01 +0800)]
Add FakePropfindReply that accepts raw QByteArray as payload
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
Claudio Cambra [Mon, 24 Apr 2023 07:49:33 +0000 (15:49 +0800)]
Add initial testing setup for file tag model
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
Claudio Cambra [Thu, 20 Apr 2023 13:17:24 +0000 (21:17 +0800)]
Add support for system tags in filetagmodel
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
Claudio Cambra [Thu, 20 Apr 2023 13:14:57 +0000 (21:14 +0800)]
Implement support for system tags in propfindjob
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
fix
Claudio Cambra [Thu, 20 Apr 2023 12:53:48 +0000 (20:53 +0800)]
Extract propfind tag xml node processing into separate method
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
Claudio Cambra [Thu, 20 Apr 2023 12:50:13 +0000 (20:50 +0800)]
Properly parse tags in propfind request
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
Claudio Cambra [Thu, 20 Apr 2023 11:54:35 +0000 (19:54 +0800)]
Extract propfind result data processing into separate method
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
Claudio Cambra [Thu, 20 Apr 2023 11:48:37 +0000 (19:48 +0800)]
Clean up includes in networkjobs
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
fix for header fix
Claudio Cambra [Thu, 20 Apr 2023 11:41:41 +0000 (19:41 +0800)]
Do not use magic string for propfind prop element tag name
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
Claudio Cambra [Thu, 20 Apr 2023 11:41:21 +0000 (19:41 +0800)]
Use constexpr in networkjobs notModifiedStatusCode
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
Claudio Cambra [Thu, 20 Apr 2023 07:35:46 +0000 (15:35 +0800)]
Simplify Propfind XML parsing using QDomDocument instead of complex QXmlStreamReader-based parsing
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
Claudio Cambra [Wed, 19 Apr 2023 15:34:49 +0000 (23:34 +0800)]
Modernise PropfindJob with new for and const auto
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
Claudio Cambra [Wed, 12 Apr 2023 04:11:33 +0000 (12:11 +0800)]
Fix layout of tags with differing sizes and oversized tags
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
Claudio Cambra [Wed, 12 Apr 2023 03:37:01 +0000 (11:37 +0800)]
Simplify file tag model updating in filedetails, only require folder pointer
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
Claudio Cambra [Tue, 11 Apr 2023 17:30:35 +0000 (01:30 +0800)]
Display filetags in file details window
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
Claudio Cambra [Tue, 11 Apr 2023 17:29:41 +0000 (01:29 +0800)]
Simplify FileTag component
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
Claudio Cambra [Tue, 11 Apr 2023 16:36:09 +0000 (00:36 +0800)]
Instantiate FileTagModel in FileDetails
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
Claudio Cambra [Tue, 11 Apr 2023 15:43:59 +0000 (23:43 +0800)]
Add ability to limit maximum amount of tags displayed
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
Claudio Cambra [Tue, 11 Apr 2023 15:34:39 +0000 (23:34 +0800)]
Expose account and serverRelativePath of FileTagModel as QPROPERTYs
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
Claudio Cambra [Tue, 11 Apr 2023 15:26:33 +0000 (23:26 +0800)]
Implement FileTagModel QAbstractListModel methods
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
Claudio Cambra [Tue, 11 Apr 2023 15:21:17 +0000 (23:21 +0800)]
Add capability for FileTagModel to fetch tags
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
Claudio Cambra [Tue, 11 Apr 2023 09:41:56 +0000 (17:41 +0800)]
Get account and relativeserverpath in constructor for FileTagModel
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
Claudio Cambra [Mon, 10 Apr 2023 11:27:31 +0000 (19:27 +0800)]
Add a FileTagModel
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
Claudio Cambra [Mon, 10 Apr 2023 11:15:11 +0000 (19:15 +0800)]
Add FileTag QML component
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
Camila [Tue, 16 May 2023 10:12:24 +0000 (07:12 -0300)]
Merge pull request #5687 from nextcloud/bugfix/notifications
Dismiss notifications
Camila [Fri, 12 May 2023 14:46:23 +0000 (16:46 +0200)]
Add a dismiss link for notifications without it.
- Fix for #5606 and #5585.
- That is how it is done in the server and other clients.
- Update tests.
Signed-off-by: Camila <hello@camila.codes>
Claudio Cambra [Mon, 15 May 2023 14:02:37 +0000 (22:02 +0800)]
Merge pull request #5680 from nextcloud/bugfix/putmultifilejob-crash-mac
Fix unrecoverable freezing when PutMultiFileJob is used with upload rate limits enabled
Claudio Cambra [Mon, 15 May 2023 12:05:30 +0000 (20:05 +0800)]
Modernise BandwidthManager::absoluteLimitTimerExpired
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
Claudio Cambra [Mon, 15 May 2023 12:04:19 +0000 (20:04 +0800)]
Use modern for loop in BandwidthManager::relativeDownloadDelayTimerExpired
getFileJobSigned-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
Claudio Cambra [Mon, 15 May 2023 12:03:18 +0000 (20:03 +0800)]
Bring improvements of new cpp to BandwidthManager::relativeDownloadMeasuringTimerExpired
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
Claudio Cambra [Mon, 15 May 2023 12:00:28 +0000 (20:00 +0800)]
Modernise and improve readability of BandwidthManager::relativeUploadDelayTimerExpired
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
Claudio Cambra [Mon, 15 May 2023 11:54:41 +0000 (19:54 +0800)]
Modernise BandwidthManager::relativeUploadMeasuringTimerExpired with const auto, readability, etc
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
Claudio Cambra [Mon, 15 May 2023 11:30:27 +0000 (19:30 +0800)]
Fix deadlock when using putmultifilejob with rate limits enabled
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>