chylex/Nextcloud-Desktop
1
0
Fork 0
mirror of https://github.com/chylex/Nextcloud-Desktop.git synced 2026-10-05 02:53:40 +02:00
Code Activity
13,590 Commits 4 Branches 173 Tags
2.6.2-buildtest1
Commit Graph
6388 Commits
Author SHA1 Message Date
Olivier Goffart bd3a079a7b Merge pull request #4648 from owncloud/handle-database-errors 
Handle setFileRecord errors #4632
 2016-04-11 15:36:46 +02:00
Olivier Goffart 6ee7e82913 Handle setFileRecord errors #4632 2016-04-11 14:11:11 +02:00
Klaas Freitag 648328fbe2 SyncJournalDb: Close the db on error in getFileRecord() 
The idea is that the next call to any database operation will try to
reopen the database through the checkConnect() method. So even if there
was a disconnect trom the db file, this will reestablish the connection.
 2016-04-11 12:40:19 +02:00
Klaas Freitag ee58cc3b66 SyncEngine: Close the sync journal after the sync run has finished. 2016-04-11 11:31:54 +02:00
ckamm 4ce97633cd Merge pull request #4630 from ckamm/folderwatchwin 
Graceful termination of folderwatcher_win #4620
 2016-04-09 06:55:30 +02:00
Klaas Freitag 8f7b833c12 Not Synced Tab: Use tr rather than string concat 2016-04-07 09:18:51 +02:00
Klaas Freitag 48bfcde97d Merge pull request #4640 from owncloud/numberInProtocolTab 
ProtocolWidget: Show number of non synced files in tab label.
 2016-04-07 09:15:06 +02:00
Klaas Freitag 42439490cc Merge pull request #4645 from owncloud/fix_4633 
SelectiveSync: Verify if the list could be read from journal.

If not handle the error rather than assuming the selective sync list is empty.
 2016-04-07 09:14:33 +02:00
Klaas Freitag 058cd33324 Not Synced: Display only the number of not synced items in parathesis. 
This was Jans wish.
 2016-04-06 17:53:42 +02:00
Klaas Freitag e4604b406f SyncEngine: finalize properly on error with syncjournal 2016-04-06 17:20:48 +02:00
Klaas Freitag 7b1f02fcda SelectiveSync: Verify if the list could be read from journal. 
If there is a read error from the database while trying to get
the list from database, make sure to not behave badly because
the list is empty.
 2016-04-06 15:01:28 +02:00
Klaas Freitag 52a5234122 Merge pull request #4641 from owncloud/bubbleUpConflicts 
Bubble up conflicts: Show a tray notification on conflicts and show the conflicts in the not-synced list.
 2016-04-06 13:45:47 +02:00
Klaas Freitag 4e17dabcb6 Folder: Fixed a couple of plural translation issues. 2016-04-06 12:22:29 +02:00
Klaas Freitag 9bdc84c6f4 NotificationJobs: Set ocs header to maintain the session. 
This is needed by the server.
 2016-04-05 16:52:51 +02:00
Klaas Freitag 252aea25da ProgressDispatcher: Improve wording about conflicts. 2016-04-05 16:38:18 +02:00
Klaas Freitag efb0faa14e Folder: After sync, fire up tray notification if conflicts happened. 
If there were conflicts, users want to have a tray notification that warn
about.
This will help for #3222
 2016-04-05 16:37:54 +02:00
Klaas Freitag 5b40921587 ProtocolWidget: Show number of non synced files in tab label. 2016-04-05 13:57:38 +02:00
Klaas Freitag 7994b3d91a ProtocolWidget: handle Conflicts as not-synced items 2016-04-05 11:13:12 +02:00
Olivier Goffart 3334067d9f Merge branch '2.1' 
Conflicts:
	src/gui/socketapi.cpp
 2016-04-04 16:58:49 +02:00
Klaas Freitag 73e2a503d7 NotificationWidget: Some ui refinements. 2016-04-04 12:46:00 +02:00
Klaas Freitag bc6eebddf4 NotificationWidget: Handle empty message and subject properly. 2016-04-04 12:45:39 +02:00
Olivier Goffart 434d16941b SyncEngine: fixed restoring files when they are moved in a new directory 
Imagine tgus scenario on a read only share that you move file from
one location to a new directory in the read only share.
Creating the read only directory fails for permission error.
But we should also restore the files that have been moved.

IL issue 542
 2016-04-04 10:41:12 +02:00
