322 Commits

Author	SHA1	Message	Date
deajan	4d322f7e6b	WIP: initialization should take create conflict list possibility	2018-07-01 10:54:17 +02:00
deajan	9b4914c49e	cmdline arg improvements	2018-07-01 10:46:16 +02:00
deajan	3d6eaef447	Bumped version to 1.3-dev	2018-06-30 19:40:24 +02:00
deajan	bf54ce8693	Finished WIP on --summary for deletions	2018-06-25 23:59:06 +02:00
deajan	7621f3ec25	Implemented --initialize	2018-06-25 23:55:13 +02:00
deajan	0ccc737631	Conflict log line only appears if used	2018-06-25 11:16:57 +02:00
deajan	1ed49b7d41	Quick note about file updates	2018-06-24 19:10:23 +02:00
deajan	6d37e161c8	Merge branch 'master' of https://github.com/deajan/osync	2018-03-22 17:24:36 +01:00
deajan	1b33068422	Fixed #135	2018-03-22 17:23:14 +01:00
Hugo Rivera	3c1c606de4	Set MAX_EXEC_TIME_PER_CMD_* variables without config file	2018-03-20 03:58:21 -06:00
Hugo Rivera	4725370d8e	Set MIN_WAIT without config file	2018-03-20 03:58:10 -06:00
deajan	46a990c4d8	Fixed inotifywait cannot load loop	2018-02-20 22:53:30 +01:00
deajan	d8b30d7711	Added sed regex compat for MacOS	2018-02-20 22:39:42 +01:00
deajan	034c1693e9	Updated ExecTasks version	2018-02-20 22:15:04 +01:00
deajan	9b8fe3774e	Fixed time counting for new ExecTasks	2018-01-02 20:05:54 +01:00
deajan	73d592ad34	Merged WaitForTaskCompletion and ParallelExec into ExecTasks	2018-01-02 20:02:57 +01:00
deajan	0a1dc91fad	Fixed bogus global WAIT_FOR variable	2017-11-23 16:58:29 +01:00
deajan	6d217c1e15	Reintroduced fix from #120	2017-11-22 15:05:09 +01:00
deajan	71a0437de6	Ensured writeLocks=false at beginning of lock handling	2017-11-22 15:02:17 +01:00
deajan	86930737b0	Added -f to local replica unlock	2017-08-14 22:21:41 +02:00
deajan	09c664fe4b	Moved commandline args setup to sub function	2017-07-27 22:50:48 +02:00
deajan	8d9a6be16a	Typo fixing	2017-06-18 22:11:09 +02:00
deajan	1dc9408044	Fix double compression extension	2017-06-09 09:56:11 +02:00
deajan	9676ccccad	Removed work comments	2017-06-09 08:34:48 +02:00
deajan	45e4419a0f	Fixed typo	2017-06-09 08:33:57 +02:00
deajan	9b9631fe2c	Changed sed -E to sed -r for compat issues	2017-06-08 16:30:20 +02:00
deajan	5c36e803d8	Revert "More sort enforcing" ... This reverts commit fbb36b51b7.	2017-06-08 15:39:57 +02:00
deajan	fbb36b51b7	More sort enforcing	2017-06-08 15:20:36 +02:00
deajan	4678ab7e71	Fixed missing env for LC_ALL	2017-06-08 09:25:33 +02:00
deajan	261521d047	Added LC_ALL to all ssh calls	2017-06-07 12:48:52 +02:00
deajan	30c6b3ec46	timestampList is not used for ACL lists yet	2017-06-07 12:17:39 +02:00
deajan	543cfc1159	Fixing sort order in conflictList	2017-06-06 17:39:53 +02:00
deajan	679e140084	Fix new regex in treelist for rsync output	2017-06-06 16:47:32 +02:00
deajan	d0d7be40c3	Added --dry support for conflict list	2017-06-05 18:59:05 +02:00
deajan	7a24cf49cd	Implemented --alert-conflicts options	2017-06-05 18:53:15 +02:00
deajan	be3b3d39b6	Added error handling to conflict list functions	2017-06-05 15:32:38 +02:00
deajan	7260d43416	Improved conflict list work	2017-06-04 19:07:22 +02:00
deajan	1d7cb5be53	Multiple file list fixes	2017-06-04 13:01:34 +02:00
deajan	2b786abc6a	Some comment removal	2017-06-03 13:57:10 +02:00
deajan	967ce33977	WIP: conflict list	2017-06-03 13:51:49 +02:00
deajan	37ca73a6f9	moved unfortunate comment placement	2017-06-03 01:28:34 +02:00
deajan	9e1c3c2a65	WIP: conflict list	2017-06-03 01:20:38 +02:00
deajan	862a6fd235	Fixed some more typo	2017-06-02 15:42:45 +02:00
deajan	83fd33bf78	WIP: conflict list	2017-06-01 17:45:02 +02:00
deajan	99b606fef8	WIP: conflict list	2017-05-31 18:02:18 +02:00
deajan	b0307fd555	Another typo fix	2017-05-31 12:36:39 +02:00
deajan	eb73d49c69	Typo fixing	2017-05-31 12:31:18 +02:00
deajan	d91230e22f	WIP: conflict list	2017-05-31 11:16:36 +02:00
deajan	825e051e3b	WIP: conflict list	2017-05-30 15:45:43 +02:00
deajan	a7ceea1dac	WIP: conflict list	2017-05-30 15:00:05 +02:00