Klaas Freitag 
							
						 
					 
					
						
						
							
						
						07034daffe 
					 
					
						
						
							
							Take valid caList from QSslSocket::defaultCA.  
						
						 
						
						
						
						
					 
					
						2013-01-14 12:13:51 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Klaas Freitag 
							
						 
					 
					
						
						
							
						
						dca8ecb929 
					 
					
						
						
							
							Remove bogus spaces.  
						
						 
						
						
						
						
					 
					
						2013-01-14 12:13:50 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Klaas Freitag 
							
						 
					 
					
						
						
							
						
						dd2eecec42 
					 
					
						
						
							
							Remove bogus reset after creds were written.  
						
						 
						
						
						
						
					 
					
						2013-01-14 12:13:50 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Klaas Freitag 
							
						 
					 
					
						
						
							
						
						11dbacab60 
					 
					
						
						
							
							Exclude desktop file handling for windows platform.  
						
						 
						
						
						
						
					 
					
						2013-01-14 12:13:50 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sebastian Meßmer 
							
						 
					 
					
						
						
							
						
						4caca2ce1a 
					 
					
						
						
							
							The configuration directory is a static attribute in mirallconfigfile class  
						
						 
						
						
						
						
					 
					
						2013-01-14 00:48:26 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Molkentin 
							
						 
					 
					
						
						
							
						
						280dd205d9 
					 
					
						
						
							
							setup wizard: Improve wording and context  
						
						 
						
						
						
						
					 
					
						2013-01-11 17:10:31 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Molkentin 
							
						 
					 
					
						
						
							
						
						5c495265f4 
					 
					
						
						
							
							Consolidate theming support.  
						
						 
						
						... 
						
						
						
						This implements out-of-repository-theming, and removes the old
custom.ini theming that never worked on all platforms and had
no straight deployment story.
The new approach requires the CMAKE variable OEM_THEME_DIR to
point to a directory that must at least contain an OEM.cmake file
(check OWNCLOUD.cmake for possible options) as well as a themes.qrc
and a themes/ directory that directly correspond to the ones in
the source tree. 
						
						
					 
					
						2013-01-10 17:16:59 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Molkentin 
							
						 
					 
					
						
						
							
						
						9cdf2d8150 
					 
					
						
						
							
							Remove potentially dangerous processEvent calls  
						
						 
						
						
						
						
					 
					
						2013-01-10 17:16:58 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sebastian Meßmer 
							
						 
					 
					
						
						
							
						
						e0645b4b63 
					 
					
						
						
							
							Allow setting the configuration directory on command line  
						
						 
						
						
						
						
					 
					
						2013-01-02 19:08:14 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Molkentin 
							
						 
					 
					
						
						
							
						
						4ce55a44ba 
					 
					
						
						
							
							Klaas > Danimo, I am rather unpolite...  
						
						 
						
						... 
						
						
						
						Also, fix whitespace errors 
						
						
					 
					
						2012-12-21 01:16:54 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Klaas Freitag 
							
						 
					 
					
						
						
							
						
						f4019f5a5a 
					 
					
						
						
							
							Show backend error messages to user.  
						
						 
						
						
						
						
					 
					
						2012-12-20 20:51:43 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Molkentin 
							
						 
					 
					
						
						
							
						
						e6b9c16d04 
					 
					
						
						
							
							Update About dialog  
						
						 
						
						
						
						
					 
					
						2012-12-20 20:35:21 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Molkentin 
							
						 
					 
					
						
						
							
						
						488943aaa0 
					 
					
						
						
							
							Correct inheritance in status dialog  
						
						 
						
						
						
						
					 
					
						2012-12-20 17:36:10 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Klaas Freitag 
							
						 
					 
					
						
						
							
						
						c3f6153f94 
					 
					
						
						
							
							Fixed QString -> const char* conversions to handle UTF8 correctly.  
						
						 
						
						
						
						
					 
					
						2012-12-20 16:49:29 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Klaas Freitag 
							
						 
					 
					
						
						
							
						
						87aa3d7c60 
					 
					
						
						
							
							More detailed error handling.  
						
						 
						
						
						
						
					 
					
						2012-12-20 16:49:29 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Klaas Freitag 
							
						 
					 
					
						
						
							
						
						144a2832b9 
					 
					
						
						
							
							Loop over all certificates to match the approved one.  
						
						 
						
						
						
						
					 
					
						2012-12-20 16:49:29 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Molkentin 
							
						 
					 
					
						
						
							
						
						26c01cefa7 
					 
					
						
						
							
							New icons for ownCloud client  
						
						 
						
						... 
						
						
						
						--monoicons shows platform-specific monochrome icons
