Daniel Molkentin 
							
						 
					 
					
						
						
							
						
						805e1330ad 
					 
					
						
						
							
							Compile with MinGW  
						
						
						
						
					 
					
						2013-10-04 20:29:42 +02:00 
						 
				 
			
				
					
						
							
							
								Olivier Goffart 
							
						 
					 
					
						
						
							
						
						7c6fcf688c 
					 
					
						
						
							
							Fix the fact that some success was reported as error  
						
						
						
						
					 
					
						2013-10-04 15:55:59 +02:00 
						 
				 
			
				
					
						
							
							
								Olivier Goffart 
							
						 
					 
					
						
						
							
						
						127055dd70 
					 
					
						
						
							
							Refactor a bit the error reporting from the propagator  
						
						... 
						
						
						
						Add different classes of error failures.
Fatal error means the sync should be stopped.
SoftErrors are not to be displayed to the user.
We still need to make a classification of the errors. 
						
						
					 
					
						2013-10-04 15:55:59 +02:00 
						 
				 
			
				
					
						
							
							
								Markus Goetz 
							
						 
					 
					
						
						
							
						
						f4929e849e 
					 
					
						
						
							
							CsyncThread: Activate recursive PROPFIND  
						
						
						
						
					 
					
						2013-10-04 15:42:40 +02:00 
						 
				 
			
				
					
						
							
							
								Markus Goetz 
							
						 
					 
					
						
						
							
						
						617949f2e1 
					 
					
						
						
							
							Recursive PROPFIND: Change and improve  
						
						... 
						
						
						
						It is disabled by default, but can be enabled by the library
