1433 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
deajan	0b665be787	Updated changelog	2017-08-15 01:27:12 +02:00
deajan	972b8481f1	Rebuilt targets	2017-08-14 22:22:28 +02:00
deajan	86930737b0	Added -f to local replica unlock	2017-08-14 22:21:41 +02:00
deajan	86ff4dc5e9	Rebuilt targets	2017-07-27 23:20:24 +02:00
deajan	f26b1118a1	Add install.sh help	2017-07-27 23:18:05 +02:00
deajan	168fc7b2f5	Updated usage	2017-07-27 23:16:51 +02:00
deajan	7cbbdb960a	Installer adds --prefix option + fixes	2017-07-27 23:15:35 +02:00
deajan	09c664fe4b	Moved commandline args setup to sub function	2017-07-27 22:50:48 +02:00
deajan	a80b65860a	Quick preflight check for bootstrap	2017-06-20 15:20:42 +02:00
deajan	1375ab425b	Initial upload of target helper service	2017-06-19 16:08:17 +02:00
deajan	29dc7a3e9e	Merge now requires program name	2017-06-19 16:01:47 +02:00
deajan	2038a2ecb9	Made bootstrap and merge program agnostic	2017-06-19 16:01:16 +02:00
deajan	e07cb136c4	Permit merge of other executables	2017-06-18 22:53:57 +02:00
deajan	5bcc7c75ea	Permit bootstrap of other executables	2017-06-18 22:48:38 +02:00
deajan	8d9a6be16a	Typo fixing	2017-06-18 22:11:09 +02:00
deajan	06becc5181	Updated ofunctions	2017-06-09 11:49:13 +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
Orsiris de Jong	c9772b0fc3	Merge pull request #106 from deajan/fix-sed ... Changed sed -E to sed -r for compat issues	2017-06-08 16:32:31 +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	9220cecebc	Rebuilt targets	2017-06-08 14:43:17 +02:00
deajan	a7f9a28c93	Merge branch 'master' of https://github.com/deajan/osync	2017-06-08 14:42:12 +02:00
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	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	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