Klaas Freitag
							
						 
					 | 
					
						
						
							
						
						90f722e2da
					 | 
					
						
						
							
							- fix alias bug in folderwizard
						
						
						
						
						
						
						
						- call restart before showing folderwizard
- ask for admin credentials for ftp install 
						
						
					 | 
					
						2011-10-14 18:13:34 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Klaas Freitag
							
						 
					 | 
					
						
						
							
						
						95eadf2cb9
					 | 
					
						
						
							
							some more smaller fixes
						
						
						
						
						
						
					 | 
					
						2011-10-14 16:39:53 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Klaas Freitag
							
						 
					 | 
					
						
						
							
						
						4911a528c4
					 | 
					
						
						
							
							Error publishing in the status dialog
						
						
						
						
						
						
					 | 
					
						2011-10-13 16:41:24 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Klaas Freitag
							
						 
					 | 
					
						
						
							
						
						a2c564306f
					 | 
					
						
						
							
							Enable secure connection via sitecopy
						
						
						
						
						
						
					 | 
					
						2011-10-13 13:58:46 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Klaas Freitag
							
						 
					 | 
					
						
						
							
						
						cb359ba89d
					 | 
					
						
						
							
							removal of folders added
						
						
						
						
						
						
					 | 
					
						2011-10-13 13:55:52 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Klaas Freitag
							
						 
					 | 
					
						
						
							
						
						ced69489a5
					 | 
					
						
						
							
							WIP status dialog
						
						
						
						
						
						
					 | 
					
						2011-10-12 16:58:54 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Klaas Freitag
							
						 
					 | 
					
						
						
							
						
						c4b24ab952
					 | 
					
						
						
							
							Show warning on wrong remote folder
						
						
						
						
						
						
					 | 
					
						2011-10-12 15:14:39 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Klaas Freitag
							
						 
					 | 
					
						
						
							
						
						91b12c7eb3
					 | 
					
						
						
							
							Show a warning text in folder wizard
						
						
						
						
						
						
					 | 
					
						2011-10-11 15:39:25 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Klaas Freitag
							
						 
					 | 
					
						
						
							
						
						91bf272c9b
					 | 
					
						
						
							
							Don't allow to pick local directories or aliases twice.
						
						
						
						
						
						
					 | 
					
						2011-10-11 14:23:32 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Klaas Freitag
							
						 
					 | 
					
						
						
							
						
						ecc3a9edd5
					 | 
					
						
						
							
							remote folder check for oC finished
						
						
						
						
						
						
					 | 
					
						2011-10-07 16:01:58 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Klaas Freitag
							
						 
					 | 
					
						
						
							
						
						f4c5b9adbb
					 | 
					
						
						
							
							added check for the owncloud folder - WIP
						
						
						
						
						
						
					 | 
					
						2011-10-06 16:55:28 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Klaas Freitag
							
						 
					 | 
					
						
						
							
						
						f3123b6c02
					 | 
					
						
						
							
							- simplified the folder wizard
						
						
						
						
						
						
						
						- live check of the ownCloud connect 
						
						
					 | 
					
						2011-10-06 10:54:54 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Klaas Freitag
							
						 
					 | 
					
						
						
							
						
						60c304667f
					 | 
					
						
						
							
							added online check
						
						
						
						
						
						
					 | 
					
						2011-10-05 17:49:03 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Klaas Freitag
							
						 
					 | 
					
						
						
							
						
						2dec870eaa
					 | 
					
						
						
							
							Use nice empty icon
						
						
						
						
						
						
					 | 
					
						2011-10-05 15:56:56 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Klaas Freitag
							
						 
					 | 
					
						
						
							
						
						f582c19c67
					 | 
					
						
						
							
							- fixed some Ownclouds -> ownCloud
						
						
						
						
						
						
						
						- start wizard if mirall config missing 
						
						
					 | 
					
						2011-10-05 15:48:30 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Klaas Freitag
							
						 
					 | 
					
						
						
							
						
						e0f8499484
					 | 
					
						
						
							
							Setup of local folder with initial sync
						
						
						
						
						
						
					 | 
					
						2011-10-05 12:11:10 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Klaas Freitag
							
						 
					 | 
					
						
						
							
						
						5a42aa3028
					 | 
					
						
						
							
							Added some gpl headers to sourcefiles
						
						
						
						
						
						
					 | 
					
						2011-09-30 17:42:28 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Klaas Freitag
							
						 
					 | 
					
						
						
							
						
						c9de9810e2
					 | 
					
						
						
							
							Fix url parameter, add http
						
						
						
						
						
						
					 | 
					
						2011-09-30 15:35:19 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Klaas Freitag
							
						 
					 | 
					
						
						
							
						
						35aee0de00
					 | 
					
						
						
							
							Create the local sync folder successfully
						
						
						
						
						
						
					 | 
					
						2011-09-30 14:19:26 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Klaas Freitag
							
						 
					 | 
					
						
						
							
						
						7452f1956e
					 | 
					
						
						
							
							Added owncloud credentials page
						
						
						
						
						
						
					 | 
					
						2011-09-30 12:51:56 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Klaas Freitag
							
						 
					 | 
					
						
						
							
						
						3f860709bc
					 | 
					
						
						
							
							fix slash mixmax in url assembling for remote key in sitecopyrc
						
						
						
						
						
						
					 | 
					
						2011-09-30 12:04:17 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								İsmail Dönmez
							
						 
					 | 
					
						
						
							
						
						682325f977
					 | 
					
						
						
							
							Reparse configuration files when folders added/removed
						
						
						
						
						
						
					 | 
					
						2011-09-30 11:49:19 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								İsmail Dönmez
							
						 
					 | 
					
						
						
							
						
						37c6276197
					 | 
					
						
						
							
							Merge branch 'master' of git://github.com/dragotin/mirall
						
						
						
						
						
						
					 | 
					
						2011-09-30 11:46:56 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Klaas Freitag
							
						 
					 | 
					
						
						
							
						
						96eaeb2c62
					 | 
					
						
						
							
							read oc url from config file.
						
						
						
						
						
						
					 | 
					
						2011-09-30 10:24:01 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Klaas Freitag
							
						 
					 | 
					
						
						
							
						
						9043e69d27
					 | 
					
						
						
							
							- write mirall config file
						
						
						
						
						
						
						
						- check on valid parameters in owncloud wizard. 
						
						
					 | 
					
						2011-09-29 19:05:49 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Klaas Freitag
							
						 
					 | 
					
						
						
							
						
						b7c7b8a566
					 | 
					
						
						
							
							- handle empty password in .sitecopyrc.
						
						
						
						
						
						
						
						- check for the owncloud admin script and warn if its not there. 
						
						
					 | 
					
						2011-09-29 17:17:50 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Klaas Freitag
							
						 
					 | 
					
						
						
							
						
						e8dcfe4a3c
					 | 
					
						
						
							
							Installation of local computer and ftp based works.
						
						
						
						
						
						
					 | 
					
						2011-09-29 16:36:27 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Klaas Freitag
							
						 
					 | 
					
						
						
							
						
						68b966256e
					 | 
					
						
						
							
							WIP: OC installation wizard integration
						
						
						
						
						
						
					 | 
					
						2011-09-28 18:14:48 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								İsmail Dönmez
							
						 
					 | 
					
						
						
							
						
						20bed61446
					 | 
					
						
						
							
							Fix typo
						
						
						
						
						
						
					 | 
					
						2011-09-28 12:14:14 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Klaas Freitag
							
						 
					 | 
					
						
						
							
						
						292965c6a3
					 | 
					
						
						
							
							Wizard for owncloud configuration
						
						
						
						
						
						
					 | 
					
						2011-09-27 19:10:01 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Klaas Freitag
							
						 
					 | 
					
						
						
							
						
						ace9e9d690
					 | 
					
						
						
							
							Error counting added
						
						
						
						
						
						
					 | 
					
						2011-09-27 08:15:30 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Klaas Freitag
							
						 
					 | 
					
						
						
							
						
						defda477c4
					 | 
					
						
						
							
							status dialog work
						
						
						
						
						
						
					 | 
					
						2011-09-26 21:46:26 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Klaas Freitag
							
						 
					 | 
					
						
						
							
						
						b3eecf54a5
					 | 
					
						
						
							
							improved error handling
						
						
						
						
						
						
					 | 
					
						2011-09-26 18:19:01 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Klaas Freitag
							
						 
					 | 
					
						
						
							
						
						0000caa632
					 | 
					
						
						
							
							- various code cleanups
						
						
						
						
						
						
						
						- fix alias usage in sitecopy config file 
						
						
					 | 
					
						2011-09-26 16:20:53 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Klaas Freitag
							
						 
					 | 
					
						
						
							
						
						627a2691ad
					 | 
					
						
						
							
							Statusdialog added
						
						
						
						
						
						
					 | 
					
						2011-09-26 15:00:12 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Klaas Freitag
							
						 
					 | 
					
						
						
							
						
						83613f4576
					 | 
					
						
						
							
							Add a sitecopy backend to mirall, some GUI cleanups
						
						
						
						
						
						
					 | 
					
						2011-09-26 13:12:00 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Duncan Mac-Vicar P
							
						 
					 | 
					
						
						
							
						
						87ac6cae2b
					 | 
					
						
						
							
							add support for the conflict copy feature available on csync git
						
						
						
						
						
						
					 | 
					
						2011-09-13 14:18:47 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Duncan Mac-Vicar P
							
						 
					 | 
					
						
						
							
						
						9569ff1dc6
					 | 
					
						
						
							
							link Qt to the static library
						
						
						
						
						
						
					 | 
					
						2011-04-08 12:03:09 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Duncan Mac-Vicar P
							
						 
					 | 
					
						
						
							
						
						67b6e77979
					 | 
					
						
						
							
							handle errors to the UI
						
						
						
						
						
						
					 | 
					
						2011-04-08 11:36:53 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Duncan Mac-Vicar P
							
						 
					 | 
					
						
						
							
						
						b0efc506cd
					 | 
					
						
						
							
							increase poll timer to 1 minute
						
						
						
						
						
						
					 | 
					
						2011-04-08 10:51:18 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Duncan Mac-Vicar P
							
						 
					 | 
					
						
						
							
						
						d1ee08d442
					 | 
					
						
						
							
							add a mutex for the csync threads
						
						
						
						
						
						
					 | 
					
						2011-04-08 10:49:28 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Duncan Mac-Vicar P
							
						 
					 | 
					
						
						
							
						
						0ba4fac32f
					 | 
					
						
						
							
							for csync, accept smb:// urls as well
						
						
						
						
						
						
					 | 
					
						2011-04-08 10:49:26 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Duncan Mac-Vicar P
							
						 
					 | 
					
						
						
							
						
						58270990ed
					 | 
					
						
						
							
							force the initial sync even if the list is empty as this point
						
						
						
						
						
						
					 | 
					
						2011-04-08 10:48:22 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Duncan Mac-Vicar P
							
						 
					 | 
					
						
						
							
						
						0aa5f51bb5
					 | 
					
						
						
							
							Use csync as default
						
						
						
						
						
						
					 | 
					
						2011-04-08 09:58:16 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Duncan Mac-Vicar P
							
						 
					 | 
					
						
						
							
						
						3ce5932bbd
					 | 
					
						
						
							
							g
						
						
						
						
						
						
						
						Basic implementation of a CSyncFolder