user on demand. We suggest to enable it for the first sync
and when the local DB is small enough.
It only gets used for the first PROPFIND. In case the server
supports the Depth 'infinity', we keep the cache. In case
the server does not support it (= reports only 1 level)
we will still use the result by converting it to the legacy
PROPFIND cache. 
						
						
					 
					
						2013-10-04 13:23:10 +02:00 
						 
				 
			
				
					
						
							
							
								Mackie Messer 
							
						 
					 
					
						
						
							
						
						ba9ac03b0b 
					 
					
						
						
							
							Put plugins in PlugIns, not Plugins on Mac  
						
						... 
						
						
						
						Requires 770539f0a5 
						
						
					 
					
						2013-10-04 13:01:46 +02:00 
						 
				 
			
				
					
						
							
							
								Mackie Messer 
							
						 
					 
					
						
						
							
						
						0257f7e169 
					 
					
						
						
							
							Add sqlite plugin for OS X  
						
						
						
						
					 
					
						2013-10-04 13:01:46 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Molkentin 
							
						 
					 
					
						
						
							
						
						763cb43e46 
					 
					
						
						
							
							Add qsqlite plugin on Windows  
						
						
						
						
					 
					
						2013-10-04 12:45:17 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Molkentin 
							
						 
					 
					
						
						
							
						
						770539f0a5 
					 
					
						
						
							
							Look in PlugIns, not Plugins on Mac (consistent with Qt)  
						
						
						
						
					 
					
						2013-10-04 12:42:08 +02:00 
						 
				 
			
				
					
						
							
							
								Olivier Goffart 
							
						 
					 
					
						
						
							
						
						8ed2588cdf 
					 
					
						
						
							
							Fix build with Qt5  
						
						
						
						
					 
					
						2013-10-03 23:14:10 +02:00 
						 
				 
			
				
					
						
							
							
								Olivier Goffart 
							
						 
					 
					
						
						
							
						
						d8d2d36638 
					 
					
						
						
							
							Fix SQL Query  
						
						
						
						
					 
					
						2013-10-03 23:00:47 +02:00 
						 
				 
			
				
					
						
							
							
								Olivier Goffart 
							
						 
					 
					
						
						
							
						
						afc13e70b9 
					 
					
						
						
							
							fix Qt5 test compilation  
						
						
						
						
					 
					
						2013-10-03 22:51:40 +02:00 
						 
				 
			
				
					
						
							
							
								Olivier Goffart 
							
						 
					 
					
						
						
							
						
						baa9ba089c 
					 
					
						
						
							
							Save the database after each operation.  
						
						
						
						
					 
					
						2013-10-03 22:41:12 +02:00 
						 
				 
			
				
					
						
							
							
								Olivier Goffart 
							
						 
					 
					
						
						
							
						
						3495b822a5 
					 
					
						
						
							
							TMP  
						
						
						
						
					 
					
						2013-10-03 20:01:07 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Molkentin 
							
						 
					 
					
						
						
							
						
						be88d425fc 
					 
					
						
						
							
							Fix connecting to the mysql db  
						
						
						
						
					 
					
						2013-10-03 19:52:09 +02:00 
						 
				 
			
				
					
						
							
							
								Klaas Freitag 
							
						 
					 
					
						
						
							
						
						94a06cec5b 
					 
					
						
						
							
							WIP on the journal database.  
						
						
						
						
					 
					
						2013-10-03 18:52:02 +02:00 
						 
				 
			
				
					
						
							
							
								Olivier Goffart 
							
						 
					 
					
						
						
							
						
						9b31ef0ca8 
					 
					
						
						
							
							Do not write to the db if we did not do csync_propagate  
						
						
						
						
					 
					
						2013-10-03 18:37:13 +02:00 
						 
				 
			
				
					
						
							
							
								Klaas Freitag 
							
						 
					 
					
						
						
							
						
						4008f6b309 
					 
					
						
						
							
							Fix file status enum names.  
						
						
						
						
					 
					
						2013-10-03 17:55:32 +02:00 
						 
				 
			
				
					
						
							
							
								Klaas Freitag 
							
						 
					 
					
						
						
							
						
						daac6886a0 
					 
					
						
						
							
							Added method setFileRecord to update sync journal  
						
						
						
						
					 
					
						2013-10-03 17:48:14 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Molkentin 
							
						 
					 
					
						
						
							
						
						e304dfd5b9 
					 
					
						
						
							
							Add socketapi  
						
						... 
						
						
						
						Slightly amended by: Daniel Molkentin <danimo@owncloud.com > 
						
						
					 
					
						2013-10-03 17:05:01 +02:00 
						 
				 
			
				
					
						
							
							
								Dominik Schmidt 
							
						 
					 
					
						
						
							
						
						d0af48c417 
					 
					
						
						
							
							Add KDE tmp files to .gitignore  
						
						
						
						
					 
					
						2013-10-03 17:05:00 +02:00 
						 
				 
			
				
					
						
							
							
								Klaas Freitag 
							
						 
					 
					
						
						
							
						
						2e3aabf99b 
					 
					
						
						
							
							Read header without prefix path now that it's in 3rdparty.  
						
						
						
						
					 
					
						2013-10-03 16:47:48 +02:00 
						 
				 
			
				
					
						
							
							
								Klaas Freitag 
							
						 
					 
					
						
						
							
						
						59bf8740a0 
					 
					
						
						
							
							Add c_jhash.h header from csync to 3rdparty.  
						
						
						
						
					 
					
						2013-10-03 16:41:23 +02:00 
						 
				 
			
				
					
						
							
							
								Olivier Goffart 
							
						 
					 
					
						
						
							
						
						21cd57228e 
					 
					
						
						
							
							Fix build with Qt5  
						
						... 
						
						
						
						Missing SQL module 
						
						
					 
					
						2013-10-03 16:29:47 +02:00 
						 
				 
			
				
					
						
							
							
								Klaas Freitag 
							
						 
					 
					
						
						
							
						
						4501c64e61 
					 
					
						
						
							
							Do not include whole header of csync_exclude.  
						
						
						
						
					 
					
						2013-10-03 16:22:31 +02:00 
						 
				 
			
				
					
						
							
							
								Klaas Freitag 
							
						 
					 
					
						
						
							
						
						273105e78b 
					 
					
						
						
							
							Handle new case SyncAbortRequested.  
						
						
						
						
					 
					
						2013-10-03 16:21:54 +02:00 
						 
				 
			
				
					
						
							
							
								Klaas Freitag 
							
						 
					 
					
						
						
							
						
						2707116350 
					 
					
						
						
							
							Minor fixes for file_status  
						
						
						
						
					 
					
						2013-10-03 16:12:50 +02:00 
						 
				 
			
				
					
						
							
							
								Klaas Freitag 
							
						 
					 
					
						
						
							
						
						c7d30bae98 
					 
					
						
						
							
							Handle new sync result enum.  
						
						
						
						
					 
					
						2013-10-03 15:32:44 +02:00 
						 
				 
			
				
					
						
							
							
								Klaas Freitag 
							
						 
					 
					
						
						
							
						
						be328581a7 
					 
					
						
						
							
							Implemented sync status function for overlay icons.  
						
						
						
						
					 
					
						2013-10-03 15:29:10 +02:00 
						 
				 
			
				
					
						
							
							
								Klaas Freitag 
							
						 
					 
					
						
						
							
						
						c32bc27b3e 
					 
					
						
						
							
							Add sync journal database class that opens the csync db to read from it.  
						
						
						
						
					 
					
						2013-10-03 15:29:10 +02:00 
						 
				 
			
				
					
						
							
							
								Klaas Freitag 
							
						 
					 
					
						
						
							
						
						0fef88a9b9 
					 
					
						
						
							
							Some comments added.  
						
						
						
						
					 
					
						2013-10-03 15:29:10 +02:00 
						 
				 
			
				
					
						
							
							
								Klaas Freitag 
							
						 
					 
					
						
						
							
						
						3e0fc56495 
					 
					
						
						
							
							Dont show the [i] icon in the tray, see bug  #942  
						
						
						
						
					 
					
						2013-10-03 15:29:10 +02:00 
						 
				 
			
				
					
						
							
							
								Olivier Goffart 
							
						 
					 
					
						
						
							
						
						7ea3fc1533 
					 
					
						
						
							
							Fix compilation of the test  
						
						
						
						
					 
					
						2013-10-03 14:45:00 +02:00 
						 
				 
			
				
					
						
							
							
								Olivier Goffart 
							
						 
					 
					
						
						
							
						
						396ec4f888 
					 
					
						
						
							
							Fix race condition in the logger.  
						
						... 
						
						
						
						Logs can come from multiple thread, we need to keep the _logstream
