Daniel Molkentin 
							
						 
					 
					
						
						
							
						
						30d8290d1c 
					 
					
						
						
							
							Replace every occurrence of csync with ocsync in the documentation.  
						
						... 
						
						
						
						Patch by Sandro Knauß <buggs@sandroknauss.de >
Fixes Mirall issue #991 
Conflicts:
	doc/ocsync.1.txt 
						
						
					 
					
						2013-09-12 15:29:37 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Molkentin 
							
						 
					 
					
						
						
							
						
						d4da443b12 
					 
					
						
						
							
							Fixing spelling error 'transferred'  
						
						... 
						
						
						
						Lintian complains about the wrong spelling for transferred
Patch by Sandro Knauß <bugs@sandroknauss.de >
Fixes Mirall issue #990  
						
						
					 
					
						2013-09-12 15:28:41 +02:00 
						 
				 
			
				
					
						
							
							
								Klaas Freitag 
							
						 
					 
					
						
						
							
						
						1f8aee8a4f 
					 
					
						
						
							
							Adjusted tests for csync_excluded.  
						
						
						
						
					 
					
						2013-09-12 14:47:17 +02:00 
						 
				 
			
				
					
						
							
							
								Klaas Freitag 
							
						 
					 
					
						
						
							
						
						526d23583a 
					 
					
						
						
							
							Use new interface to csync_excluded.  
						
						
						
						
					 
					
						2013-09-12 14:47:17 +02:00 
						 
				 
			
				
					
						
							
							
								Klaas Freitag 
							
						 
					 
					
						
						
							
						
						20821e6ffd 
					 
					
						
						
							
							Fix a typo.  
						
						
						
						
					 
					
						2013-09-12 14:47:17 +02:00 
						 
				 
			
				
					
						
							
							
								Klaas Freitag 
							
						 
					 
					
						
						
							
						
						d31f11fe88 
					 
					
						
						
							
							Make csync_excluded function work gitignore like.  
						
						
						
						
					 
					
						2013-09-12 14:47:17 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Molkentin 
							
						 
					 
					
						
						
							
						
						dbad6d641e 
					 
					
						
						
							
							Replace every occurrence of csync with ocsync in the documentation.  
						
						... 
						
						
						
						Patch by Sandro Knauß <buggs@sandroknauss.de >
Fixes Mirall issue #991  
						
						
					 
					
						2013-09-12 13:32:17 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Molkentin 
							
						 
					 
					
						
						
							
						
						c33e21a8c6 
					 
					
						
						
							
							Fixing spelling error 'transferred'  
						
						... 
						
						
						
						Lintian complains about the wrong spelling for transferred
Patch by Sandro Knauß <bugs@sandroknauss.de >
Fixes Mirall issue #990  
						
						
					 
					
						2013-09-12 13:32:14 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Molkentin 
							
						 
					 
					
						
						
							
						
						b488ad12c2 
					 
					
						
						
							
							Do not build org and com theming when building from tar ball  
						
						... 
						
						
						
						Fixes  #989  
					
						2013-09-12 12:56:24 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Molkentin 
							
						 
					 
					
						
						
							
						
						2dad027001 
					 
					
						
						
							
							Do not build org and com theming when building from tar ball  
						
						... 
						
						
						
						Fixes  #989  
					
						2013-09-12 12:55:12 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Molkentin 
							
						 
					 
					
						
						
							
						
						f97bb240d7 
					 
					
						
						
							
							Setting thread priority is only possible after calling start()  
						
						
						
						
					 
					
						2013-09-11 15:52:07 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Molkentin 
							
						 
					 
					
						
						
							
						
						574e029254 
					 
					
						
						
							
							Setting thread priority is only possible after calling start()  
						
						
						
						
					 
					
						2013-09-11 15:51:06 +02:00 
						 
				 
			
				
					
						
							
							
								Jenkins for ownCloud 
							
						 
					 
					
						
						
							
						
						91759c4a27 
					 
					
						
						
							
							[tx-robot] updated from transifex  
						
						
						
						
					 
					
						2013-09-11 06:40:51 -04:00 
						 
				 
			
				
					
						
							
							
								Klaas Freitag 
							
						 
					 
					
						
						
							
						
						ce5934461e 
					 
					
						
						
							
							Do not en- or disable the watcher in setSyncEnabled.  
						
						... 
						
						
						
						The watcher is handled through the start and stop sync hooks in the