for now until we have a proper settings dialog. 
						
						
					 
					
						2012-12-20 16:41:54 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Klaas Freitag 
							
						 
					 
					
						
						
							
						
						30494eee75 
					 
					
						
						
							
							Added utility class with format fingerprint method.  
						
						 
						
						... 
						
						
						
						Removed other obsolete formatting method. 
						
						
					 
					
						2012-12-13 21:36:44 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Klaas Freitag 
							
						 
					 
					
						
						
							
						
						eb0782ec90 
					 
					
						
						
							
							Check certificate fingerprints reported back from neon.  
						
						 
						
						
						
						
					 
					
						2012-12-13 19:52:22 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Klaas Freitag 
							
						 
					 
					
						
						
							
						
						c6edde1365 
					 
					
						
						
							
							Fix merging.  
						
						 
						
						
						
						
					 
					
						2012-12-13 19:52:07 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Molkentin 
							
						 
					 
					
						
						
							
						
						6e3b5e075a 
					 
					
						
						
							
							Fix crash  
						
						 
						
						
						
						
					 
					
						2012-12-12 20:06:59 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Molkentin 
							
						 
					 
					
						
						
							
						
						8b8d78f456 
					 
					
						
						
							
							Improved version of popup-notify  
						
						 
						
						
						
						
					 
					
						2012-12-12 19:30:37 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Molkentin 
							
						 
					 
					
						
						
							
						
						3cb2e74d12 
					 
					
						
						
							
							Notify user about new files.  
						
						 
						
						... 
						
						
						
						Let's see if its too annoying,
we can still add a timer later 
						
						
					 
					
						2012-12-12 15:00:38 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Molkentin 
							
						 
					 
					
						
						
							
						
						41082c5e81 
					 
					
						
						
							
							Fix proxy error  
						
						 
						
						... 
						
						
						
						This was caused by an incorrect translation to a string type. 
						
						
					 
					
						2012-12-12 15:00:38 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Klaas Freitag 
							
						 
					 
					
						
						
							
						
						5da634ed70 
					 
					
						
						
							
							Transparent fallback to the former password storage if keychain is not  
						
						 
						
						... 
						
						
						
						there. 
						
						
					 
					
						2012-12-11 15:08:20 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Klaas Freitag 
							
						 
					 
					
						
						
							
						
						edfefabcf8 
					 
					
						
						
							
							Use two step process to store credentials through config file.  
						
						 
						
						
						
						
					 
					
						2012-12-08 22:56:48 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Klaas Freitag 
							
						 
					 
					
						
						
							
						
						9c627782d4 
					 
					
						
						
							
							Use a two step process to store credentials for setup dialog.  
						
						 
						
						
						
						
					 
					
						2012-12-08 22:55:46 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Molkentin 
							
						 
					 
					
						
						
							
						
						ba9f46ef49 
					 
					
						
						
							
							Make Windows-version of Add to Favorites work  
						
						 
						
						... 
						
						
						
						I committed a WiP before... 
						
						
					 
					
						2012-12-07 20:20:40 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Molkentin 
							
						 
					 
					
						
						
							
						
						5502087017 
					 
					
						
						
							
							Fix windows build  
						
						 
						
						
						
						
					 
					
						2012-12-07 19:53:36 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Molkentin 
							
						 
					 
					
						
						
							
						
						5510135084 
					 
					
						
						
							
							Fix formatting hashes  
						
						 
						
						
						
						
					 
					
						2012-12-07 19:51:11 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Molkentin 
							
						 
					 
					
						
						
							
						
						ddecca47fd 
					 
					
						
						
							
							osx/win: add sync folders to favorite folders  
						
						 
						
						
						
						
					 
					
						2012-12-07 19:51:11 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Klaas Freitag 
							
						 
					 
					
						
						
							
						
						1eabdee253 
					 
					
						
						
							
							Enable logging through new csync logging api  
						
						 
						
						
						
						
					 
					
						2012-12-07 09:03:24 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Klaas Freitag 
							
						 
					 
					
						
						
							
						
						029535bcea 
					 
					
						
						
							
							Removed another scary thing: qstrdup for proxy type.  
						
						 
						
						
						
						
					 
					
						2012-12-06 19:05:25 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Molkentin 
							
						 
					 
					
						
						
							
						
						4ef89abac7 
					 
					
						
						
							
							Compile on Mac  
						
						 
						
						
						
						
					 
					
						2012-12-06 18:48:36 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Klaas Freitag 
							
						 
					 
					
						
						
							
						
						8af257a4cd 
					 
					
						
						
							
							Start fs watching with a delay of 2 seconds to don't catch the journal changes.  
						
						 
						
						
						
						
					 
					
						2012-12-06 18:38:45 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Klaas Freitag 
							
						 
					 
					
						
						
							
						
						a124dcd4e8 
					 
					
						
						
							
							More cleanups that were possible by the new notify api.  
						
						 
						
						
						
						
					 
					
						2012-12-06 18:38:06 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Klaas Freitag 
							
						 
					 
					
						
						
							
						
						fbae2d7330 
					 
					
						
						
							
							Further cleanups that were possible by new change notification.  
						
						 
						
						
						
						
					 
					
						2012-12-06 18:35:02 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Klaas Freitag 
							
						 
					 
					
						
						
							
						
						f296fad4bb 
					 
					
						
						
							
							Set csync context as module parameter  
						
						 
						
						
						
						
					 
					
						2012-12-06 17:57:00 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Molkentin 
							
						 
					 
					
						
						
							
						
						e2d8105f0d 
					 
					
						
						
							
							Remove debug  
						
						 
						
						
						
						
					 
					
						2012-12-06 17:54:44 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Molkentin 
							
						 
					 
					
						
						
							
						
						287c073f00 
					 
					
						
						
							
							Remove code for local sync runs  
						
						 
						
						... 
						
						
						
						Rely entirely on folderwatcher. Local
