From f57ccb8ed4a5ab098e63432e64303a6f77857163 Mon Sep 17 00:00:00 2001 From: Sulka Haro Date: Wed, 18 Dec 2019 08:56:48 +0200 Subject: [PATCH] Release 13.0.1 (#5329) * Release ref update v2 (#5301) * Updated release name and number * Added missing version number * Added missing version number * Fix auth dialog sizing error (#5315) * Fix auth dialog sizing error (#5314) * Fix auth dialog sizing error * Fix Client Init After Auth (cherry picked from commit 1bf416c3bb964ed555850c3fc55977d69980b8e5) * update NS minor version --- docs/plugins/googlehome-plugin.md | 2 +- lib/client/index.js | 2 +- lib/hashauth.js | 7 ++++++- npm-shrinkwrap.json | 2 +- package.json | 2 +- swagger.json | 2 +- swagger.yaml | 2 +- 7 files changed, 12 insertions(+), 7 deletions(-) diff --git a/docs/plugins/googlehome-plugin.md b/docs/plugins/googlehome-plugin.md index f4bddb4d9cbe..ccffb81f4041 100644 --- a/docs/plugins/googlehome-plugin.md +++ b/docs/plugins/googlehome-plugin.md @@ -25,7 +25,7 @@ To add Google Home support for your Nightscout site, here's what you need to do: ## Activate the Nightscout Google Home Plugin -1. Your Nightscout site needs to be new enough that it supports the `googlehome` plugin. It needs to be [version 13.0 (Ketchup)](https://github.com/nightscout/cgm-remote-monitor/releases/tag/13.0) or later. See [updating my version](https://github.com/nightscout/cgm-remote-monitor#updating-my-version) if you need a newer version. +1. Your Nightscout site needs to be new enough that it supports the `googlehome` plugin. It needs to be [version 13.0.0 (Ketchup)](https://github.com/nightscout/cgm-remote-monitor/releases/tag/13.0.0) or later. See [updating my version](https://github.com/nightscout/cgm-remote-monitor#updating-my-version) if you need a newer version. 1. Add `googlehome` to the list of plugins in your `ENABLE` setting. ([Environment variables](https://github.com/nightscout/cgm-remote-monitor#environment) are set in the configuration section for your monitor. Typically Azure, Heroku, etc.) ## Create Your DialogFlow Agent diff --git a/lib/client/index.js b/lib/client/index.js index eb6c4a9fd932..469009a9a942 100644 --- a/lib/client/index.js +++ b/lib/client/index.js @@ -98,7 +98,7 @@ client.init = function init (callback) { // auth failed, hide loader and request for key $('#centerMessagePanel').hide(); client.hashauth.requestAuthentication(function afterRequest () { - client.init(null, callback); + client.init(callback); }); } }); diff --git a/lib/hashauth.js b/lib/hashauth.js index 1421c0765356..8848ca08ef0a 100644 --- a/lib/hashauth.js +++ b/lib/hashauth.js @@ -91,7 +91,12 @@ hashauth.init = function init(client, $) { hashauth.requestAuthentication = function requestAuthentication (eventOrNext) { var translate = client.translate; hashauth.injectHtml(); - var clientWidth = Math.min(400, $( '#container')[0].clientWidth); + + var clientWidth = window.innerWidth + || document.documentElement.clientWidth + || document.body.clientWidth; + + clientWidth = Math.min(400, clientWidth); $( '#requestauthenticationdialog' ).dialog({ width: clientWidth diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json index 99dbaa768e3a..7d3a1730a7db 100644 --- a/npm-shrinkwrap.json +++ b/npm-shrinkwrap.json @@ -1,6 +1,6 @@ { "name": "nightscout", - "version": "13.0.0", + "version": "13.0.1", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 88e92a6f4ed6..32ee90d2a33e 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "nightscout", - "version": "13.0.0", + "version": "13.0.1", "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/swagger.json b/swagger.json index 385f73c068f4..dce7854e05bb 100755 --- a/swagger.json +++ b/swagger.json @@ -8,7 +8,7 @@ "info": { "title": "Nightscout API", "description": "Own your DData with the Nightscout API", - "version": "13.0.0", + "version": "13.0.1", "license": { "name": "AGPL 3", "url": "https://www.gnu.org/licenses/agpl.txt" diff --git a/swagger.yaml b/swagger.yaml index bdb74b652b91..a08f701d7a5e 100755 --- a/swagger.yaml +++ b/swagger.yaml @@ -4,7 +4,7 @@ servers: info: title: Nightscout API description: Own your DData with the Nightscout API - version: 13.0.0 + version: 13.0.1 license: name: AGPL 3 url: 'https://www.gnu.org/licenses/agpl.txt'