folder class. Even if the the folder is disabled and the watcher
fires, the folder does not schedule because it checks first if the
folder is enabled. 
						
						
					 
					
						2013-09-11 12:33:07 +02:00 
						 
				 
			
				
					
						
							
							
								Klaas Freitag 
							
						 
					 
					
						
						
							
						
						80332fb6ab 
					 
					
						
						
							
							Do not en- or disable the watcher in setSyncEnabled.  
						
						... 
						
						
						
						The watcher is handled through the start and stop sync hooks in the
folder class. Even if the the folder is disabled and the watcher
fires, the folder does not schedule because it checks first if the
folder is enabled. 
						
						
					 
					
						2013-09-11 12:30:29 +02:00 
						 
				 
			
				
					
						
							
							
								Klaas Freitag 
							
						 
					 
					
						
						
							
						
						287ec2f3df 
					 
					
						
						
							
							Enable and disable syncing also in the folder objects.  
						
						
						
						
					 
					
						2013-09-11 10:50:03 +02:00 
						 
				 
			
				
					
						
							
							
								Klaas Freitag 
							
						 
					 
					
						
						
							
						
						eb5824f713 
					 
					
						
						
							
							Handle startup network errors correctly.  
						
						
						
						
					 
					
						2013-09-11 10:49:45 +02:00 
						 
				 
			
				
					
						
							
							
								Klaas Freitag 
							
						 
					 
					
						
						
							
						
						eded901f69 
					 
					
						
						
							
							Minor code cleanups-  
						
						
						
						
					 
					
						2013-09-11 10:49:10 +02:00 
						 
				 
			
				
					
						
							
							
								Klaas Freitag 
							
						 
					 
					
						
						
							
						
						d22dc6e6af 
					 
					
						
						
							
							Exclude the progress database.  
						
						
						
						
					 
					
						2013-09-11 10:43:05 +02:00 
						 
				 
			
				
					
						
							
							
								Klaas Freitag 
							
						 
					 
					
						
						
							
						
						6f637e40d8 
					 
					
						
						
							
							Enable and disable syncing also in the folder objects.  
						
						
						
						
					 
					
						2013-09-11 10:32:09 +02:00 
						 
				 
			
				
					
						
							
							
								Klaas Freitag 
							
						 
					 
					
						
						
							
						
						ec06663dee 
					 
					
						
						
							
							Handle startup network errors correctly.  
						
						
						
						
					 
					
						2013-09-11 10:32:09 +02:00 
						 
				 
			
				
					
						
							
							
								Klaas Freitag 
							
						 
					 
					
						
						
							
						
						3c5c432e1d 
					 
					
						
						
							
							Minor code cleanups-  
						
						
						
						
					 
					
						2013-09-11 10:32:09 +02:00 
						 
				 
			
				
					
						
							
							
								Olivier Goffart 
							
						 
					 
					
						
						
							
						
						927f7549d4 
					 
					
						
						
							
							Revert "Compile  (find httpbf)"  
						
						... 
						
						
						
						This reverts commit 2d2e843804 
						
						
					 
					
						2013-09-11 09:00:27 +02:00 
						 
				 
			
				
					
						
							
							
								Olivier Goffart 
							
						 
					 
					
						
						
							
						
						177114f8d9 
					 
					
						
						
							
							Initialize the size of the SyncItem  
						
						
						
						
					 
					
						2013-09-11 08:49:09 +02:00 
						 
				 
			
				
					
						
							
							
								Olivier Goffart 
							
						 
					 
					
						
						
							
						
						6bfdfd1af0 
					 
					
						
						
							
							Fix progress with new propagator  
						
						
						
						
					 
					
						2013-09-11 08:42:29 +02:00 
						 
				 
			
				
					
						
							
							
								Olivier Goffart 
							
						 
					 
					
						
						
							
						
						2d2e843804 
					 
					
						
						
							
							Compile  (find httpbf)  
						
						
						
						
					 
					
						2013-09-11 08:11:03 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Molkentin 
							
						 
					 
					
						
						
							
						
						fd30df82cb 
					 
					
						
						
							
							Folder Wizard: More sanity checks  
						
						... 
						
						
						
						Check if a server folder or its parent
