Olivier Goffart 
							
						 
					 
					
						
						
							
						
						662bd4e5fe 
					 
					
						
						
							
							propagator-ng:  handle conflict  
						
						 
						
						... 
						
						
						
						Always download the file from the server.
And if they are equals, ignore the conflict 
						
						
					 
					
						2013-05-05 11:17:42 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Olivier Goffart 
							
						 
					 
					
						
						
							
						
						5118054fa3 
					 
					
						
						
							
							Enable the backup of conflicts files in owncloudcmd  
						
						 
						
						
						
						
					 
					
						2013-05-05 11:17:07 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Klaas Freitag 
							
						 
					 
					
						
						
							
						
						c956d11183 
					 
					
						
						
							
							More error handling of propagator, some cleanups.  
						
						 
						
						
						
						
					 
					
						2013-05-04 17:14:47 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Klaas Freitag 
							
						 
					 
					
						
						
							
						
						7df23a1b19 
					 
					
						
						
							
							Proper error reporting of propagator - WIP  
						
						 
						
						
						
						
					 
					
						2013-05-04 17:14:47 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Klaas Freitag 
							
						 
					 
					
						
						
							
						
						72580d7213 
					 
					
						
						
							
							move command line client into bin dir  
						
						 
						
						
						
						
					 
					
						2013-05-04 17:14:47 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Molkentin 
							
						 
					 
					
						
						
							
						
						a36d79e993 
					 
					
						
						
							
							Fix make install  
						
						 
						
						
						
						
					 
					
						2013-05-04 17:01:14 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Molkentin 
							
						 
					 
					
						
						
							
						
						be5c1b2072 
					 
					
						
						
							
							Fix build  
						
						 
						
						
						
						
					 
					
						2013-05-04 16:38:39 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Olivier Goffart 
							
						 
					 
					
						
						
							
						
						264cc73806 
					 
					
						
						
							
							Implement renaming on windows  
						
						 
						
						... 
						
						
						
						(Not actually tested) 
						
						
					 
					
						2013-05-04 16:18:13 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Molkentin 
							
						 
					 
					
						
						
							
						
						f0bd1ea48e 
					 
					
						
						
							
							Add connectionvalidator class  
						
						 
						
						
						
						
					 
					
						2013-05-04 16:01:45 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Molkentin 
							
						 
					 
					
						
						
							
						
						90d0460a42 
					 
					
						
						
							
							Remove dummy artwork, dead switches  
						
						 
						
						
						
						
					 
					
						2013-05-04 15:55:04 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Olivier Goffart 
							
						 
					 
					
						
						
							
						
						c041076c95 
					 
					
						
						
							
							Handle renames  
						
						 
						
						
						
						
					 
					
						2013-05-04 15:32:11 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Molkentin 
							
						 
					 
					
						
						
							
						
						c15ce2b20b 
					 
					
						
						
							
							Remove last traces of localRun  
						
						 
						
						
						
						
					 
					
						2013-05-04 15:16:53 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Molkentin 
							
						 
					 
					
						
						
							
						
						b51f210bfa 
					 
					
						
						
							
							Drop (broken) mirall binary  
						
						 
						
						... 
						
						
						
						This remove all non-ownCloud backends, as well
as all obsolete wizard pages. CSync is now
a mandatory dependency. 
						
						
					 
					
						2013-05-04 14:03:51 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Olivier Goffart 
							
						 
					 
					
						
						
							
						
						f6ff189f35 
					 
					
						
						
							
							Add owncloudcmd  
						
						 
						
						... 
						
						
						
						A simple commandline client like ocsync.
The goal is to be used bu the t1.pl test 
						
						
					 
					
						2013-05-04 13:52:35 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Olivier Goffart 
							
						 
					 
					
						
						
							
						
						e1e8842548 
					 
					
						
						
							
							New owncloud propagator that skip the vio abstraction layer  
						
						 
						
						... 
						
						
						
						The vio abstraction layer within csync is inneficient for the owncloud
