Merge branch 'release/0.6.2'

nightscout · Jan 28, 2015 · 8a635e7 · 8a635e7
2 parents 10ea182 + 0eef982
commit 8a635e7
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "nightscout",
-  "version": "0.6.1",
+  "version": "0.6.2",
   "dependencies": {
     "angularjs": "1.3.0-beta.19",
     "bootstrap": "~3.2.0",

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "Nightscout",
-  "version": "0.6.1",
+  "version": "0.6.2",
   "description": "Nightscout acts as a web-based CGM (Continuous Glucose Montinor) to allow multiple caregivers to remotely view a patients glucose data in realtime.",
   "license": "AGPL3",
   "author": "Nightscout Team",

diff --git a/static/index.html b/static/index.html
@@ -6,9 +6,9 @@
         <link rel="apple-touch-icon" href="/images/logomobile.png">
         <title>Nightscout</title>
         <link href="/images/round1.png" rel="icon" id="favicon" type="image/png" />
-        <link rel="stylesheet" type="text/css" href="/css/main.css?v=0.6.1" />
+        <link rel="stylesheet" type="text/css" href="/css/main.css?v=0.6.2" />
         <link rel="stylesheet" type="text/css" href="/css/dropdown.css" />
-        <link rel="stylesheet" type="text/css" href="/css/drawer.css?v=0.6.1" />
+        <link rel="stylesheet" type="text/css" href="/css/drawer.css?v=0.6.2" />
         <link rel="stylesheet" type="text/css" href="/bower_components/tipsy-jmalonzo/src/stylesheets/tipsy.css" />
     </head>
     <body>
@@ -220,8 +220,8 @@ <h1 class="customTitle">Nightscout</h1>
         <script src="/bower_components/jquery/dist/jquery.min.js"></script>
         <script src="/bower_components/jQuery-Storage-API/jquery.storageapi.min.js"></script>
         <script src="/bower_components/tipsy-jmalonzo/src/javascripts/jquery.tipsy.js"></script>
-        <script src="/js/ui-utils.js?v=0.6.1"></script>
-        <script src="/js/client.js?v=0.6.1"></script>
+        <script src="/js/ui-utils.js?v=0.6.2"></script>
+        <script src="/js/client.js?v=0.6.2"></script>
         <script src="/js/experiments.js"></script>
     </body>
 </html>
diff --git a/static/js/client.js b/static/js/client.js
@@ -1188,6 +1188,7 @@ var app = {}, browserSettings = {}, browserStorage = $.localStorage;
 
         // Dim the screen by reducing the opacity when at nighttime
         if (browserSettings.nightMode) {
+            var dateTime = new Date();
             if (opacity.current != opacity.NIGHT && (dateTime.getHours() > 21 || dateTime.getHours() < 7)) {
                 $('body').css({ 'opacity': opacity.NIGHT });
             } else {