is already part of a sync and refuse
to create a sync in this case.
Avoids "recursive syncing"
Fixes  #962  
						
						
					 
					
						2013-09-10 23:38:00 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Molkentin 
							
						 
					 
					
						
						
							
						
						55f2fcb4c6 
					 
					
						
						
							
							Folder Wizard: More sanity checks  
						
						... 
						
						
						
						Check if a server folder or its parent
is already part of a sync and refuse
to create a sync in this case.
Avoids "recursive syncing"
Fixes  #962  
						
						
					 
					
						2013-09-10 23:37:52 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Molkentin 
							
						 
					 
					
						
						
							
						
						d8888432c3 
					 
					
						
						
							
							Send basic auth in utf8.  
						
						... 
						
						
						
						Implies circumventing QAuthenticator and handling
authentication manually again.
Fixes  #941  
						
						
					 
					
						2013-09-10 23:04:10 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Molkentin 
							
						 
					 
					
						
						
							
						
						59425741b6 
					 
					
						
						
							
							Send basic auth in utf8.  
						
						... 
						
						
						
						Implies circumventing QAuthenticator and handling
authentication manually again.
Fixes  #941  
						
						
					 
					
						2013-09-10 23:03:52 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Molkentin 
							
						 
					 
					
						
						
							
						
						3577ba2981 
					 
					
						
						
							
							Fix httpbf/neon linkage  
						
						
						
						
					 
					
						2013-09-10 19:50:44 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Molkentin 
							
						 
					 
					
						
						
							
						
						93fdbcd371 
					 
					
						
						
							
							reversed decision: httpbf stays statically linked  
						
						
						
						
					 
					
						2013-09-10 19:47:18 +02:00 
						 
				 
			
				
					
						
							
							
								Jenkins for ownCloud 
							
						 
					 
					
						
						
							
						
						d4477b0d65 
					 
					
						
						
							
							[tx-robot] updated from transifex  
						
						
						
						
					 
					
						2013-09-10 09:42:18 -04:00 
						 
				 
			
				
					
						
							
							
								Daniel Molkentin 
							
						 
					 
					
						
						
							
						
						48b4c57d92 
					 
					
						
						
							
							Use shared version of libhttpbf, package it on win  
						
						
						
						
					 
					
						2013-09-10 14:45:08 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Molkentin 
							
						 
					 
					
						
						
							
						
						6a2631631c 
					 
					
						
						
							
							Make httpbf a shared lib  
						
						... 
						
						
						
						remove the lib suffix along the way 
						
						
					 
					
						2013-09-10 14:41:42 +02:00 
						 
				 
			
				
					
						
							
							
								Klaas Freitag 
							
						 
					 
					
						
						
							
						
						9cb3af801a 
					 
					
						
						
							
							Fixes for win32 after upstream merge.  
						
						
						
						
					 
					
						2013-09-10 12:59:29 +02:00 
						 
				 
			
				
					
						
							
							
								morriswinkler 
							
						 
					 
					
						
						
							
						
						51712fea53 
					 
					
						
						
							
							Update building.rst  
						
						... 
						
						
						
						eider fix it or add the note here 
						
						
					 
					
						2013-09-10 12:15:16 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Molkentin 
							
						 
					 
					
						
						
							
						
						f597f99198 
					 
					
						
						
							
							Wait up to 30 secs before complaining about missing systray  
						
						... 
						
						
						
						Conflicts:
	src/mirall/utility.cpp
