2
0
mirror of https://github.com/deajan/osync synced 2024-11-03 15:40:14 +00:00
Commit Graph

305 Commits

Author SHA1 Message Date
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
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
a32314c720 Merge branch 'master' into fix_options 2017-05-30 10:18:48 +02:00
deajan
520c20659f Added missing options to subprocess in daemon mode 2017-05-30 10:12:28 +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
deajan
a32b5f8321 Bumped version to next dev 2017-05-30 09:15:48 +02:00
deajan
2c1e688d8e Bumped dev versions to rc 2017-05-30 09:11:00 +02:00
deajan
78dc39b86f Change 23242 to 2017-05-30 09:09:25 +02:00
deajan
5677335c24 Removed WIP dev sleep command in treeList 2017-05-22 11:19:03 +02:00
deajan
762fd236a0 Bumped version to dev again 2017-05-22 09:32:34 +02:00
deajan
19c15d2265 Bumped version to v1.2 final 2017-03-23 23:02:43 +01:00
deajan
1404b81d56 Added initiator dir check before running monitor mode 2017-03-21 22:56:03 +01:00