Still waiting for Jann's patches for conflictcopy to hit a stable
release to make it the default. 
						
						
					 | 
					
						2011-04-07 19:04:07 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Duncan Mac-Vicar P
							
						 
					 | 
					
						
						
							
						
						83eeeb4216
					 | 
					
						
						
							
							Simplify how the event queue works. Now it is just a timer
						
						
						
						
						
						
						
						that gets restarted on every new event, and the processing starts
when no events reset the timer for the event interval. 
						
						
					 | 
					
						2011-04-06 22:35:08 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Duncan Mac-Vicar P
							
						 
					 | 
					
						
						
							
						
						a4c5996f47
					 | 
					
						
						
							
							Make the folders network state aware
						
						
						
						
						
						
					 | 
					
						2011-04-06 15:57:18 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Duncan Mac-Vicar P
							
						 
					 | 
					
						
						
							
						
						65c41b6368
					 | 
					
						
						
							
							add simple network location infrastructure
						
						
						
						
						
						
					 | 
					
						2011-04-06 15:22:40 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Duncan Mac-Vicar P
							
						 
					 | 
					
						
						
							
						
						f882fe46e2
					 | 
					
						
						
							
							Use icons from theme. Qt already handles this in a nice way
						
						
						
						
						
						
					 | 
					
						2011-04-06 12:09:56 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Duncan Mac-Vicar P
							
						 
					 | 
					
						
						
							
						
						2411b0c9b7
					 | 
					
						
						
							
							add proper licensing
						
						
						
						
						
						
					 | 
					
						2011-04-06 11:48:02 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 |