Commit Graph

  • 2038a2ecb9 Made bootstrap and merge program agnostic deajan 2017-06-19 16:01:16 +0200
  • e07cb136c4 Permit merge of other executables deajan 2017-06-18 22:53:57 +0200
  • 5bcc7c75ea Permit bootstrap of other executables deajan 2017-06-18 22:48:38 +0200
  • 8d9a6be16a Typo fixing deajan 2017-06-18 22:11:09 +0200
  • 8a3478e363 Added FreeBSD 11 note v1.1-maint Orsiris de Jong 2017-06-09 23:03:01 +0200
  • 0e6b3b80b5 Added msys2 to supported OS list deajan 2017-06-09 14:54:52 +0200
  • 679180eaef Fixed CleanDebug on FreeBSD deajan 2017-06-09 14:48:34 +0200
  • 06becc5181 Updated ofunctions deajan 2017-06-09 11:49:13 +0200
  • 1dc9408044 Fix double compression extension deajan 2017-06-09 09:56:11 +0200
  • 9676ccccad Removed work comments deajan 2017-06-09 08:34:48 +0200
  • 45e4419a0f Fixed typo deajan 2017-06-09 08:33:57 +0200
  • 817072a6ca Changed sed -E to sed -r for compat issues deajan 2017-06-08 16:34:40 +0200
  • 9cc7edbf27 Changed sed -E to sed -r for compat issues deajan 2017-06-08 16:33:59 +0200
  • c9772b0fc3 Merge pull request #106 from deajan/fix-sed Orsiris de Jong 2017-06-08 16:32:31 +0200
  • 9b9631fe2c Changed sed -E to sed -r for compat issues deajan 2017-06-08 16:30:20 +0200
  • 5c36e803d8 Revert "More sort enforcing" deajan 2017-06-08 15:39:57 +0200
  • fbb36b51b7 More sort enforcing deajan 2017-06-08 15:20:36 +0200
  • c603c329ab Updated changelog deajan 2017-06-08 14:48:46 +0200
  • f4b15dc2fe Added LC_ALL=C to all ssh calls deajan 2017-06-08 14:48:22 +0200
  • 9220cecebc Rebuilt targets deajan 2017-06-08 14:43:17 +0200
  • a7f9a28c93 Merge branch 'master' of https://github.com/deajan/osync deajan 2017-06-08 14:42:12 +0200
  • 1f6fe47c2c Rebuilt targets deajan 2017-06-08 14:41:59 +0200
  • d926a26cf1 Updated changelog deajan 2017-06-08 14:41:44 +0200
  • 4678ab7e71 Fixed missing env for LC_ALL deajan 2017-06-08 09:25:33 +0200
  • 261521d047 Added LC_ALL to all ssh calls deajan 2017-06-07 12:48:52 +0200
  • 10ebfaae16 Added LC_ALL=C to all ssh calls deajan 2017-06-07 12:43:45 +0200
  • e096413eb0 Merge branch 'master' of https://github.com/deajan/osync deajan 2017-06-07 12:25:36 +0200
  • 30c6b3ec46 timestampList is not used for ACL lists yet deajan 2017-06-07 12:17:39 +0200
  • 79cc014944 Typo fixing, fixes #104 Orsiris de Jong 2017-06-06 18:47:55 +0200
  • 3667ccfb6f Typo fixing Fixes #104 Orsiris de Jong 2017-06-06 18:46:29 +0200
  • 543cfc1159 Fixing sort order in conflictList deajan 2017-06-06 17:39:53 +0200
  • aac8b6c97b Fixed new regex for rsync output deajan 2017-06-06 17:11:20 +0200
  • 47d27a1060 Fixed new regex for rsync output deajan 2017-06-06 17:10:32 +0200
  • 679e140084 Fix new regex in treelist for rsync output deajan 2017-06-06 16:47:32 +0200
  • e73e395ed8 Removed empty line deajan 2017-06-06 16:45:01 +0200
  • 7c44b7342b Added new conflict configurations deajan 2017-06-06 16:23:04 +0200
  • 3e9a380b6b Updated config to v1.2.2-dev deajan 2017-06-06 16:21:56 +0200
  • e82e1488ee Bumped to stable deajan 2017-06-06 16:05:26 +0200
  • f448a15733 Update changelog deajan 2017-06-06 16:04:49 +0200
  • cbea41be56 Fixed double entry deajan 2017-06-06 16:03:05 +0200
  • 85cd7bd75e Updated changelog deajan 2017-06-06 16:02:13 +0200
  • f7d168a7ab Updated changelog deajan 2017-06-06 16:01:25 +0200
  • 6d2eb4769b Testing escaped remote IFS deajan 2017-06-06 10:01:32 +0200
  • 4b25c60b87 Fixed escaped singlequotes deajan 2017-06-06 09:58:20 +0200
  • 8efec3947c Backported ACL fixes deajan 2017-06-06 09:51:20 +0200
  • 4c9eb6d654 Backported ACL fixes deajan 2017-06-06 09:46:32 +0200
  • 2f20edf823 Updated changelog deajan 2017-06-06 09:44:47 +0200
  • 84a108dd41 Rebuilt targets deajan 2017-06-05 18:59:44 +0200
  • d0d7be40c3 Added --dry support for conflict list deajan 2017-06-05 18:59:05 +0200
  • 7a24cf49cd Implemented --alert-conflicts options deajan 2017-06-05 18:53:15 +0200
  • be3b3d39b6 Added error handling to conflict list functions deajan 2017-06-05 15:32:09 +0200
  • 11408d2de0 Add more locale exports deajan 2017-06-05 15:03:01 +0200
  • 7260d43416 Improved conflict list work deajan 2017-06-04 19:07:10 +0200
  • 1d7cb5be53 Multiple file list fixes deajan 2017-06-04 13:01:34 +0200
  • b4f1bd37ea Rebuilt targets deajan 2017-06-03 13:58:33 +0200
  • 2b786abc6a Some comment removal deajan 2017-06-03 13:57:10 +0200
  • bd6b1a60e8 Rebuilt targets deajan 2017-06-03 13:52:12 +0200
  • 967ce33977 WIP: conflict list deajan 2017-06-03 13:51:49 +0200
  • 37ca73a6f9 moved unfortunate comment placement deajan 2017-06-03 01:28:34 +0200
  • 9e1c3c2a65 WIP: conflict list deajan 2017-06-03 01:20:38 +0200
  • 862a6fd235 Fixed some more typo deajan 2017-06-02 15:42:45 +0200
  • 83fd33bf78 WIP: conflict list deajan 2017-06-01 17:45:02 +0200
  • 60c6657ba8 Rebuilt targets deajan 2017-05-31 18:17:03 +0200
  • 063eca84e4 Backported fixes from v1.2x deajan 2017-05-31 18:16:13 +0200
  • 99b606fef8 WIP: conflict list deajan 2017-05-31 18:02:18 +0200
  • b0307fd555 Another typo fix deajan 2017-05-31 12:36:39 +0200
  • eb73d49c69 Typo fixing deajan 2017-05-31 12:31:18 +0200
  • d91230e22f WIP: conflict list deajan 2017-05-31 11:16:36 +0200
  • 584f886934 Fixed --no-resume generating warning deajan 2017-05-30 15:47:13 +0200
  • 825e051e3b WIP: conflict list deajan 2017-05-30 15:45:43 +0200
  • a7ceea1dac WIP: conflict list deajan 2017-05-30 15:00:05 +0200
  • 3ff8a123e1 Merge pull request #103 from deajan/no-resume Orsiris de Jong 2017-05-30 14:51:35 +0200
  • 6a4b3701d0 Merge branch 'master' into no-resume Orsiris de Jong 2017-05-30 14:50:21 +0200
  • f29b5a4310 Merge pull request #102 from deajan/no-resume Orsiris de Jong 2017-05-30 14:48:22 +0200
  • 45cb042fa0 Added --no-resume option deajan 2017-05-30 14:46:35 +0200
  • 5c60e7a9a2 WIP: conflict detection deajan 2017-05-30 14:36:04 +0200
  • a99a96e871 WIP: conflict detection deajan 2017-05-30 14:35:44 +0200
  • f98a9a0748 WIP: getting conflict list of files deajan 2017-05-30 12:16:59 +0200
  • b541a7c98e WIP: detect conflict files deajan 2017-05-30 11:14:11 +0200
  • d587e49e67 Merge pull request #101 from deajan/fix_options Orsiris de Jong 2017-05-30 10:18:57 +0200
  • a32314c720 Merge branch 'master' into fix_options Orsiris de Jong 2017-05-30 10:18:48 +0200
  • 63834b5714 Merge pull request #100 from deajan/fix_options Orsiris de Jong 2017-05-30 10:14:31 +0200
  • 520c20659f Added missing options to subprocess in daemon mode deajan 2017-05-30 10:12:28 +0200
  • f962f86f30 Updated changelog deajan 2017-05-30 10:09:19 +0200
  • 908c9af888 Added --log-conflicts option deajan 2017-05-30 09:29:16 +0200
  • 0b442e2bcf Updated work comments deajan 2017-05-30 09:19:47 +0200
  • a32b5f8321 Bumped version to next dev deajan 2017-05-30 09:15:48 +0200
  • 2c1e688d8e Bumped dev versions to rc deajan 2017-05-30 09:11:00 +0200
  • 8f946cb476 Updated changelog deajan 2017-05-30 09:10:26 +0200
  • 78dc39b86f Change 23242 to deajan 2017-05-30 09:09:25 +0200
  • f8df6b8eab Rebuilt targets deajan 2017-05-29 16:54:02 +0200
  • 2b163d385b KillChilds shoudln't allow a pid of 1 either deajan 2017-05-29 16:53:43 +0200
  • 3174981b9a Rebuilt targets deajan 2017-05-29 15:14:00 +0200
  • ab40ea64e2 Checking pid doesn't contain 0 deajan 2017-05-29 15:13:17 +0200
  • ee8b213894 Rebuilt targets deajan 2017-05-28 22:20:57 +0200
  • 11bd517982 Last fix for KillChilds pgrep issue on Mac deajan 2017-05-28 22:20:41 +0200
  • 1400390f57 Rebuilt targets deajan 2017-05-28 21:25:22 +0200
  • c2b24688ef Another fix in the wall deajan 2017-05-28 21:25:03 +0200
  • 300108641a Rebuilt targets deajan 2017-05-28 20:17:57 +0200
  • 011a316f94 Added pid test in KillChilds deajan 2017-05-28 20:17:38 +0200