From 9f398bd0b41bd369ccb3d9ab58c813e93f6931bc Mon Sep 17 00:00:00 2001 From: Jason Calabrese Date: Tue, 12 Jul 2016 23:21:19 -0700 Subject: [PATCH 1/5] fix issue snooze where alarm doesn't get cleared --- lib/client/index.js | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/lib/client/index.js b/lib/client/index.js index 999f28891a7..ef6628b685f 100644 --- a/lib/client/index.js +++ b/lib/client/index.js @@ -526,12 +526,9 @@ client.init = function init(serverSettings, plugins) { silenceTime = silenceTime || times.mins(5).msecs; - if (notify) { - if (notify.group === 'Time Ago') { - container.removeClass('alarming-timeago'); - } + var alarm = null; - var alarm = null; + if (notify) { if (notify.level) { alarm = getClientAlarm(notify.level, notify.group); } else if (notify.group) { @@ -539,13 +536,18 @@ client.init = function init(serverSettings, plugins) { } else { alarm = getClientAlarm(currentNotify.level, currentNotify.group); } + } else if (currentNotify) { + alarm = getClientAlarm(currentNotify.level, currentNotify.group); + } - if (alarm) { - alarm.lastAckTime = Date.now(); - alarm.silenceTime = silenceTime; - } else { - console.info('No alarm to ack for', notify || currentNotify); + if (alarm) { + alarm.lastAckTime = Date.now(); + alarm.silenceTime = silenceTime; + if (alarm.group === 'Time Ago') { + container.removeClass('alarming-timeago'); } + } else { + console.info('No alarm to ack for', notify || currentNotify); } // only emit ack if client invoke by button press From 2539392e90cb8e1cc36d01cbc3aac2335f227a0f Mon Sep 17 00:00:00 2001 From: Ben West Date: Thu, 21 Jul 2016 12:04:57 -0700 Subject: [PATCH 2/5] Fix swagger rendering --- static/api-docs.html | 1 + 1 file changed, 1 insertion(+) diff --git a/static/api-docs.html b/static/api-docs.html index 51042494373..f58fd52b0a7 100644 --- a/static/api-docs.html +++ b/static/api-docs.html @@ -38,6 +38,7 @@ + From 4052f5c4dab39b28225995fe4cdb6c6c1e1c0bba Mon Sep 17 00:00:00 2001 From: fedor apanasenko Date: Thu, 21 Jul 2016 22:34:40 +0300 Subject: [PATCH 3/5] Rus translation update --- lib/language.js | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/lib/language.js b/lib/language.js index 6cb79382f3b..e14b99f1437 100644 --- a/lib/language.js +++ b/lib/language.js @@ -7126,6 +7126,7 @@ function init() { ,de: 'Pumpe' ,bg: 'Помпа' ,ro: 'Pompă' + ,ru: 'Помпа' ,nl: 'Pomp' ,ko: '펌프' } @@ -7137,6 +7138,7 @@ function init() { ,de: 'Sensor-Alter' ,bg: 'Възраст на сензора' ,ro: 'Vechimea senzorului' + ,ru: 'Возраст сенсора' ,nl: 'Sensor leeftijd' ,ko: '센서 사용 기간' } @@ -7148,6 +7150,7 @@ function init() { ,de: 'Insulin-Alter' ,bg: 'Възраст на инсулина' ,ro: 'Vechimea insulinei' + ,ru: 'Возраст инсулина' ,nl: 'Insuline leeftijd' ,ko: '인슐린 사용 기간' } @@ -7159,6 +7162,7 @@ function init() { ,de: 'Temporäres Ziel' ,bg: 'Временни граници' ,ro: 'Țintă temporară' + ,ru: 'Временная цель' ,nl: 'Tijdelijk doel' ,ko: '임시 목표' } @@ -7171,6 +7175,7 @@ function init() { ,bg: 'Причина' ,nl: 'Reden' ,ro: 'Motiv' + ,ru: 'Причина' ,ko: '근거' } ,'Eating soon' : { @@ -7181,6 +7186,7 @@ function init() { ,de: 'Bald essend' ,bg: 'Ядене скоро' ,ro: 'Mâncare în curând' + ,ru: 'Скоро еда' ,nl: 'Binnenkort eten' ,ko: '곧 편집 중' } @@ -7192,6 +7198,7 @@ function init() { ,de: 'Oben' ,bg: 'Горе' ,ro: 'Deasupra' + ,ru: 'Верх' ,nl: 'Boven' ,ko: '최고' } @@ -7203,6 +7210,7 @@ function init() { ,de: 'Unten' ,bg: 'Долу' ,ro: 'Sub' + ,ru: 'Низ' ,nl: 'Beneden' ,ko: '최저' } @@ -7214,6 +7222,7 @@ function init() { ,de: 'Aktivität' ,bg: 'Активност' ,ro: 'Activitate' + ,ru: 'Активность' ,nl: 'Activiteit' ,ko: '활동량' } @@ -7225,37 +7234,44 @@ function init() { ,nb: 'Mål' ,bg: 'Граници' ,ro: 'Ținte' + ,ru: 'Цели' ,nl: 'Doelen' ,ko: '목표' } ,'Bolus insulin:' : { cs:'Bolusový inzulín:' ,ro: 'Insulină bolusată:' + ,ru: 'Болюс инсулин' ,ko: 'Bolus 인슐린' } ,'Base basal insulin:' : { cs:'Základní bazální inzulín:' ,ro: 'Bazala obișnuită:' + ,ru: 'Основной базал инсулин' ,ko: '기본 basal 인슐린' } ,'Positive temp basal insulin:' : { cs:'Pozitivní dočasný bazální inzulín:' ,ro: 'Bazala temporară crescută:' + ,ru: 'Положит знач временн базал инс ' ,ko: '임시 basal 인슐린 남아 있습니다.' } ,'Negative temp basal insulin:' : { cs:'Negativní dočasný bazální inzulín:' ,ro: 'Bazala temporară scăzută:' + ,ru: 'Отриц знач временн базал инс' ,ko: '임시 basal 인슐린 남아 있지 않습니다.' } ,'Total basal insulin:' : { cs:'Celkový bazální inzulín:' ,ro: 'Bazala totală:' + ,ru: 'Всего базал инсулина' ,ko: '전체 basal 인슐린' } ,'Total daily insulin:' : { cs:'Celkový denní inzulín:' ,ro: 'Insulina totală zilnică:' + ,ru: 'Всего ежедн базал инсулина' ,ko: '전체 하루 인슐린' } From 810b0e3d87e639cd6363bdf4991de6eed60dbdfa Mon Sep 17 00:00:00 2001 From: Jason Calabrese Date: Mon, 25 Jul 2016 10:09:32 -0700 Subject: [PATCH 4/5] Update CONTRIBUTING.md --- CONTRIBUTING.md | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 6169a7cbc4a..8ece619271b 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -95,10 +95,8 @@ appropriate. ## Co-ordination -There is a google groups nightscout-core developers list where lots of -people discuss Nightscout. Most cgm-remote-monitor hackers use -github's ticketing system, along with Facebook cgm-in-the-cloud, and -gitter system. +Most cgm-remote-monitor hackers use github's ticketing system, along with Facebook cgm-in-the-cloud, and +gitter. We use git-flow, with `master` as our production, stable branch, and `dev` is used to queue up for upcoming releases. Everything else is From d24dbdb8cdac404562067d379745fb33a0ccb7b4 Mon Sep 17 00:00:00 2001 From: baembel08 Date: Tue, 2 Aug 2016 18:35:43 +0200 Subject: [PATCH 5/5] Update language.js --- lib/language.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/language.js b/lib/language.js index e14b99f1437..f248682daac 100644 --- a/lib/language.js +++ b/lib/language.js @@ -5591,7 +5591,7 @@ function init() { cs: 'Portál ošetření' ,sv: 'Care Portal' ,it: 'Somministrazioni' - ,de: 'Betreuungs-Portal' + ,de: 'Behandlungs-Portal' ,ro: 'Care Portal' ,bg: 'Въвеждане на данни' ,nb: 'Omsorgsportal'