use case because not all calls maps well to the POSIX interface. We can
be much more efficient by doing exactly what we need.
Also, this will allow us to scedule better the calls and possibly to use
threads. 
						
						
					 
					
						2013-05-04 11:02:30 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Molkentin 
							
						 
					 
					
						
						
							
						
						105c76c055 
					 
					
						
						
							
							Fix sizing problems in the new wizard dialog.  
						
						 
						
						
						
						
					 
					
						2013-04-30 21:51:48 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Molkentin 
							
						 
					 
					
						
						
							
						
						6b15b7a58f 
					 
					
						
						
							
							Update detector: make it possible to skip updates.  
						
						 
						
						... 
						
						
						
						Fixes issue #588 . 
						
						
					 
					
						2013-04-30 17:46:07 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Molkentin 
							
						 
					 
					
						
						
							
						
						fee0aae975 
					 
					
						
						
							
							new wizard: Better separate folder names in strings.  
						
						 
						
						
						
						
					 
					
						2013-04-30 17:46:07 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Klaas Freitag 
							
						 
					 
					
						
						
							
						
						b33b638d2d 
					 
					
						
						
							
							A bit more verbose troubleshooting documentation.  
						
						 
						
						
						
						
					 
					
						2013-04-30 13:53:33 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Klaas Freitag 
							
						 
					 
					
						
						
							
						
						1e677a5f0f 
					 
					
						
						
							
							Fixed default target dir to / and fixed logging text.  
						
						 
						
						
						
						
					 
					
						2013-04-30 13:53:13 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Klaas Freitag 
							
						 
					 
					
						
						
							
						
						3f3f6c0f39 
					 
					
						
						
							
							Move setPlaceholderText to correct class.  
						
						 
						
						
						
						
					 
					
						2013-04-29 14:09:05 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Klaas Freitag 
							
						 
					 
					
						
						
							
						
						5dd53b48ef 
					 
					
						
						
							
							Add missing lineedit method for ancient Qt versions  
						
						 
						
						
						
						
					 
					
						2013-04-29 11:08:37 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Klaas Freitag 
							
						 
					 
					
						
						
							
						
						a215e11b20 
					 
					
						
						
							
							Merge development branch with new setup dialog.  
						
						 
						
						
						
						
					 
					
						2013-04-29 10:20:01 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Molkentin 
							
						 
					 
					
						
						
							
						
						7d71f9dd2d 
					 
					
						
						
							
							Merge pull request  #582  from ghmer/master  
						
						 
						
						... 
						
						
						
						Fix messed formatting in build documentation 
						
						
					 
					
						2013-04-29 00:34:53 -07:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jenkins for ownCloud 
							
						 
					 
					
						
						
							
						
						183f1574ca 
					 
					
						
						
							
							[tx-robot] updated from transifex  
						
						 
						
						
						
						
					 
					
						2013-04-29 01:26:56 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jenkins for ownCloud 
							
						 
					 
					
						
						
							
						
						504b651bb9 
					 
					
						
						
							
							[tx-robot] updated from transifex  
						
						 
						
						
						
						
					 
					
						2013-04-28 01:27:25 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Klaas Freitag 
							
						 
					 
					
						
						
							
						
						c848ff4bdb 
					 
					
						
						
							
							New setup dialog, simplified version.  
						
						 
						
						
						
						
					 
					
						2013-04-27 22:24:32 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Klaas Freitag 
							
						 
					 
					
						
						
							
						
						5aa8f5bc01 
					 
					
						
						
							
							Added own CookieJar to not return a Session Cookie, rem Auth Callback  
						
						 
						
						... 
						
						
						
						The auth callback is not needed as we send an Basic Auth header. 
						
						
					 
					
						2013-04-27 22:22:20 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Klaas Freitag 
							
						 
					 
					
						
						
							
						
						6c5d5a543c 
					 
					
						
						
							
							Simplified config file write method, removed don't store pwd.  
						
						 
						
						
						
						
					 
					
						2013-04-27 22:21:28 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Klaas Freitag 
							
						 
					 
					
						
						
							
						
						a8bc849b5d 
					 
					
						
						
							
							Add blue ownCloud logo.  
						
						 
						
						
						
						
					 
					
						2013-04-27 22:20:33 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Klaas Freitag 
							
						 
					 
					
						
						
							
						
						5f535b9661 
					 
					
						
						
							
							owncloud logo pixmap.  
						
						 
						
						
						
						
					 
					
						2013-04-27 21:07:39 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Klaas Freitag 
							
						 
					 
					
						
						
							
						
						eaf865539c 
					 
					
						
						
							
							Added owncloud logo for new setup dialog.  
						
						 
						
						
						
						
					 
					
						2013-04-27 21:07:00 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Mario Enrico Ragucci 
							
						 
					 
					
						
						
							
						
						75448c41d4 
					 
					
						
						
							
							Verified format cleanup (really...)  
						
						 
						
						... 
						
						
						
						Signed-off-by: Mario Enrico Ragucci <github@ragucci.de > 
						
						
					 
					
						2013-04-26 17:02:55 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Mario Enrico Ragucci 
							
						 
					 
					
						
						
							
						
						afc96e2021 
					 
					
						
						
							
							Format cleanup  
						
						 
						
						... 
						
						
						
						Signed-off-by: Mario Enrico Ragucci <github@ragucci.de > 
						
						
					 
					
						2013-04-26 15:47:49 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Molkentin 
							
						 
					 
					
						
						
							
						
						d7bce80c7b 
					 
					
						
						
							
							Merge pull request  #580  from ghmer/master  
						
						 
						
						... 
						
						
						
						Documentation Update cross-compiling section to include all libs needed to build the Windows Package 
						
						
					 
					
						2013-04-26 04:41:20 -07:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Mario Enrico Ragucci 
							
						 
					 
					
						
						
							
						
						7e07d20d31 
					 
					
						
						
							
							Remove LOG4C information as this is not needed anymore  
						
						 
						
						... 
						
						
						
						Signed-off-by: Mario Enrico Ragucci <github@ragucci.de > 
						
						
					 
					
						2013-04-26 13:32:35 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Molkentin 
							
						 
					 
					
						
						
							
						
						238111be09 
					 
					
						
						
							
							Find csync_version.h, local config.h  
						
						 
						
						
						
						
					 
					
						2013-04-26 10:48:02 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Klaas Freitag 
							
						 
					 
					
						
						
							
						
						6f0820a3ed 
					 
					
						
						
							
							Add QProgressIndicator to source list  
						
						 
						
						
						
						
					 
					
						2013-04-26 10:47:17 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jenkins for ownCloud 
							
						 
					 
					
						
						
							
						
						1d0d1c249b 
					 
					
						
						
							
							[tx-robot] updated from transifex  
						
						 
						
						
						
						
					 
					
						2013-04-26 01:26:32 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Mario Enrico Ragucci 
							
						 
					 
					
						
						
							
						
						1b5ed68375 
					 
					
						
						
							
							Formatting cleanup  
						
						 
						
						
						
						
					 
					
						2013-04-26 01:00:50 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Mario Enrico Ragucci 
							
						 
					 
					
						
						
							
						
						ce996b3fc8 
					 
					
						
						
							
							- Update Cross-Compiling section: Listing of all needed libraries to successfully build the Windows installer package  
						
						 
						
						... 
						
						
						
						- Adding a note about the missing cross-compiled LOG4C package
