Merge pull request #2 from nightscout/dev

Merge from nightscout/dev

.travis.yml

@@ -1,8 +1,23 @@
 language: node_js
 sudo: false
 node_js:
-  - "0.10"
-  - "0.12"
+  - 0.10
+  - 0.12
+  - 4
+  - 5
+matrix:
+  fast_finish: true
+  allow_failures:
+    - node_js: 4
+    - node_js: 5
 services: mongodb
 script: make travis
 after_script: make report
+env:
+  - CXX=g++-4.8
+addons:
+  apt:
+    sources:
+      - ubuntu-toolchain-r-test
+    packages:
+      - g++-4.8

README.md

@@ -11,7 +11,7 @@ Nightscout Web Monitor (a.k.a. cgm-remote-monitor)
 [![Stories in Ready][ready-img]][waffle]
 [![Stories in Progress][progress-img]][waffle]
 
-[![Deploy to Heroku][heroku-img]][heroku-url]
+[![Deploy to Azure](http://azuredeploy.net/deploybutton.png)](https://azuredeploy.net/) [![Deploy to Heroku][heroku-img]][heroku-url]
 
 This acts as a web-based CGM (Continuous Glucose Monitor) to allow
 multiple caregivers to remotely view a patient's glucose data in
@@ -95,6 +95,7 @@ Community maintained fork of the
     - [Treatment Profile](#treatment-profile)
   - [Setting environment variables](#setting-environment-variables)
     - [Vagrant install](#vagrant-install)
+  - [Installation on Windows](#installation-on-windows)
   - [More questions?](#more-questions)
   - [License](#license)
 
@@ -224,6 +225,7 @@ To learn more about the Nightscout API, visit https://YOUR-SITE.com/api-docs.htm
   * `ALARM_TIMEAGO_URGENT` (`on`) - possible values `on` or `off`
   * `ALARM_TIMEAGO_URGENT_MINS` (`30`) - minutes since the last reading to trigger a urgent alarm
   * `SHOW_PLUGINS` - enabled plugins that should have their visualizations shown, defaults to all enabled
+  * `SHOW_FORECAST` (`ar2`) - plugin forecasts that should be shown by default, supports space delimited values such as `"ar2 openaps"` 
   * `LANGUAGE` (`en`) - language of Nightscout. If not available english is used
   * `SCALE_Y` (`log`) - The type of scaling used for the Y axis of the charts system wide.
     * The default `log` (logarithmic) option will let you see more detail towards the lower range, while still showing the full CGM range.
@@ -375,6 +377,8 @@ To learn more about the Nightscout API, visit https://YOUR-SITE.com/api-docs.htm
   * `OPENAPS_ENABLE_ALERTS` (`false`) - Set to `true` to enable notifications when OpenAPS isn't looping.  If OpenAPS is going to offline for a period of time, you can add an `OpenAPS Offline` event for the expected duration from Careportal to avoid getting alerts. 
   * `OPENAPS_WARN` (`30`) - The number of minutes since the last loop that needs to be exceed before an alert is triggered 
   * `OPENAPS_URGENT` (`60`) - The number of minutes since the last loop that needs to be exceed before an urgent alarm is triggered
+  * `OPENAPS_FIELDS` (`status-symbol status-label iob meal-assist rssi`) - The fields to display by default.  Any of the following fields: `status-symbol`, `status-label`, `iob`, `meal-assist`, `freq`, and `rssi`
+  * `OPENAPS_RETRO_FIELDS` (`status-symbol status-label iob meal-assist rssi`) - The fields to display in retro mode. Any of the above fields.
 
 
  Also see [Pushover](#pushover) and [IFTTT Maker](#ifttt-maker).
@@ -483,6 +487,10 @@ The setup script will install OS packages then run `npm install`.
 The Vagrant VM serves to your host machine only on 192.168.33.10, you can access
 the web interface on [http://192.168.33.10:1337](http://192.168.33.10:1337)
 
+## Installation on Windows
+
+If you have access to local computing resources and want to maintain more control over your data, you can host Nightscout and its database outside of the cloud. Windows Server supports MongoDB, Node.js, and Nightscout [installed on a single system](https://github.com/jaylagorio/Nightscout-on-Windows-Server). Although the instructions are intended for Windows Server the procedure is compatible with client versions of Windows such as Windows 7 and Windows 10. 
+
 More questions?
 ---------------
 

app.js

@@ -1,7 +1,9 @@
+'use strict';
 
 var express = require('express');
 var compression = require('compression');
 var bodyParser = require('body-parser');
+
 function create (env, ctx) {
   ///////////////////////////////////////////////////
   // api and json object variables
@@ -13,6 +15,11 @@ function create (env, ctx) {
   app.set('title', appInfo);
   app.enable('trust proxy'); // Allows req.secure test on heroku https connections.
 
+  if (ctx.bootErrors && ctx.bootErrors.length > 0) {
+    app.get('*', require('./lib/booterror')(ctx));
+    return app;
+  }
+
   app.use(compression({filter: function shouldCompress(req, res) {
     //TODO: return false here if we find a condition where we don't want to compress
     // fallback to standard filter function

app.json

@@ -73,7 +73,7 @@
       "required": false
     },
     "THEME": {
-      "description": "Possible values default or colors",
+      "description": "Possible values default, colors or colorblindfriendly",
       "value": "",
       "required": false
     },