chylex/Nextcloud-Desktop
1
0
Fork 0
mirror of https://github.com/chylex/Nextcloud-Desktop.git synced 2026-08-20 13:27:08 +02:00
Code Activity
17,214 Commits 4 Branches 173 Tags
v3.4.0-do-not-use
Commit Graph
17214 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Jenkins for ownCloud 2d08754f91 [tx-robot] updated from transifex 2016-04-12 02:19:13 -04:00
Klaas Freitag 868edb1f0d SyncJournalDb: Only close the db if the return code is not SQLITE_DONE 
SQLITE_DONE is the indicator for not more query results, which is a legal
thing and not an error condition.

Also, check _getFileRecordQuery for null pointer, as close() wipes it.
 2016-04-11 17:38:16 +02:00
Klaas Freitag aaf43bd0d3 SyncJournalDb: Handle empty filename and avoid a bogus db query. 2016-04-11 17:36:15 +02:00
Klaas Freitag d5f1d1c6b2 SqlQuery: Add method errorId() to get the numeric error code. 2016-04-11 17:34:59 +02:00
Klaas Freitag 6cb94e8849 Merge pull request #4656 from owncloud/close_journal_fix 
Close journal fix - do not keep the journal open or reopen on error.
 2016-04-11 16:14:17 +02:00
Klaas Freitag d433c24186 Check if the record returned from getFileRecord is valid. 
Handle database fails properly.
 2016-04-11 16:04:20 +02:00
Olivier Goffart c48b5c4f61 ActivityWidget: use a QHash for _widgetsToRemove 
The problem with QSet is that the QDateTime was part of
the hash, but that does not make sens as it should be unique
per widget and not per <date, widget>

Instead make it a QHash so there is only one entry per widget.
 2016-04-11 15:49:24 +02:00
Olivier Goffart 976f4dfabe ActivityWidget: Fix Qt4 build 
Don't use API added in Qt5
 2016-04-11 15:49:24 +02:00
Olivier Goffart f8dc263338 CMakeLists: fix Qt4 build 
Only the src subdirectory needs Qt.
Otherwise it activates Qt4 also for the dolphin plugin which always need Qt5
 2016-04-11 15:49:18 +02:00
Klaas Freitag e896d16f32 ActivityWidget: Make sure Notification are visible if Activity disabled 
This is the fix for #4651
 2016-04-11 15:39:25 +02:00
Klaas Freitag 2ec642aadb ActivityWidget: Properly set widget for the Scrollview. 
Also fixed some SizePolicy settings.
 2016-04-11 15:38:25 +02:00
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
Jenkins for ownCloud 74a75f6399 [tx-robot] updated from transifex 2016-04-11 02:19:03 -04:00
Jenkins for ownCloud a0baca25ff [tx-robot] updated from transifex 2016-04-10 02:18:57 -04:00
Jenkins for ownCloud 4b5c9c5ee5 [tx-robot] updated from transifex 2016-04-09 02:19:05 -04:00
ckamm 4ce97633cd Merge pull request #4630 from ckamm/folderwatchwin 
Graceful termination of folderwatcher_win #4620
 2016-04-09 06:55:30 +02:00
Jenkins for ownCloud f1732d66d6 [tx-robot] updated from transifex 2016-04-08 02:19:09 -04:00
Jenkins for ownCloud 329f512a40 [tx-robot] updated from transifex 2016-04-08 01:15:47 -04:00
Markus Goetz c64720eac5 Merge pull request #4605 from RealRancor/RealRancor-patch-1 
Change note to warning in documentation
 2016-04-07 15:50:32 +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
Jenkins for ownCloud 4dd8d61e4e [tx-robot] updated from transifex 2016-04-07 02:19:10 -04:00
Daniel Molkentin 271bea39ff Update binary subdir 2016-04-06 18:07:35 +02:00
Daniel Molkentin a0827c5ef2 Remove deleted icons from resource file 2016-04-06 17:59:34 +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
Jenkins for ownCloud 15bdb7be64 [tx-robot] updated from transifex 2016-04-06 02:19:26 -04: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
Jenkins for ownCloud 65e740301a [tx-robot] updated from transifex 2016-04-05 02:19:38 -04:00
Jenkins for ownCloud f495daf1cf [tx-robot] updated from transifex 2016-04-05 01:15:46 -04: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
Jenkins for ownCloud 8b3ea7aa97 [tx-robot] updated from transifex 2016-04-04 02:19:12 -04:00
Jenkins for ownCloud 84ad0d234e [tx-robot] updated from transifex 2016-04-02 02:19:13 -04:00
Jenkins for ownCloud 87e4370bf4 [tx-robot] updated from transifex 2016-04-01 02:19:45 -04:00
Christian Kamm fa1bb309ca Graceful termination of folderwatcher_win #4620 2016-03-31 15:44:42 +02:00