Merge pull request #2381 from AudriusButkevicius/maxcon

Allow limiting max conflicts (fixes #2282)
2015-10-17 09:10:31 +09:00
parent 4ddb066728 752533489a
commit 910a7c619a
6 changed files with 66 additions and 33 deletions
--- a/gui/syncthing/core/syncthingController.js
+++ b/gui/syncthing/core/syncthingController.js
@@ -1135,6 +1135,7 @@ angular.module('syncthing.core')
            };
            $scope.currentFolder.rescanIntervalS = 60;
            $scope.currentFolder.minDiskFreePct = 1;
+            $scope.currentFolder.maxConflicts = -1;
            $scope.currentFolder.order = "random";
            $scope.currentFolder.fileVersioningSelector = "none";
            $scope.currentFolder.trashcanClean = 0;
@@ -1156,6 +1157,7 @@ angular.module('syncthing.core')
                selectedDevices: {},
                rescanIntervalS: 60,
                minDiskFreePct: 1,
+                maxConflicts: -1,
                order: "random",
                fileVersioningSelector: "none",
                trashcanClean: 0,