sync runs can be implemented in terms
of a dummy folderwatcher if we want
to support systems without fs monitoring
again.. 
						
						
					 
					
						2012-12-06 17:53:04 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Molkentin 
							
						 
					 
					
						
						
							
						
						138a060df2 
					 
					
						
						
							
							Fix Windows folder watcher  
						
						 
						
						
						
						
					 
					
						2012-12-06 17:53:04 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Molkentin 
							
						 
					 
					
						
						
							
						
						6678beadab 
					 
					
						
						
							
							Hack: Sleep 2 secs after sync run  
						
						 
						
						... 
						
						
						
						This avoids that we get notified by the system
about writing of the csync db (IO has latency). 
						
						
					 
					
						2012-12-06 17:53:04 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Molkentin 
							
						 
					 
					
						
						
							
						
						cab503bb2b 
					 
					
						
						
							
							CredentialStore: Fix off-by-one  
						
						 
						
						
						
						
					 
					
						2012-12-06 17:53:04 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Molkentin 
							
						 
					 
					
						
						
							
						
						f20db6bbc1 
					 
					
						
						
							
							Implement folder watching for OS X using FSEvents  
						
						 
						
						
						
						
					 
					
						2012-12-06 17:53:04 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Molkentin 
							
						 
					 
					
						
						
							
						
						d50d4d1a6f 
					 
					
						
						
							
							Add windows backend, require Inotify on Linux  
						
						 
						
						... 
						
						
						
						Dummy-backend yanked for now, no support for other Unixes... 
						
						
					 
					
						2012-12-06 17:53:04 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Molkentin 
							
						 
					 
					
						
						
							
						
						b65fd11a36 
					 
					
						
						
							
							Remove superfluous include  
						
						 
						
						
						
						
					 
					
						2012-12-05 16:46:27 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Molkentin 
							
						 
					 
					
						
						
							
						
						36c9a29a7b 
					 
					
						
						
							
							Move Logger into its own file, move it to libsync.  
						
						 
						
						... 
						
						
						
						This fixes a linker error. 
						
						
					 
					
						2012-12-05 16:45:28 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Klaas Freitag 
							
						 
					 
					
						
						
							
						
						6ba098d26d 
					 
					
						
						
							
							Make use of the new csync_set_module_properties and remove stuff from  
						
						 
						
						... 
						
						
						
						before. 
						
						
					 
					
						2012-12-05 12:30:28 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Molkentin 
							
						 
					 
					
						
						
							
						
						214261e764 
					 
					
						
						
							
							pimpl folderwatcher  
						
						 
						
						
						
						
					 
					
						2012-12-04 18:24:25 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Klaas Freitag 
							
						 
					 
					
						
						
							
						
						b74cfcfec5 
					 
					
						
						
							
							Add missing ifdef QTKEYCHAIN.  
						
						 
						
						
						
						
					 
					
						2012-12-04 18:11:24 +01:00