Merge branch 'hotfix/report-fixes'

jasoncalabrese · jasoncalabrese · commit 82e3f557ba05 · 2015-12-05T10:29:08.000-08:00
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "nightscout",
-  "version": "0.8.2",
+  "version": "0.8.3",
   "dependencies": {
     "jquery": "2.1.0",
     "jQuery-Storage-API": "~1.7.2",
diff --git a/lib/report_plugins/calibrations.js b/lib/report_plugins/calibrations.js
@@ -1,5 +1,6 @@
 'use strict';
 var translate = require('../language')().translate;
+var d3 = (global && global.d3) || require('d3');
 
 var calibrations = {
   name: 'calibrations'
diff --git a/lib/report_plugins/daytoday.js b/lib/report_plugins/daytoday.js
@@ -3,6 +3,7 @@
 var _ = require('lodash');
 var moment = window.moment;
 var times = require('../times');
+var d3 = (global && global.d3) || require('d3');
 
 var daytoday = {
   name: 'daytoday'
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "Nightscout",
-  "version": "0.8.2",
+  "version": "0.8.3",
   "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": "AGPL-3.0",
   "author": "Nightscout Team",
diff --git a/static/index.html b/static/index.html
@@ -25,10 +25,10 @@
       <meta name="msapplication-config" content="/browserconfig.xml">
       <meta name="theme-color" content="#333333">
 
-        <link rel="stylesheet" type="text/css" href="/css/drawer.css?v=0.8.2" />
-        <link rel="stylesheet" type="text/css" href="/css/main.css?v=0.8.2" />
+        <link rel="stylesheet" type="text/css" href="/css/drawer.css?v=0.8.3" />
+        <link rel="stylesheet" type="text/css" href="/css/main.css?v=0.8.3" />
         <link rel="stylesheet" type="text/css" href="/css/dropdown.css" />
-        <link rel="stylesheet" type="text/css" href="/css/sgv.css?v=0.8.2" />
+        <link rel="stylesheet" type="text/css" href="/css/sgv.css?v=0.8.3" />
         <link rel="stylesheet" type="text/css" href="/bower_components/tipsy-jmalonzo/src/stylesheets/tipsy.css" />
         <link rel="stylesheet" type="text/css" href="/bower_components/jquery-ui/themes/ui-darkness/jquery-ui.min.css">    
     </head>
@@ -284,8 +284,8 @@
             <audio src="/audio/alarm2.mp3" preload="auto" loop="true" class="urgent alarm2 mp3" type="audio/mp3"></audio>
         </div>
 
-        <script src="/api/v1/status.js?v=0.8.2"></script>
-        <script src="/public/js/bundle.js?v=0.8.2"></script>
+        <script src="/api/v1/status.js?v=0.8.3"></script>
+        <script src="/public/js/bundle.js?v=0.8.3"></script>
         <script src="/socket.io/socket.io.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>
diff --git a/static/report/index.html b/static/report/index.html
@@ -23,7 +23,7 @@
       <meta name="msapplication-config" content="/browserconfig.xml">
       <meta name="theme-color" content="#333333">
 
-      <link rel="stylesheet" type="text/css" href="/css/report.css" />
+      <link rel="stylesheet" type="text/css" href="/css/report.css?v=0.8.3" />
       <link rel="stylesheet" type="text/css" href="/bower_components/jquery-ui/themes/ui-lightness/jquery-ui.min.css">    
     </head>
     <body>
@@ -116,8 +116,8 @@ <h1><img src="/images/logo1.png"><span class="translate">Nightscout reporting</s
     <hr>
     <b><span class="translate">Authentication status</span>: </b><span id="authentication_placeholder"></span>
 
-    <script src="/api/v1/status.js"></script>
-    <script src="/public/js/bundle.js"></script>
+    <script src="/api/v1/status.js?v=0.8.3"></script>
+    <script src="/public/js/bundle.js?v=0.8.3"></script>
     <script src="/socket.io/socket.io.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>
@@ -126,7 +126,7 @@ <h1><img src="/images/logo1.png"><span class="translate">Nightscout reporting</s
     <script src="/bower_components/jquery-flot/jquery.flot.time.js"></script>
     <script src="/bower_components/jquery-flot/jquery.flot.fillbetween.js"></script>
     <script src="/bower_components/jquery-ui/jquery-ui.min.js"></script>
-    <script src="/report/js/report.js"></script>
+    <script src="/report/js/report.js?v=0.8.3"></script>
     <script src="/report/js/flotcandle.js"></script>
     </body>
 </html>
diff --git a/tests/client.test.js.temporary_removed b/tests/client.test.js.temporary_removed

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "nightscout",`
`3`		`- "version": "0.8.2",`
	`3`	`+ "version": "0.8.3",`
`4`	`4`	`"dependencies": {`
`5`	`5`	`"jquery": "2.1.0",`
`6`	`6`	`"jQuery-Storage-API": "~1.7.2",`