- Minor changes to the documentation to be more specific about building the Windows package 
						
						
					 
					
						2013-04-26 00:45:19 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Molkentin 
							
						 
					 
					
						
						
							
						
						2789522948 
					 
					
						
						
							
							Folder/ownCloudFolder: Clean up secondPath stuff  
						
						 
						
						
						
						
					 
					
						2013-04-25 16:06:31 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Molkentin 
							
						 
					 
					
						
						
							
						
						55a56cc275 
					 
					
						
						
							
							Find csync_version.h, local config.h  
						
						 
						
						
						
						
					 
					
						2013-04-25 13:19:38 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jenkins for ownCloud 
							
						 
					 
					
						
						
							
						
						20101527b2 
					 
					
						
						
							
							[tx-robot] updated from transifex  
						
						 
						
						
						
						
					 
					
						2013-04-25 01:27:34 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Molkentin 
							
						 
					 
					
						
						
							
						
						311bd39100 
					 
					
						
						
							
							Add simplified FancyLineEdit from Qt Creator to 3rdparty  
						
						 
						
						
						
						
					 
					
						2013-04-24 13:36:25 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Klaas Freitag 
							
						 
					 
					
						
						
							
						
						fab77a15f0 
					 
					
						
						
							
							Fix build after merge  
						
						 
						
						
						
						
					 
					
						2013-04-24 13:33:26 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Klaas Freitag 
							
						 
					 
					
						
						
							
						
						09e7f5c618 
					 
					
						
						
							
							Add qprogressindicator widget  
						
						 
						
						
						
						
					 
					
						2013-04-24 11:45:53 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Klaas Freitag 
							
						 
					 
					
						
						
							
						
						c5a674b1df 
					 
					
						
						
							
							More work on new Connection dialog. First working version.  
						
						 
						
						
						
						
					 
					
						2013-04-24 11:40:29 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jenkins for ownCloud 
							
						 
					 
					
						
						
							
						
						f83453cfc7 
					 
					
						
						
							
							[tx-robot] updated from transifex  
						
						 
						
						
						
						
					 
					
						2013-04-24 01:27:36 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Molkentin 
							
						 
					 
					
						
						
							
						
						1ca8ebebd9 
					 
					
						
						
							
							Do not add shortcuts to non-existent files  
						
						 
						
						
						
						
					 
					
						2013-04-23 17:19:27 +02:00