Fixes  #949  
						
						
					 
					
						2013-09-10 11:40:02 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Molkentin 
							
						 
					 
					
						
						
							
						
						00d09763af 
					 
					
						
						
							
							Fix compile error  
						
						
						
						
					 
					
						2013-09-10 11:37:52 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Molkentin 
							
						 
					 
					
						
						
							
						
						5639572ef3 
					 
					
						
						
							
							Wait up to 30 secs before complaining about missing systray  
						
						
						
						
					 
					
						2013-09-10 11:37:52 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Molkentin 
							
						 
					 
					
						
						
							
						
						1e7716abb4 
					 
					
						
						
							
							Merge pull request  #964  from morriswinkler/patch-1  
						
						... 
						
						
						
						Update building.rst 
						
						
					 
					
						2013-09-10 02:28:03 -07:00 
						 
				 
			
				
					
						
							
							
								morriswinkler 
							
						 
					 
					
						
						
							
						
						751181d14f 
					 
					
						
						
							
							Update building.rst  
						
						... 
						
						
						
						eider fix it or add the note here 
						
						
					 
					
						2013-09-09 19:09:08 +02:00 
						 
				 
			
				
					
						
							
							
								Olivier Goffart 
							
						 
					 
					
						
						
							
						
						013b87f9c5 
					 
					
						
						
							
							ignore the progress database  
						
						
						
						
					 
					
						2013-09-09 15:18:28 +02:00 
						 
				 
			
				
					
						
							
							
								Olivier Goffart 
							
						 
					 
					
						
						
							
						
						6da2f6bbaa 
					 
					
						
						
							
							Qt5:  QSettings is no longer case insensitive  
						
						
						
						
					 
					
						2013-09-09 14:00:13 +02:00 
						 
				 
			
				
					
						
							
							
								Olivier Goffart 
							
						 
					 
					
						
						
							
						
						198cb43ad6 
					 
					
						
						
							
							Qt5:  Q_WS_* macro were deprecated, replace by QT_OS_*  
						
						... 
						
						
						
						in particular, QT_WS_X11 is no longer defined 
						
						
					 
					
						2013-09-09 13:31:39 +02:00 
						 
				 
			
				
					
						
							
							
								Jenkins for ownCloud 
							
						 
					 
					
						
						
							
						
						db648a0268 
					 
					
						
						
							
							[tx-robot] updated from transifex  
						
						
						
						
					 
					
						2013-09-08 20:37:37 -04:00 
						 
				 
			
				
					
						
							
							
								Jenkins for ownCloud 
							
						 
					 
					
						
						
							
						
						7cea2225de 
					 
					
						
						
							
							[tx-robot] updated from transifex  
						
						
						
						
					 
					
						2013-09-07 04:38:12 -04:00 
						 
				 
			
				
					
						
							
							
								Daniel Molkentin 
							
						 
					 
					
						
						
							
						
						51a7cbeb55 
					 
					
						
						
							
							kill warning  
						
						
						
						
					 
					
						2013-09-05 20:15:55 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Molkentin 
							
						 
					 
					
						
						
							
						
						171a9e1575 
					 
					
						
						
							
							fix Qt 5 build on Mac/Win  
						
						
						
						
					 
					
						2013-09-05 19:53:39 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Molkentin 
							
						 
					 
					
						
						
							
						
						1a10663c2b 
					 
					
						
						
							
							csync_vio: fix defines  
						
						
						
						
					 
					
						2013-09-05 19:50:20 +02:00