protected by a mutex 
						
						
					 
					
						2013-10-03 14:37:13 +02:00 
						 
				 
			
				
					
						
							
							
								Olivier Goffart 
							
						 
					 
					
						
						
							
						
						79ea7c3eed 
					 
					
						
						
							
							Abort the sync asynchroniously  
						
						... 
						
						
						
						Don't block the GUI when clicking on pause
Mirall issue #968  
						
						
					 
					
						2013-10-03 14:36:32 +02:00 
						 
				 
			
				
					
						
							
							
								Olivier Goffart 
							
						 
					 
					
						
						
							
						
						b18810f381 
					 
					
						
						
							
							Implement abort with the new propagator  
						
						... 
						
						
						
						abort was implemented in csync after the new propagator was written,
so it was not working with the new propagator 
						
						
					 
					
						2013-10-03 14:35:56 +02:00 
						 
				 
			
				
					
						
							
							
								Jenkins for ownCloud 
							
						 
					 
					
						
						
							
						
						51d9cf099c 
					 
					
						
						
							
							[tx-robot] updated from transifex  
						
						
						
						
					 
					
						2013-10-03 08:09:15 -04:00 
						 
				 
			
				
					
						
							
							
								Olivier Goffart 
							
						 
					 
					
						
						
							
						
						be6e208328 
					 
					
						
						
							
							Merge branch 'dav' into ocsync  
						
						... 
						
						
						
						Conflicts:
	src/csync_update.c 
						
						
					 
					
						2013-10-03 12:08:51 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Molkentin 
							
						 
					 
					
						
						
							
						
						339ed20abc 
					 
					
						
						
							
							Utility::showInFileManager(): Substitute valid desktop file parameters  
						
						
						
						
					 
					
						2013-10-03 12:05:00 +02:00 
						 
				 
			
				
					
						
							
							
								Olivier Goffart 
							
						 
					 
					
						
						
							
						
						b24f894a32 
					 
					
						
						
							
							Set the start_id while aborting.  This allow to resume from this block  
						
						
						
						
					 
					
						2013-10-03 11:58:28 +02:00 
						 
				 
			
				
					
						
							
							
								Klaas Freitag 
							
						 
					 
					
						
						
							
						
						44ed577992 
					 
					
						
						
							
							List results for all folders, not only one.  
						
						
						
						
					 
					
						2013-10-03 11:36:18 +02:00 
						 
				 
			
				
					
						
							
							
								Klaas Freitag 
							
						 
					 
					
						
						
							
						
						f6685accc3 
					 
					
						
						
							
							Use subdirs for more xdg dirs to go through  
						
						
						
						
					 
					
						2013-10-02 19:23:06 +02:00 
						 
				 
			
				
					
						
							
							
								Klaas Freitag 
							
						 
					 
					
						
						
							
						
						2c2e79c13d 
					 
					
						
						
							
							Consider the folder of items to delete from info window.  
						
						
						
						
					 
					
						2013-10-02 19:23:06 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Molkentin 
							
						 
					 
					
						
						
							
						
						81961068a2 
					 
					
						
						
							
							Utility: Move OS specific implementations into separate files  
						
						
						
						
					 
					
						2013-10-02 19:15:56 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Molkentin 
							
						 
					 
					
						
						
							
						
						4e91a6450c 
					 
					
						
						
							
							Change the recent changes menu and file item dialog behavior  
						
						... 
						
						
						
						Recent Changes:
