diff --git a/VERSION.md b/VERSION.md index 90a27f9..af0b7dd 100644 --- a/VERSION.md +++ b/VERSION.md @@ -1 +1 @@ -1.0.5 +1.0.6 diff --git a/modules/webconfig.py b/modules/webconfig.py index bed15e1..6b63d70 100644 --- a/modules/webconfig.py +++ b/modules/webconfig.py @@ -19,7 +19,7 @@ def getVersion(): return version def performUpgrade(): - git.cmd.Git('.').pull("https://github.com/wez3/domoboard.git") + git.cmd.Git('.').pull() return "Upgrade completed." def getCurrentBranch(): diff --git a/static/js/domoboard.js b/static/js/domoboard.js index 7ff12c5..4605e17 100644 --- a/static/js/domoboard.js +++ b/static/js/domoboard.js @@ -439,7 +439,7 @@ function checkVersion(branch) { } else { dataFloat = data.split(",")[1]; } - if (Number(dataFloat) > Number(version)) { + if (dataFloat > version) { document.getElementById('curver').innerHTML = version; document.getElementById('newver').innerHTML = dataFloat; $( "#version_div" ).removeClass("hide_update"); @@ -460,7 +460,7 @@ function checkVersionSettings(branch) { } else { dataFloat = data.split(",")[1]; } - if (Number(dataFloat) > Number(version)) { + if (dataFloat > version) { $( "#updateView_available" ).removeClass("hide_update"); $( "#updateView_available" ).addClass("show_update"); document.getElementById('curver_settings').innerHTML = version;