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 
						 
				 
			
				
					
						
							
							
								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 
						 
				 
			
				
					
						
							
							
								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 
							
						 
					 
					
						
						
							
						
						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 
						 
				 
			
				
					
						
							
							
								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 
						 
				 
			
				
					
						
							
							
								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 
						 
				 
			
				
					
						
							
							
								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 
						 
				 
			
				
					
						
							
							
								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 
						 
				 
			
				
					
						
							
							
								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 
							
						 
					 
					
						
						
							
						
						4960890d70 
					 
					
						
						
							
							Propagator: Commit the DB for Poll Jobs  
						
						
						
						
					 
					
						2014-09-11 12:05:35 +02: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 
							
						 
					 
					
						
						
							
						
						f59a6862ca 
					 
					
						
						
							
							raiseDialog: Actually send the XEvent  
						
						... 
						
						
						
						Amendment to 25c274a0bd 
						
						
					 
					
						2014-09-10 13:21:27 +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 
						 
				 
			
				
					
						
							
							
								Christian Kamm 
							
						 
					 
					
						
						
							
						
						88b7f2e0ee 
					 
					
						
						
							
							SyncJournal: Don't use C++11 features.  
						
						
						
						
					 
					
						2014-09-05 12:48:45 +02:00 
						 
				 
			
				
					
						
							
							
								Markus Goetz 
							
						 
					 
					
						
						
							
						
						f5f04bcc4b 
					 
					
						
						
							
							SyncEngine: Always return _renameTarget in destination() if possible  
						
						... 
						
						
						
						We want to do this since the instruction is actually ERORR, not RENAME. 
						
						
					 
					
						2014-09-05 10:07:24 +02:00 
						 
				 
			
				
					
						
							
							
								Christian Kamm 
							
						 
					 
					
						
						
							
						
						2630a73a1c 
					 
					
						
						
							
							Propagator: Use csync to get the modification time.  
						
						... 
						
						
						
						See owncloud/core#9781  
						
						
					 
					
						2014-09-04 14:16:23 +02:00 
						 
				 
			
				
					
						
							
							
								ckamm 
							
						 
					 
					
						
						
							
						
						4decd15ca9 
					 
					
						
						
							
							Merge pull request  #2161  from ckamm/stale-downloadinfo  
						
						... 
						
						
						
						Clean up stale journal entries and temporaries. #2057  
						
						
					 
					
						2014-09-04 14:14:39 +02:00 
						 
				 
			
				
					
						
							
							
								ckamm 
							
						 
					 
					
						
						
							
						
						3a59dd24f3 
					 
					
						
						
							
							Merge pull request  #2162  from ckamm/error-missing-exclude  
						
						... 
						
						
						
						Don't do a broken sync when the system exclude file is missing 
						
						
					 
					
						2014-09-04 14:14:07 +02:00 
						 
				 
			
				
					
						
							
							
								Olivier Goffart 
							
						 
					 
					
						
						
							
						
						c232411e96 
					 
					
						
						
							
							uploading: make sure to cast to uint64 to avoid integer overflow  
						
						
						
						
					 
					
						2014-09-04 13:46:01 +02:00 
						 
				 
			
				
					
						
							
							
								Christian Kamm 
							
						 
					 
					
						
						
							
						
						1cf1f6edcb 
					 
					
						
						
							
							Fix style issues.  
						
						
						
						
					 
					
						2014-09-04 13:27:11 +02:00 
						 
				 
			
				
					
						
							
							
								Christian Kamm 
							
						 
					 
					
						
						
							
						
						5d36a27893 
					 
					
						
						
							
							Clean up stale journal entries and temporaries.  #2057  
						
						... 
						
						
						
						* Downloadinfo entries for files that no longer need to be downloaded
  are useless and can be removed. In particular, the temporary files
  holding partially retrieved files are now deleted when no longer
  necessary.
* The same is true for blacklist entries for paths that are no longer
  being discovered.
* Same for uploadinfos for files that no longer need to be uploaded. 
						
						
					 
					
						2014-09-04 13:14:15 +02:00 
						 
				 
			
				
					
						
							
							
								Christian Kamm 
							
						 
					 
					
						
						
							
						
						da94533647 
					 
					
						
						
							
							Folders: Signout should not switch folders to paused state.  #2112  
						
						... 
						
						
						
						On signout, syncs that are running in folders are aborted. That used to
also switch the state of these folders to 'paused'. To fix that, aborts
that are caused by user actions no longer change the folder paused
state.
Aborts due to errors should still pause folders! Otherwise we'd try
resyncing them even though there was an error. 
						
						
					 
					
						2014-09-04 11:21:28 +02:00 
						 
				 
			
				
					
						
							
							
								Markus Goetz 
							
						 
					 
					
						
						
							
						
						69066013c1 
					 
					
						
						
							
							ownCloudTheme: Fix casing in appName()  
						
						... 
						
						
						
						Without this fix, the section in the config file uses the wrong name,
leading to re-configuration of the client needed. 
						
						
					 
					
						2014-09-03 17:30:34 +02:00 
						 
				 
			
				
					
						
							
							
								Christian Kamm 
							
						 
					 
					
						
						
							
						
						aef569ee9d 
					 
					
						
						
							
							SyncEngine: Use exclude file fallback next to binary on linux.  
						
						... 
						
						
						
						This is mainly useful for developers where the system-wide exclude file
may not exist. 
						
						
					 
					
						2014-09-03 14:53:01 +02:00 
						 
				 
			
				
					
						
							
							
								Christian Kamm 
							
						 
					 
					
						
						
							
						
						cf881aa6dc 
					 
					
						
						
							
							SyncEngine: Fix invalid slot name in sync error condition.  
						
						
						
						
					 
					
						2014-09-03 14:52:55 +02:00 
						 
				 
			
				
					
						
							
							
								Christian Kamm 
							
						 
					 
					
						
						
							
						
						a48bf3142c 
					 
					
						
						
							
							SyncEngine: Abort sync with error if system exclude file is missing.  
						
						... 
						
						
						
						Syncing without the system exclude file would cause lots of trouble.
For instance we would try uploading the temporary files we store
partially completed downloads in. 
						
						
					 
					
						2014-09-03 14:52:46 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Molkentin 
							
						 
					 
					
						
						
							
						
						c0131695c5 
					 
					
						
						
							
							Return from Folder::slotPollTimerTimeout() if the account object is 0  
						
						... 
						
						
						
						Right now, we crash instead. This can happen if a folder is created
when an account object is not (anymore/yet) created.
Fixes  #2142  
						
						
					 
					
						2014-09-02 14:51:33 +02:00