Klaas Freitag 6b0d535120 Merge branch 'notifications' 2016-04-04 10:40:33 +02:00
Christian Kamm fa1bb309ca Graceful termination of folderwatcher_win #4620 2016-03-31 15:44:42 +02:00
Christian Kamm e05819370b Fix invalid read on account removal 2016-03-31 09:00:32 +02:00
Daniel Molkentin 9ea191f63d Scale correctly with HiDPI displays on Linux with Qt 5.6 2016-03-30 18:25:30 +02:00
Christian Kamm c150350096 SyncFileStatusTracker: Fix compilation with older Qt 2016-03-30 13:42:08 +02:00
Christian Kamm c35e74d264 Theme: Enable link sharing by default 
Was disabled by accident.
 2016-03-30 13:33:12 +02:00
Olivier Goffart cdbc25ede8 Merge pull request #4615 from owncloud/socketApiRefactor 
Socket API refactor
 2016-03-30 13:24:10 +02:00
Jocelyn Turcotte a0260c29c0 Fix the build on Windows 2016-03-30 12:19:09 +02:00
Jocelyn Turcotte 2c0caf8b75 Fix the SocketApi status of CSYNC_FILE_SILENTLY_EXCLUDED files 
Bring back the hardcoded status logic for excluded files.
Since the activity log doesn't even mention those files on purpose,
we can't rely on the SyncEngine to notify us about the status of those files.
 2016-03-30 12:10:51 +02:00
Jocelyn Turcotte 56064c9366 Fix sibbling directories showing up as warning 
Looking up a/aa while an error is present in a/aab/aaba would return
a warning status since a/aa is a substring of a/aab.
Fix the issue by checking if the following character is a slash.
 2016-03-30 11:22:01 +02:00
ckamm 98995f45e6 Merge pull request #4618 from ckamm/progressui 
Progress layout adjustments
 2016-03-30 09:22:27 +02:00
Christian Kamm 5636dc1386 Tooltip updater: Fix compile with Qt4 2016-03-30 09:21:28 +02:00
Klaas Freitag 885f8b382f ActivityWidget: Handle plural properly in translations. 
Even for the case where the number is fixed.
Also fix the translators comments.
 2016-03-29 18:01:54 +02:00
Klaas Freitag 8166c52f4a NotificationHandling: Use QByteArray for the verb. 2016-03-29 18:01:49 +02:00
Jocelyn Turcotte ef57d4ae11 Move the SyncFileStatusTracker directory slash suffix logic in a method 2016-03-29 17:55:02 +02:00
Jocelyn Turcotte fbf23b6abb Cleanup after the SyncFileStatusTracker change 
- Add missing explicit keywords
- Add doc
- Comment out verbose and partly redundant qDebug statements
 2016-03-29 17:39:30 +02:00
Jocelyn Turcotte 47a552f8c2 Use a std::map for SyncFileStatusTracker problems 
This prevents having to define a Problem structure with dubious
operator overloads to accomplish the same.
Also use std::map::lower_bound to quickly iterate over the
list of problems.
 2016-03-29 17:29:36 +02:00
Klaas Freitag cd3f612857 ActivityWidget: Rename blacklistActivities to blacklistNotifications. 2016-03-29 16:50:58 +02:00
Klaas Freitag 2e30a0e5bc Remove superflous iterator increment 2016-03-29 16:50:15 +02:00
Klaas Freitag cacb751ab8 Cleaups based on review feedback. 2016-03-29 14:38:11 +02:00
Klaas Freitag 4d59f5ec66 ActivityData: Declare operators outside the class 2016-03-29 14:09:19 +02:00
Klaas Freitag 69e8e15884 Remove explicit time spec specification as it is not needed. 2016-03-29 13:59:08 +02:00
Daniel Molkentin 1730569f77 No Q_NULLPTR in Qt 4.8 2016-03-29 13:28:11 +02:00
Olivier Goffart 98091aeab7 Theme: document forceSystemNetworkProxy (#4458) 2016-03-29 13:08:33 +02:00
Christian Kamm c5fbde412c Folder info layout adjustments #3403 
* Remove duplicate remote path
* Use thin progress bar
* Move bandwidth and file info to tooltip
* Shorten overall progress message

This also fixes #4562 by making the layout not dependent on the
width of the displayed text.
 2016-03-29 12:45:01 +02:00
Christian Kamm 10a7128d1a Update QTreeView tooltips as they change #3403 2016-03-29 12:26:09 +02:00
Christian Kamm 41f43feecf Add utility function for shorter time duration strings #3403 2016-03-29 12:26:09 +02:00
Christian Kamm 4915bbf8f3 Adjust size description strings #3403 
@jancorchardt suggested to not have decimal places on file
sizes, except for GB.
 2016-03-29 12:26:09 +02:00