simon
/
domoboard
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'develop' of https://github.com/wez3/domoboard into develop

This commit is contained in:
squandor 2017-01-21 22:02:56 +01:00
parent c48ab36903 7a71e206f9
commit d0b81261d3
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION.md
View File

@ -1 +1 @@
1.0.5 1.0.6

2
modules/webconfig.py
View File

@ -19,7 +19,7 @@ def getVersion():
return version return version
def performUpgrade(): def performUpgrade():
git.cmd.Git('.').pull("https://github.com/wez3/domoboard.git") git.cmd.Git('.').pull()
return "Upgrade completed." return "Upgrade completed."
def getCurrentBranch(): def getCurrentBranch():

4
static/js/domoboard.js
View File

@ -439,7 +439,7 @@ function checkVersion(branch) {
} else { } else {
dataFloat = data.split(",")[1]; dataFloat = data.split(",")[1];
} }
if (Number(dataFloat) > Number(version)) { if (dataFloat > version) {
document.getElementById('curver').innerHTML = version; document.getElementById('curver').innerHTML = version;
document.getElementById('newver').innerHTML = dataFloat; document.getElementById('newver').innerHTML = dataFloat;
$( "#version_div" ).removeClass("hide_update"); $( "#version_div" ).removeClass("hide_update");
@ -460,7 +460,7 @@ function checkVersionSettings(branch) {
} else { } else {
dataFloat = data.split(",")[1]; dataFloat = data.split(",")[1];
} }
if (Number(dataFloat) > Number(version)) { if (dataFloat > version) {
$( "#updateView_available" ).removeClass("hide_update"); $( "#updateView_available" ).removeClass("hide_update");
$( "#updateView_available" ).addClass("show_update"); $( "#updateView_available" ).addClass("show_update");
document.getElementById('curver_settings').innerHTML = version; document.getElementById('curver_settings').innerHTML = version;