Sovran_Systems/Sovran_SystemsOS
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 13 Wiki Activity

Overall Update and Streamlined #11

Closed
naturallaw777 wants to merge 1034 commits from staging-dev into stable
pull from: staging-dev
merge into: Sovran_Systems:stable
Conversation 1 Commits 1034 Files Changed 119
+4 -7
1 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 6f98c478e8 - Show all commits
app/sovran_systemsos_web/static/js/features.js
+4 -7
View File
@@ -413,14 +413,11 @@ function handleFeatureToggle(feat, newEnabled) {
});
}
if (conflictNames.length > 0) {
var confirmMsg;
if (feat.id === "bitcoin-core") {
confirmMsg = "Only one Bitcoin node implementation can be active. Enabling Bitcoin Core will replace Bitcoin Knots + BIP110. Your timechain data will be preserved — you will not need to re-download the timechain. Continue?";
} else {
confirmMsg = "This will disable " + conflictNames.join(", ") + ". Continue?";
}
if (feat.id === "bitcoin-core") {
var confirmMsg = "Only one Bitcoin node implementation can be active. Enabling Bitcoin Core will replace Bitcoin Knots + BIP110 as the active node. Your timechain data will be preserved — you will not need to re-download the timechain. Continue?";
openFeatureConfirm(confirmMsg, proceedAfterConflictCheck);
} else if (conflictNames.length > 0) {
openFeatureConfirm("This will disable " + conflictNames.join(", ") + ". Continue?", proceedAfterConflictCheck);
} else {
proceedAfterConflictCheck();
}