Skip to content
Merged
Changes from 1 commit
Commits
Show all changes
1312 commits
Select commit Hold shift + click to select a range
891d67c
Merge pull request #2076 from nightscout/dev
jasoncalabrese Oct 14, 2016
98b446f
translations admin tools roles
MilosKozak Oct 14, 2016
4260d09
translations admin tools subjects
MilosKozak Oct 14, 2016
2cbb858
Merge pull request #2080 from MilosKozak/dev
MilosKozak Oct 14, 2016
2b627f2
translation of Snooze ...
MilosKozak Oct 15, 2016
4cd255a
Merge pull request #2086 from MilosKozak/dev
MilosKozak Oct 15, 2016
e5b556c
/translations/ endpoint fix
MilosKozak Oct 15, 2016
588704a
Merge pull request #2089 from MilosKozak/dev
MilosKozak Oct 15, 2016
ac237b9
Update language.js
baembel08 Oct 15, 2016
d8b46ee
refactor init so plugins can be localized
jasoncalabrese Oct 15, 2016
a00c5dc
Merge pull request #2090 from baembel08/patch-1
MilosKozak Oct 15, 2016
ac6da57
merge in AR2 and ci translate from #1059
jasoncalabrese Oct 15, 2016
f196b52
Update language.js
mdomox Oct 15, 2016
f44bf27
Update language.js
mdomox Oct 15, 2016
205edca
Update language.js
mdomox Oct 16, 2016
03cb7fa
Merge branch 'master' into Greek-Translation
mdomox Oct 16, 2016
e838dcf
RO translation for 0.9 main
bogdangorescu Oct 16, 2016
8227fc3
Merge pull request #2097 from bogdangorescu/patch-15
jasoncalabrese Oct 16, 2016
23c0fcb
before refactoring get rid of with_collection
jasoncalabrese Oct 16, 2016
fb39023
Merge pull request #2098 from mdomox/Greek-Translation
MilosKozak Oct 16, 2016
ebc72d4
Add greek language to Azure deploy
MilosKozak Oct 16, 2016
c3f8a23
RO translation
bogdangorescu Oct 16, 2016
d8e3628
Update FI with all missing localization
sulkaharo Oct 16, 2016
f36aed0
Merge pull request #2099 from bogdangorescu/patch-16
MilosKozak Oct 16, 2016
2e75453
Merged with latest dev
sulkaharo Oct 16, 2016
9c020cf
Merged with latest dev
sulkaharo Oct 16, 2016
1bad7e6
Merge pull request #2101 from sulkaharo/wip/fi-0.9.0-update
sulkaharo Oct 16, 2016
87c52be
russian translations by Fedor Apanasenko
MilosKozak Oct 16, 2016
344cd16
bulgarian translations by Filip Filipov
MilosKozak Oct 16, 2016
7b8824f
missing comma
MilosKozak Oct 16, 2016
94ee39e
Merge pull request #2103 from MilosKozak/dev
MilosKozak Oct 16, 2016
1a97b18
Update language.js
DanielFilipov Oct 16, 2016
f6f731b
Merge pull request #2105 from DanielFilipov/patch-4
MilosKozak Oct 16, 2016
cf2ad00
Merge pull request #2091 from nightscout/wip/plugin-init
MilosKozak Oct 16, 2016
a48d21b
update german parts
baembel08 Oct 16, 2016
6694971
Merge pull request #2 from nightscout/master
hichameyessou Oct 16, 2016
c6aef93
Merge pull request #4 from nightscout/dev
hichameyessou Oct 16, 2016
4ffd9f8
IT Language updates
Oct 16, 2016
bd84596
Merge pull request #2109 from hichameyessou/dev
MilosKozak Oct 16, 2016
c48f96d
Merge pull request #2107 from baembel08/patch-3
MilosKozak Oct 16, 2016
5d72645
typo
MilosKozak Oct 16, 2016
077671a
Korean translation update
jungsomyeong Oct 16, 2016
6e48e62
more refactoring and renaming to make storage generic
jasoncalabrese Oct 16, 2016
74f6a4c
Update language.js
mdomox Oct 16, 2016
122d33d
Update language.js
mdomox Oct 16, 2016
bc1650e
Merge pull request #2112 from jungsomyeong/patch-11
MilosKozak Oct 16, 2016
9cbe589
Merge pull request #2113 from mdomox/Greek-Translation
jasoncalabrese Oct 16, 2016
3b2de4a
more refactoring, first pass at openaps-storage
jasoncalabrese Oct 17, 2016
87223df
Update language.js
mdomox Oct 17, 2016
880b450
Merge pull request #2115 from mdomox/Greek-Translation
MilosKozak Oct 17, 2016
d54980a
swedish translation
sebastianlorant Oct 18, 2016
f5fbdbb
added sort/limit to mocked collection; multiple inputs per collection…
jasoncalabrese Oct 18, 2016
db05a5e
Merge pull request #2122 from sebastianlorant/patch-10
MilosKozak Oct 18, 2016
7b31a99
purge previously required report files to get fresh data
jasoncalabrese Oct 18, 2016
b72a66b
always store units in profile
MilosKozak Oct 18, 2016
36fabb8
Merge pull request #2127 from MilosKozak/dev
MilosKozak Oct 18, 2016
bd1bf32
fix find bug by chaing find.toArray; hack for
jasoncalabrese Oct 20, 2016
c8b34ef
less logging
jasoncalabrese Oct 20, 2016
d3b7600
split /translations endpoint to 2 tables
MilosKozak Oct 21, 2016
2d170fc
basal plugin translation
MilosKozak Oct 21, 2016
c8b93b3
bgnow plugin translation
MilosKozak Oct 21, 2016
3521039
Add right padding to button bar to fix scrollbar issue
rkresha Oct 21, 2016
4dd44d4
bwp plugin translation
MilosKozak Oct 21, 2016
033ae3f
tests fix
MilosKozak Oct 21, 2016
0b4c8ec
get plugins from ctx instead of initializing them again
jasoncalabrese Oct 21, 2016
88bff1a
Merge remote-tracking branch 'upstream/wip/pebble-plugins' into dev
MilosKozak Oct 21, 2016
163451e
Merge branch 'dev' into wip/pebble-plugins
jasoncalabrese Oct 21, 2016
c28b9b4
simplealarms.test.js test fix
MilosKozak Oct 21, 2016
de03867
Add right padding to button bar to fix scrollbar issue
rkresha Oct 21, 2016
2aef8fd
Swedish_2
sebastianlorant Oct 23, 2016
091b62a
Merge pull request #2142 from sebastianlorant/patch-11
MilosKozak Oct 23, 2016
f515889
Merge remote-tracking branch 'upstream/dev' into dev
MilosKozak Oct 23, 2016
57b4b83
Merge pull request #2139 from rkresha/dev
jasoncalabrese Oct 23, 2016
11b893e
Merge pull request #2140 from nightscout/wip/pebble-plugins
jasoncalabrese Oct 23, 2016
c5a0604
Merge branch 'dev' into wip/openaps-storage
jasoncalabrese Oct 23, 2016
6b50cbf
boluswizardpreview.test.js fix
MilosKozak Oct 23, 2016
831ed02
Merge pull request #2137 from MilosKozak/dev
MilosKozak Oct 23, 2016
801fa48
canulaage translation
MilosKozak Oct 23, 2016
9ae1291
openaps storage clean up and tests
jasoncalabrese Oct 23, 2016
c802172
clean up
jasoncalabrese Oct 23, 2016
c9b5e13
Merge pull request #2114 from nightscout/wip/openaps-storage
jasoncalabrese Oct 23, 2016
9a5dd8e
bump version to 0.9.1-dev-20161023
jasoncalabrese Oct 23, 2016
a965408
Mark cob as local variable, to fix error that happens with Loop 1.1
ps2 Oct 23, 2016
d41751c
Merge remote-tracking branch 'upstream/dev'
ps2 Oct 23, 2016
5b0aef1
Round cob
ps2 Oct 23, 2016
60f289e
Merge pull request #2144 from ps2/fix-loop-cob
jasoncalabrese Oct 23, 2016
f35fade
format numbers in treatments report
MilosKozak Oct 24, 2016
df6061c
cob translation
MilosKozak Oct 24, 2016
0b1947f
bwp use locale time
MilosKozak Oct 24, 2016
a6d7f73
iage translation & added test
MilosKozak Oct 24, 2016
cb6097e
codacy
MilosKozak Oct 24, 2016
6c5c517
iob translations
MilosKozak Oct 24, 2016
8cb995a
fix depending tests
MilosKozak Oct 24, 2016
7712b5e
timeago translations
MilosKozak Oct 24, 2016
b5c09a4
fix depending tests
MilosKozak Oct 24, 2016
3802c89
timeago pill translation
MilosKozak Oct 24, 2016
7f164cf
sage translation
MilosKozak Oct 24, 2016
a3c0e9f
fix tests
MilosKozak Oct 24, 2016
e7d4828
Merge pull request #2143 from MilosKozak/dev
MilosKozak Oct 24, 2016
42d0581
Merge pull request #1 from nightscout/dev
moomoobloo Oct 28, 2016
34c4e8b
RO update 2016/10/28
bogdangorescu Oct 28, 2016
c814276
Merge pull request #2161 from bogdangorescu/patch-17
MilosKozak Oct 28, 2016
00298e0
SK lang update
JakubkoDIA Oct 29, 2016
4c51c7c
Merge pull request #2162 from JakubkoDIA/patch-1
MilosKozak Oct 29, 2016
cef55dc
RO - minor update 9.0
bogdangorescu Oct 29, 2016
577175c
FI Update
sulkaharo Oct 29, 2016
c31c423
Merge pull request #2165 from sulkaharo/wip/fi-0.9.0-update
MilosKozak Oct 29, 2016
e3a26dc
Merge pull request #2164 from bogdangorescu/patch-18
MilosKozak Oct 29, 2016
92ddffa
Merge remote-tracking branch 'nightscout/dev' into dev
dm61 Oct 29, 2016
4a85230
Merge branch 'dev' of https://github.com/moomoobloo/cgm-remote-monito…
moomoobloo Oct 30, 2016
26a3346
Minify bundle.js to improve page load time.
moomoobloo Oct 30, 2016
0e507b3
Merge pull request #5 from nightscout/dev
hichameyessou Oct 30, 2016
f915356
ITA language updates
Oct 30, 2016
6157668
swedish_translation_v3
sebastianlorant Oct 30, 2016
b0fa5fe
Merge pull request #2167 from sebastianlorant/patch-12
jasoncalabrese Oct 30, 2016
7415781
Merge pull request #2166 from hichameyessou/dev
jasoncalabrese Oct 30, 2016
e30102f
translate norwegian
Oct 30, 2016
d20cbf1
translate Norwegian
Oct 30, 2016
0790f53
Merge pull request #2172 from skjelland/dev
MilosKozak Oct 30, 2016
f958a2f
Slovak language update
JakubkoDIA Oct 31, 2016
751fb68
Merge pull request #2173 from JakubkoDIA/patch-2
MilosKozak Oct 31, 2016
fb13a22
Swedish_v4
sebastianlorant Oct 31, 2016
d6a5559
Merge pull request #2177 from sebastianlorant/patch-13
jasoncalabrese Oct 31, 2016
8dc3bbf
Merge pull request #2175 from moomoobloo/wip/minify
jasoncalabrese Oct 31, 2016
d195a4d
rus update 31 oct
apanasef Oct 31, 2016
6f02734
Merge pull request #2179 from apanasef/patch-12
MilosKozak Oct 31, 2016
283c294
rus translation updated nov1
apanasef Nov 1, 2016
0184a51
Merge pull request #2182 from apanasef/patch-13
MilosKozak Nov 1, 2016
d518a66
Merge pull request #6 from nightscout/dev
hichameyessou Nov 1, 2016
8727ea1
ITA Language Updates
Nov 1, 2016
fd55fe1
Merge pull request #2184 from hichameyessou/dev
MilosKozak Nov 1, 2016
bedb76a
resolve conflict after merging wip/import-boot-config
jasoncalabrese Nov 4, 2016
a7f734a
resolve conflicts and cleanup after merging wip/ddata-endpoints
jasoncalabrese Nov 4, 2016
d09eddd
Merge branch 'wip/audio-experiments' of https://github.com/nightscout…
jasoncalabrese Nov 4, 2016
57b3c6c
merge in wip/audio-experiments, update to work with new client init
jasoncalabrese Nov 4, 2016
b7f1257
codacy clean up
jasoncalabrese Nov 4, 2016
a8db824
also support importing extended settings; add IMPORT_CONFIG to readme…
jasoncalabrese Nov 5, 2016
8aa4b63
when loading a frame of ddata stop at requested time instead of addin…
jasoncalabrese Nov 5, 2016
a47d8e0
Alexa integration from some friends of Nightscout
jasoncalabrese Nov 6, 2016
e4862cc
basic OpenAPS Alexa integration
jasoncalabrese Nov 6, 2016
e96bb71
require alexa to be enabled, add to readme
jasoncalabrese Nov 6, 2016
1cebfa7
add link in toc
jasoncalabrese Nov 6, 2016
4138690
fix link in toc
jasoncalabrese Nov 6, 2016
9a3df0e
Update language.js
dougtakeuti Nov 6, 2016
bdb6db2
Formating
jasoncalabrese Nov 6, 2016
f4919d7
fix some codacy warnings
jasoncalabrese Nov 7, 2016
a242b31
Merge pull request #2206 from dougtakeuti/patch-3
jasoncalabrese Nov 7, 2016
796b70b
option to enable CORS
jasoncalabrese Nov 8, 2016
0b98c56
added cors to readme
jasoncalabrese Nov 8, 2016
c60920c
fix link
jasoncalabrese Nov 8, 2016
c970cb7
clean up
jasoncalabrese Nov 8, 2016
1b1da56
Merge pull request #2207 from nightscout/wip/enable-cors
jasoncalabrese Nov 8, 2016
90ea304
Update azuredeploy.json
baembel08 Nov 10, 2016
2ba75e3
Merge pull request #7 from nightscout/dev
hichameyessou Nov 10, 2016
74307ab
ita updates
Nov 11, 2016
c1c82b3
Revert "ita updates"
Nov 11, 2016
c54d654
Merge branch 'dev' of https://github.com/hichameyessou/cgm-remote-mon…
Nov 11, 2016
64bd8e1
its updates
Nov 11, 2016
df7de63
Merge pull request #2214 from hichameyessou/dev
MilosKozak Nov 11, 2016
c2ef763
2nd Portuguese Update
dougtakeuti Nov 12, 2016
00b93d5
refactoring, add alexa tests
jasoncalabrese Nov 12, 2016
89d354e
merge in dev, fix conflict in readme
jasoncalabrese Nov 12, 2016
f115234
Merge pull request #2217 from dougtakeuti/patch-4
jasoncalabrese Nov 12, 2016
dd439df
Merge pull request #2211 from baembel08/patch-4
jasoncalabrese Nov 12, 2016
1375bb9
fix basal alexa test
jasoncalabrese Nov 12, 2016
9e57218
replace more fromNow's
jasoncalabrese Nov 12, 2016
dc1aaee
check that alexa requests have readable permissions (with token suppo…
jasoncalabrese Nov 12, 2016
929f876
use sbx.time instead of Date.now()
jasoncalabrese Nov 12, 2016
0b9c4aa
replace more Date.now()s with sbx.time
jasoncalabrese Nov 12, 2016
d7768dc
Merge pull request #2200 from jasoncalabrese/wip/alexa
jasoncalabrese Nov 12, 2016
e329275
bump version to 0.9.1-dev-20161112
jasoncalabrese Nov 12, 2016
eefb587
3rd Portuguese Update
dougtakeuti Nov 14, 2016
ebb241e
Fixed duplication
dougtakeuti Nov 14, 2016
18dbcc2
Fixed another typo
dougtakeuti Nov 14, 2016
cff9464
Merge pull request #2218 from dougtakeuti/patch-5
jasoncalabrese Nov 14, 2016
0ce4ae0
fix temp basal processing in reports
MilosKozak Nov 14, 2016
81f93a1
websockets maxtimediff for treatments 1 min
MilosKozak Nov 14, 2016
be2db07
Merge pull request #2219 from MilosKozak/dev
MilosKozak Nov 14, 2016
99c2991
4th Portuguese update
dougtakeuti Nov 15, 2016
2042808
Merge pull request #2222 from dougtakeuti/patch-5
jasoncalabrese Nov 15, 2016
15f3bc2
Merge remote-tracking branch 'nightscout/dev' into dev
dm61 Nov 17, 2016
4a6b6a5
add padding to the bottom of the bg status to fix alignment of the ra…
jasoncalabrese Nov 18, 2016
8fa6288
Rus Translation completed
apanasef Nov 18, 2016
4abbbaf
Update language.js
DanielFilipov Nov 18, 2016
75c12de
Merge pull request #2231 from apanasef/patch-14
MilosKozak Nov 18, 2016
61dc947
Merge pull request #2233 from DanielFilipov/patch-4
MilosKozak Nov 18, 2016
80a4eb4
Merge pull request #2229 from nightscout/wip/range-align-fix
jasoncalabrese Nov 18, 2016
e122fd7
Merge remote-tracking branch 'nightscout/dev' into dev
dm61 Nov 19, 2016
6ae33bc
Korean translation update
jungsomyeong Nov 20, 2016
afee511
Korean translation update
jungsomyeong Nov 20, 2016
c4827e5
Merge pull request #2237 from jungsomyeong/patch-12
MilosKozak Nov 21, 2016
6f5ff87
fix merge conflicts
MilosKozak Nov 21, 2016
d26b52d
Merge pull request #2240 from MilosKozak/jungsomyeong-patch-14
jasoncalabrese Nov 22, 2016
78ac97d
update language ITA 0.9.1
francescaneri Nov 20, 2016
2e844af
Merge pull request #2245 from nightscout/francescaneri-patch-1
jasoncalabrese Nov 22, 2016
2fd8248
Merge branch 'dev' into wip/import-ddata-audio
jasoncalabrese Nov 22, 2016
80aa369
add count example to readme
jasoncalabrese Nov 22, 2016
1b65d54
Merge pull request #2194 from nightscout/wip/import-ddata-audio
jasoncalabrese Nov 22, 2016
f51b5c1
Merge remote-tracking branch 'nightscout/dev' into dev
dm61 Nov 22, 2016
50de486
bump version to 0.9.1-dev-20161121
jasoncalabrese Nov 22, 2016
89d2f68
Update iob.js to prioritize Loop IOB if available
dm61 Nov 22, 2016
404cbd2
Merge pull request #2246 from dm61/dev
jasoncalabrese Nov 22, 2016
c295c4c
Update dutch.
martijnmcb Nov 22, 2016
ab45397
Update language.js
martijnmcb Nov 22, 2016
405dc74
Bulgarian translation November 22nd
xpucuto Nov 22, 2016
089ac22
Merge pull request #2250 from martijnmcb/patch-1
jasoncalabrese Nov 23, 2016
1dd4e16
Update language.js
xpucuto Nov 23, 2016
8ae3dfb
Update
xpucuto Nov 23, 2016
dd0c9f0
Update language.js
xpucuto Nov 23, 2016
9baf0cc
fixed alexa battery issue
rajatgupta431 Nov 25, 2016
295e879
fix upbat test to match new results using display value
jasoncalabrese Nov 25, 2016
06ef9e2
fix upbat test to match new results using display value again
jasoncalabrese Nov 25, 2016
caecef7
Merge pull request #2257 from nightscout/wip/rajat-upbat
jasoncalabrese Nov 25, 2016
8c51cdf
Merge branch 'patch-2' of https://github.com/xpucuto/cgm-remote-monit…
jasoncalabrese Nov 25, 2016
07bbfd5
fix typos
jasoncalabrese Nov 25, 2016
b5ed598
Merge pull request #2258 from nightscout/xpucuto-patch-2
jasoncalabrese Nov 25, 2016
beacd91
bump version to 0.9.1
jasoncalabrese Nov 25, 2016
d407bab
Merge pull request #2247 from nightscout/dev
jasoncalabrese Nov 25, 2016
73e8691
Small corrections in Dutch [NL] part
martijnmcb Nov 25, 2016
d130301
Update index.js
Nov 25, 2016
dec0f5c
Update index.js
Nov 26, 2016
216efae
add back some of the readme that got lost in a merge
jasoncalabrese Nov 26, 2016
4e59a66
Merge pull request #2259 from martijnmcb/patch-3
jasoncalabrese Nov 27, 2016
8b09a06
Merge pull request #2267 from nightscout/wip/alexa-mmol
jasoncalabrese Nov 27, 2016
c30d890
Alexa only needs TWO decimal points of IOB ;)
shanselman Nov 30, 2016
97844ea
fix iob test for new rounding
jasoncalabrese Dec 1, 2016
d7eccc4
ignore some direction like None and Not Computable
jasoncalabrese Dec 1, 2016
51fa0e0
bump version to 0.9.2-dev-20161130
jasoncalabrese Dec 1, 2016
2ee4832
Merge pull request #2279 from nightscout/wip/alexa-fixes
jasoncalabrese Dec 1, 2016
ce12f6c
Check devicestatus for COB from OpenAPS and Loop along with calculati…
jasoncalabrese Dec 1, 2016
82006df
clean up
jasoncalabrese Dec 1, 2016
da5226d
Update iob.js
warstar2187 Dec 1, 2016
57510b1
add tests and clean up
jasoncalabrese Dec 2, 2016
0de7ff4
Merge pull request #2283 from warstar2187/master
jasoncalabrese Dec 2, 2016
a145fd1
bump version to 0.9.2-dev-20161201
jasoncalabrese Dec 2, 2016
2ca39d0
Merge pull request #2280 from nightscout/wip/cob-devicestatus
jasoncalabrese Dec 2, 2016
a1ebf18
Update language.js
apanasef Dec 2, 2016
64db1e5
changed dutch translations
PieterGit Dec 2, 2016
2e98ada
Merge pull request #2289 from PieterGit/dutch_translations
jasoncalabrese Dec 2, 2016
1421a36
Merge pull request #2285 from apanasef/patch-15
MilosKozak Dec 2, 2016
f2e80d0
Alexa plug-in required
rickggaribay Dec 4, 2016
9e5df41
bump version to 0.9.2-dev-20161206
jasoncalabrese Dec 7, 2016
451cf64
pin jsonwebtoken to 7.1.9
jasoncalabrese Dec 7, 2016
b78312d
Merge pull request #2312 from nightscout/wip/pin-jsonwebtoken
jasoncalabrese Dec 7, 2016
b2d4433
bump version to 0.9.2
jasoncalabrese Dec 7, 2016
c82f6c0
Merge pull request #2305 from rickggaribay/patch-1
jasoncalabrese Dec 7, 2016
ff10eb8
Merge branch 'dev' of github.com:nightscout/cgm-remote-monitor into dev
jasoncalabrese Dec 7, 2016
209cf03
Merge pull request #2313 from nightscout/dev
jasoncalabrese Dec 7, 2016
c0c35ce
Added note about using the same Amazon account as you use on your Ale…
jwedding Dec 27, 2016
9a92420
Merge pull request #2376 from jwedding/patch-1
oskarpearson Dec 29, 2016
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
Prev Previous commit
Next Next commit
ignore some direction like None and Not Computable
  • Loading branch information
jasoncalabrese committed Dec 1, 2016
commit d7eccc492da30c0cc3018fc203fa0f59dce2b5be
2 changes: 0 additions & 2 deletions lib/api/alexa/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -110,8 +110,6 @@ function configure (app, wares, ctx, env) {
direction = ' and rapidly dropping';
} else if (records[0].direction === 'DoubleUp') {
direction = ' and rapidly rising';
} else {
direction = records[0].direction;
}
var status = sbx.scaleMgdl(records[0].sgv) + direction + ' as of ' + moment(records[0].date).from(moment(sbx.time));
callback('Current blood glucose', status);
Expand Down