chylex/Nextcloud-Desktop
1
0
Fork 0
mirror of https://github.com/chylex/Nextcloud-Desktop.git synced 2024-11-26 04:42:45 +01:00
Code
6,572 Commits 4 Branches 173 Tags 91 MiB
v1.7.0
Commit Graph

6572 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Klaas Freitag
0cc2bbf5d9 csync exclude: Export the csync_exclude_add function in debug mode 2014-09-18 15:34:24 +02:00
Jürgen Weigert
d2669debb9 Merge branch '1.7' of https://github.com/owncloud/mirall into 1.7 2014-09-18 12:37:17 +02:00
Jürgen Weigert
637fb449c6 Fixed https://github.com/owncloud/mirall/issues/1699 
Added missing copyright headers.
 2014-09-18 12:30:42 +02:00
Daniel Molkentin
e82b319ee7 Fix owncloud man page formatting 2014-09-18 12:30:20 +02:00
Klaas Freitag
e9248066df SyncJournal: Better error report for sql statements in updateDbStructure 
Also, even if the updateDatabaseStructure fails, precompile the sql
statements.

This will help to debug and maybe solve bug #2106
 2014-09-18 12:02:28 +02:00
Daniel Molkentin
819472d366 Fix owncloud man page formatting 2014-09-18 11:44:25 +02:00
Daniel Molkentin
21bbdd6f49 Update owncloudcmd documentation 2014-09-18 11:36:14 +02:00
Christian Kamm
a88ac00115 SyncEngine: Better reporting when ignoring hardlinks. #2217 
Also touch csync to actually let us know it's ignoring the file
due to it having hard links.
 2014-09-18 11:32:29 +02:00
Christian Kamm
30683b38a8 Updater: Add "didn't check for updates" message. #2175 
Don't show "Checking server..." when we are not.

(cherry picked from commit ece11dc3d8)
 2014-09-18 09:43:13 +02:00
Christian Kamm
45aefeb146 SelectiveSyncDialog: Change 'partial' behavior. 
The real bug in #2219 actually was that the gui allowed users to
choose to not sync the root folder. That's not supported and no
longer possible in the UI.

Instead you may now sync a folder's files without syncing its sub-
folders.
 2014-09-18 09:42:50 +02:00
Jenkins for ownCloud
580ecbff0c [tx-robot] updated from transifex 2014-09-18 01:25:28 -04:00
Daniel Molkentin
db3318886e Merge pull request #2214 from owncloud/2211 
Implement (most of) #2211
 2014-09-18 00:09:26 +02:00
Daniel Molkentin
54eb837950 Remove unused confdir option 2014-09-18 00:07:33 +02:00
Christian Kamm
0bd73788f4 Doc: Update csync test script README. 2014-09-17 16:18:55 +02:00
Christian Kamm
e395282e0e SelectiveSyncDialog: Fix sync-nothing case. #2219 2014-09-17 16:13:47 +02:00
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
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
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 Kamm
20dd3b0a69 FolderMan: Fix startFromScratch logic. #1989 
(cherry picked from commit 4566ca3127)
 2014-09-15 13:53:38 +02:00
Christian Kamm
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
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
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 Goffart
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