chylex/Nextcloud-Desktop
1
0
Fork 0
mirror of https://github.com/chylex/Nextcloud-Desktop.git synced 2026-08-21 07:27:15 +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
Christian Kamm 1f129d0bcb Propagator: Don't upload files that were changed recently. 
Instead skip them and try another sync later.

See #2167, #2169, #2210.
 2014-09-17 15:30:18 +02:00
Christian Kamm c2ae5e5fd1 FolderMan: Ensure a 1s delay between sync request and start. 
That way the propagator can detect files that are still being
changed right now and skip them.
 2014-09-17 15:30:18 +02:00
Olivier Goffart 292a7357bd t1.cfg.in: saner placeholder executable name 
Now it is owncloudcmd and not csync
 2014-09-17 14:39:34 +02:00
Christian Kamm ece11dc3d8 Updater: Add "didn't check for updates" message. #2175 
Don't show "Checking server..." when we are not.
 2014-09-17 11:41:04 +02:00
Christian Kamm 99aa2cdf2a Log: Print client version on sync start. #2178 2014-09-17 09:39:04 +02:00
Christian Kamm 0eb9401c62 File change detection: Also look at file sizes. 
See #2167 and #2169.

* csync_detect_update: Reupload a file if the sizes differ, similar
  to how we reupload if the mtimes differ.
* PropagateUploadFileQNAM::slotPutFinished(): Abort an upload if the
  size changed, similar to how we abort an upload if the mtimes changed.
 2014-09-17 09:05:13 +02:00
Jenkins for ownCloud ab14a589c8 [tx-robot] updated from transifex 2014-09-17 01:25:27 -04:00
Daniel Molkentin 122fa596b3 Remove stray file that was not meant to be committed 2014-09-17 00:55:55 +02:00
Daniel Molkentin 5406407ed6 Implement --non-interactive as per Juergens' request 2014-09-17 00:12:16 +02:00
Daniel Molkentin b72cee2783 Fix passing URLs not ending in /remote.php/webdav 2014-09-16 23:53:01 +02:00
Daniel Molkentin fe023e2229 Allow passing user/pass explicitly or via netrc 
#2211
 2014-09-16 23:52:28 +02:00
Olivier Goffart 66595a3597 Parallel chunk uploads 
This does not include progress indicator
 2014-09-16 17:40:42 +02:00
Jenkins for ownCloud 1dae928a7c [tx-robot] updated from transifex 2014-09-16 01:25:22 -04:00
Olivier Goffart 9b1779bb06 Fix compilation 
qFatal does not work with <<
 2014-09-15 18:03:44 +02:00
Olivier Goffart 97cc05eeea journaldb: Assert in case of SQL error 
relates issue #2106
 2014-09-15 14:27:39 +02:00
Christian KammandOlivier Goffart 20dd3b0a69 FolderMan: Fix startFromScratch logic. #1989 
(cherry picked from commit 4566ca3127)
 2014-09-15 13:53:38 +02:00
Christian KammandOlivier Goffart f348eabf19 Account: Fix cert save/restore from settings. #2160 
(cherry picked from commit cc1121ef00)
 2014-09-15 13:53:38 +02:00
Olivier Goffart 5870a57002 wizard: fix start a clean sync 
The problem was that the backup function failed as we tried to
move  /home/xxx/ownCloud/  to /home/xxx/ownCloud/.oC_bak
The intention was to move it to /home/xxx/ownCloud.oC_bak

Issue #1989
 2014-09-15 13:49:13 +02:00
