Merge 63c2496 into 1b5fc82

nightscout · Feb 14, 2015 · 1805a51 · 1805a51
2 parents 1b5fc82 + 63c2496
commit 1805a51
Show file tree

Hide file tree

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

diff --git a/lib/pebble.js b/lib/pebble.js
@@ -107,7 +107,7 @@ function configure (entries, devicestatus, env) {
   function middle (req, res, next) {
     req.entries = entries;
     req.devicestatus = devicestatus;
-    req.rawbg = env.enable.indexOf('rawbg') > -1;
+    req.rawbg = env.enable && env.enable.indexOf('rawbg') > -1;
     next( );
   }
   return [middle, pebble];

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "Nightscout",
-  "version": "0.6.3",
+  "version": "0.6.4",
   "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.3" />
+        <link rel="stylesheet" type="text/css" href="/css/main.css?v=0.6.4" />
         <link rel="stylesheet" type="text/css" href="/css/dropdown.css" />
-        <link rel="stylesheet" type="text/css" href="/css/drawer.css?v=0.6.3" />
+        <link rel="stylesheet" type="text/css" href="/css/drawer.css?v=0.6.4" />
         <link rel="stylesheet" type="text/css" href="/bower_components/tipsy-jmalonzo/src/stylesheets/tipsy.css" />
     </head>
     <body>
@@ -226,8 +226,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.3"></script>
-        <script src="/js/client.js?v=0.6.3"></script>
+        <script src="/js/ui-utils.js?v=0.6.4"></script>
+        <script src="/js/client.js?v=0.6.4"></script>
         <script src="/js/experiments.js"></script>
     </body>
 </html>
diff --git a/tests/pebble.test.js b/tests/pebble.test.js
@@ -85,7 +85,6 @@ describe('Pebble Endpoint without Raw', function ( ) {
   var pebble = require('../lib/pebble');
   before(function (done) {
     var env = require('../env')( );
-    env.enable = "";
     this.app = require('express')( );
     this.app.enable('api');
     this.app.use('/pebble', pebble(entries, devicestatus, env));