1157 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
deajan	1f6fe47c2c	Rebuilt targets	2017-06-08 14:41:59 +02:00
deajan	d926a26cf1	Updated changelog	2017-06-08 14:41:44 +02:00
deajan	261521d047	Added LC_ALL to all ssh calls	2017-06-07 12:48:52 +02:00
deajan	10ebfaae16	Added LC_ALL=C to all ssh calls	2017-06-07 12:43:56 +02:00
deajan	e096413eb0	Merge branch 'master' of https://github.com/deajan/osync	2017-06-07 12:25:36 +02:00
deajan	30c6b3ec46	timestampList is not used for ACL lists yet	2017-06-07 12:17:39 +02:00
Orsiris de Jong	3667ccfb6f	Typo fixing Fixes #104	2017-06-06 18:46:29 +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	e73e395ed8	Removed empty line	2017-06-06 16:45:01 +02:00
deajan	7c44b7342b	Added new conflict configurations	2017-06-06 16:23:04 +02:00
deajan	3e9a380b6b	Updated config to v1.2.2-dev	2017-06-06 16:21:56 +02:00
deajan	cbea41be56	Fixed double entry	2017-06-06 16:03:05 +02:00
deajan	85cd7bd75e	Updated changelog	2017-06-06 16:02:13 +02:00
deajan	2f20edf823	Updated changelog	2017-06-06 09:44:47 +02:00
deajan	84a108dd41	Rebuilt targets	2017-06-05 18:59:44 +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	11408d2de0	Add more locale exports	2017-06-05 15:03:01 +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	b4f1bd37ea	Rebuilt targets	2017-06-03 13:58:33 +02:00
deajan	2b786abc6a	Some comment removal	2017-06-03 13:57:10 +02:00
deajan	bd6b1a60e8	Rebuilt targets	2017-06-03 13:52:12 +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
Orsiris de Jong	3ff8a123e1	Merge pull request #103 from deajan/no-resume ... Added --no-resume option	2017-05-30 14:51:35 +02:00
Orsiris de Jong	6a4b3701d0	Merge branch 'master' into no-resume	2017-05-30 14:50:21 +02:00
deajan	45cb042fa0	Added --no-resume option	2017-05-30 14:46:35 +02:00
deajan	5c60e7a9a2	WIP: conflict detection	2017-05-30 14:36:04 +02:00
deajan	a99a96e871	WIP: conflict detection	2017-05-30 14:35:44 +02:00
deajan	f98a9a0748	WIP: getting conflict list of files	2017-05-30 12:16:59 +02:00
deajan	b541a7c98e	WIP: detect conflict files	2017-05-30 11:14:11 +02:00
Orsiris de Jong	d587e49e67	Merge pull request #101 from deajan/fix_options ... Fix missing daemon subprocess options	2017-05-30 10:18:57 +02:00
Orsiris de Jong	a32314c720	Merge branch 'master' into fix_options	2017-05-30 10:18:48 +02:00
Orsiris de Jong	63834b5714	Merge pull request #100 from deajan/fix_options ... Fix missing options to daemon subprocess	2017-05-30 10:14:31 +02:00
deajan	520c20659f	Added missing options to subprocess in daemon mode	2017-05-30 10:12:28 +02:00
deajan	f962f86f30	Updated changelog	2017-05-30 10:09:19 +02:00
deajan	908c9af888	Added --log-conflicts option	2017-05-30 09:29:16 +02:00
deajan	0b442e2bcf	Updated work comments	2017-05-30 09:19:47 +02:00