Olivier Goffart 278bc5a8cd owncloudcmd: ask for the login and password and put it in the url (if it's not there already) 
Because we cannot rely on HTTPCredentials to open windows in a command line tool

Fixes #1860
 2014-09-15 13:24:31 +02:00
Jenkins for ownCloud 3c89415df1 [tx-robot] updated from transifex 2014-09-14 01:25:21 -04:00
Jenkins for ownCloud 5981f700f5 [tx-robot] updated from transifex 2014-09-13 05:16:21 -04:00
Olivier Goffart af5e8ee18c AbstractNetworkJob 
Abort the transfer in case of timeout.

This avoid that a connection that never replies blocks mirall

Issue #2148
 2014-09-12 18:06:29 +02:00
Olivier Goffart 52e8343f76 ConnecitonValidator: Handle the timeout 
otherwise the account may be stuck in a disconnect case if there is a timeout

Issue #2148
 2014-09-12 18:06:17 +02:00
Olivier Goffart a4dbf5942c owncloudcmd: restart the sync if required 
Fixes #2038
 2014-09-12 17:23:01 +02:00
Daniel Molkentin ada1d42ebf Sparkle requirement bumped to 1.8 2014-09-12 16:08:52 +02:00
Daniel Molkentin f27182ae05 fFx Utility::freeDiskSpace for win32 2014-09-12 16:08:52 +02:00
Markus Goetz 2fddf05515 OS X: Overlay Icons: Load from bundle-specific path 
The client (in this case mirall) tells the Finder plugin where to get the icons.
This enables installation in different locations and in branded clients.
 2014-09-12 15:09:47 +02:00
Markus Goetz 91d1864840 OS X: Overlay Icons: Less verbose debug output 2014-09-12 15:09:46 +02:00
Daniel Molkentin 6e42ee1bd4 Merge pull request #2194 from tim-vandecasteele/fix-apple-build 
Fix apple build.
 2014-09-12 14:39:26 +02:00
Tim Vandecasteele f3cc614427 Fix apple build. 
The apple build was broken because the elseif in the CMakeLists is never triggered.

Some code was not properly adapted for the new qtmacgoodies.

Some paths were not adapted to new split.
 2014-09-12 14:24:26 +02:00
Olivier Goffart 79052ba7c6 Blacklist: ignore problems that don't have HTTP error code and are possibly problem on the local file system 
Issue #1985
 2014-09-12 14:13:04 +02:00
Markus Goetz 0edd4d3c02 OS X: Overlay icons: Don't show if folder is not marked as being an oC folder 2014-09-12 11:46:53 +02:00
Jenkins for ownCloud 71516c480d [tx-robot] updated from transifex 2014-09-12 03:28:04 -04:00
Markus Goetz 4960890d70 Propagator: Commit the DB for Poll Jobs 2014-09-11 12:05:35 +02:00
Olivier GoffartandMarkus Goetz 76f0f3cbf2 csync_vio_local on windows: fix overflow when computing the size of file > 4GiB 
MAXDWORD is 0xFFFFFFFF, so if we add one, it overflows and is 0.
We need to cast it to 64 bits before
 2014-09-11 11:10:58 +02:00
Jenkins for ownCloud 1304c2c4ab [tx-robot] updated from transifex 2014-09-11 01:25:22 -04:00
Olivier Goffart a84b7dc27e Restart the sync when we detect we need to redo a sync 
Fixes #1968
Relates #2038
 2014-09-10 17:27:33 +02:00
Daniel Molkentin 927af0adec Fix build on win32: add missing export 2014-09-10 16:31:47 +02:00
Daniel Molkentin 2dfbc2058f Win32: ignore files ending in '.' or at least one space 
Fixes #416
Fixes #2176
 2014-09-10 15:21:19 +02:00
Olivier GoffartandDaniel Molkentin 79ee6c2f3b csync_vio_local on windows: fix overflow when computing the size of file > 4GiB 
MAXDWORD is 0xFFFFFFFF, so if we add one, it overflows and is 0.
We need to cast it to 64 bits before
 2014-09-10 13:21:31 +02:00
Daniel Molkentin f59a6862ca raiseDialog: Actually send the XEvent 
Amendment to 25c274a0bd

Conflicts:
	src/mirall/owncloudgui.cpp
 2014-09-10 13:21:27 +02:00
Olivier Goffart fa962b7f53 csync_update: fix compilation warning 2014-09-10 11:08:00 +02:00
Olivier Goffart 71408bab60 I forgot to rename one of the while list to the blacklist 2014-09-10 11:01:38 +02:00
Jenkins for ownCloud 9e015eb654 [tx-robot] updated from transifex 2014-09-09 01:25:24 -04:00
Markus Goetz 4ce03e8b61 OS X: Fix Overlay icon retrieval 
Re-retrieve all icons for a path in case we receive UPDATE_VIEW.
(But in contrast to previous code, don't delete the icons which then
would have caused screen flickering)
 2014-09-07 11:38:23 +02:00
Jenkins for ownCloud 68b7f412b6 [tx-robot] updated from transifex 2014-09-07 01:25:23 -04:00
Jenkins for ownCloud 20011f3a84 [tx-robot] updated from transifex 2014-09-06 01:25:23 -04:00
Daniel Molkentin 2d020b5989 Merge pull request #2138 from owncloud/cleanup_shell_integration_nautilus 
Cleanup and make python3 compatible shell integration nautilus
 2014-09-05 15:48:16 +02:00
Markus Goetz 1909b465dc CSync: Show file size and inode during update traversal 
With the previous code, we saw those values only when the file/dir was also in the local DB
 2014-09-05 15:23:33 +02:00
Christian Kamm 88b7f2e0ee SyncJournal: Don't use C++11 features. 2014-09-05 12:48:45 +02:00