- "No items synced recently"
- Add separator to the details section
- Make items clickable (will open file location in file manager)
- If a file was deleted, disable it
File Item Dialog:
- Make items clickable (will open file location in file manager)
This is implemented via a new method Utility::showInFileManager(QString),
which goes through great lengths to use use the right file manager on all
OSes/WMs/DEs, and make sure it selects the file in question if possible.
This needs good testing, though.
Fixes  #1044  
						
						
					 
					
						2013-10-02 18:17:48 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Molkentin 
							
						 
					 
					
						
						
							
						
						3dc2547bb5 
					 
					
						
						
							
							WIP  
						
						
						
						
					 
					
						2013-10-02 18:16:32 +02:00 
						 
				 
			
				
					
						
							
							
								Olivier Goffart 
							
						 
					 
					
						
						
							
						
						fb54cc8597 
					 
					
						
						
							
							Fix the test.  
						
						... 
						
						
						
						conflictcopy is no longer in the default config file 
						
						
					 
					
						2013-10-02 16:05:24 +02:00 
						 
				 
			
				
					
						
							
							
								Olivier Goffart 
							
						 
					 
					
						
						
							
						
						47f299f0ee 
					 
					
						
						
							
							Send the last known etag to the server in a If-Match header  
						
						... 
						
						
						
						That way we avoid race conditions in case the file changed between the
update and the reconcile 
						
						
					 
					
						2013-10-02 15:57:49 +02:00 
						 
				 
			
				
					
						
							
							
								Olivier Goffart 
							
						 
					 
					
						
						
							
						
						d135aab86c 
					 
					
						
						
							
							clear the etag in every cases, not only when we upload files  
						
						
						
						
					 
					
						2013-10-02 15:57:49 +02:00 
						 
				 
			
				
					
						
							
							
								Olivier Goffart 
							
						 
					 
					
						
						
							
						
						e2a2b882bb 
					 
					
						
						
							
							Remove the unused errorDetails  
						
						... 
						
						
						
						It was not displayed to the user. Only use errorString instead.
Also report neon error to the user 
						
						
					 
					
						2013-10-02 15:57:49 +02:00