Skip to content

nightscout #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
miheladiana merged 11 commits into from
Feb 8, 2016
Merged

nightscout #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
4e4314f
quick fix for day-to-day d3 issue, probably something better
jasoncalabrese Dec 1, 2015
88db641
use the d3 require trick again
jasoncalabrese Dec 1, 2015
d68736c
version bump to test 0.8.3-report-fixes
jasoncalabrese Dec 4, 2015
94f8057
temporary removed client.test.js
MilosKozak Nov 16, 2015
bae4066
version bump for 0.8.3 release
jasoncalabrese Dec 5, 2015
82e3f55
Merge branch 'hotfix/report-fixes'
jasoncalabrese Dec 5, 2015
377a8f7
try selecting node 0.10.40 to see if it helps Azure
jasoncalabrese Dec 26, 2015
bc2f124
Fix logic that determines npm version to use
Dec 28, 2015
898513c
Merge pull request #1432 from davidebbo/patch-1
jasoncalabrese Dec 28, 2015
e38be3a
version bump to 0.8.4 and revert change to node version since we have…
jasoncalabrese Dec 29, 2015
dda9962
Merge branch 'hotfix/node-version-azure'
jasoncalabrese Dec 29, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion bower.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "nightscout",
"version": "0.8.2",
"version": "0.8.4",
"dependencies": {
"jquery": "2.1.0",
"jQuery-Storage-API": "~1.7.2",
Expand Down
2 changes: 1 addition & 1 deletion deploy.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ selectNodeVersion () {
exitWithMessageOnError "getting node version failed"
fi

if [[ -e "$DEPLOYMENT_TEMP/.tmp" ]]; then
if [[ -e "$DEPLOYMENT_TEMP/__npmVersion.tmp" ]]; then
NPM_JS_PATH=`cat "$DEPLOYMENT_TEMP/__npmVersion.tmp"`
exitWithMessageOnError "getting npm version failed"
fi
Expand Down
1 change: 1 addition & 0 deletions lib/report_plugins/calibrations.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
'use strict';
var translate = require('../language')().translate;
var d3 = (global && global.d3) || require('d3');

var calibrations = {
name: 'calibrations'
Expand Down
1 change: 1 addition & 0 deletions lib/report_plugins/daytoday.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "Nightscout",
"version": "0.8.2",
"version": "0.8.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": "AGPL-3.0",
"author": "Nightscout Team",
Expand Down
10 changes: 5 additions & 5 deletions static/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
8 changes: 4 additions & 4 deletions static/report/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand All @@ -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>
0 tests/client.test.js → tests/client.test.js.temporary_removed
View file
Open in desktop
File renamed without changes.