Commit Graph
100 Commits
Author SHA1 Message Date
Jason Calabrese a51742ed5a resolve conflicts 2017-03-17 21:31:40 -07:00
Jason CalabreseandGitHub 192c4d0533 stop using uniq for SGVs since we use buckets (#2370)
* stop using uniq for SGVs since we use buckets
also enables more detailed monitoring when there is data from multiple devices with the same mills

* clean up

* bump version to 0.9.3-dev-20161224
2016-12-24 10:34:34 -08:00
Jason CalabreseandGitHub c7bc4d3ea7 Merge pull request #2368 from nightscout/wip/null-iob-fix
fix bug with null value for openaps.iob
2016-12-24 10:06:24 -08:00
Jason Calabrese eee2baa12e fix bug with null value for openaps.iob 2016-12-23 00:00:49 -08:00
Jason CalabreseandGitHub 4de3d5ef25 Merge pull request #2357 from nightscout/wip/fixes-debug-etc
fixes, debug, etc
2016-12-20 22:57:54 -08:00
Jason Calabrese 2001107b31 bump version to 0.9.3-dev-20161219 2016-12-19 20:57:08 -08:00
Jason Calabrese d49319b147 show last carbs even if careportal cob is 0 2016-12-19 20:50:05 -08:00
Jason Calabrese 3172c82b2d make sure old pill tooltips aren't shown if there isn't a new tooltip 2016-12-19 20:29:15 -08:00
Jason Calabrese 0dbfcfb3e5 clean up 2016-12-19 20:28:24 -08:00
Jason Calabrese fc6a936d6a use utils.scaleMgdl since there are times where client.sbx hasn't been defined yet 2016-12-19 20:00:02 -08:00
Jason Calabrese 5e8d15cac5 add option to disable bundle minification 2016-12-19 19:54:41 -08:00
Jason CalabreseandGitHub 218b00a8f3 Merge pull request #2342 from nightscout/wip/nan-bg-fix
go back to using scaleEntry instead of scaleMgdl
2016-12-12 18:35:56 -08:00
Jason Calabrese 25e5af5390 bump version to 0.9.3-dev-20161212b 2016-12-12 18:20:38 -08:00
Jason Calabrese d3ab423308 Merge branch 'dev' into wip/nan-bg-fix 2016-12-12 18:19:45 -08:00
Jason Calabrese bc5d5d9f0b go back to using scaleEntry instead of scaleMgdl 2016-12-12 18:05:23 -08:00
Jason CalabreseandGitHub 06942210d3 Merge pull request #2339 from nightscout/wip/delta-details2
improve delta device info + refactoring and cleanup
2016-12-12 00:18:29 -08:00
Jason Calabrese 5e6f136e98 bump version to 0.9.3-dev-20161212 2016-12-12 00:09:40 -08:00
Jason Calabrese 6032c8f8cd wait till all deviceInfos are collected before checking length 2016-12-12 00:08:21 -08:00
Jason Calabrese efe69e5095 refactoring: move deviceName, timeFormat, formatAgo, timeAt to utils 2016-12-11 23:57:48 -08:00
Jason CalabreseandGitHub 36b33ef4c9 Merge pull request #2335 from beached/patch-5
Added proper units on glucose
2016-12-11 23:06:24 -08:00
Jason CalabreseandGitHub e8078aa577 Merge pull request #2333 from beached/patch-3
Added proper display of metre bg reads
2016-12-11 22:55:03 -08:00
Jason CalabreseandGitHub ed2bee57cf Merge pull request #2331 from beached/patch-1
Fixed reference of undefined error
2016-12-11 18:36:50 -08:00
Jason CalabreseandGitHub 00ba4e8cd4 Merge pull request #2328 from nightscout/wip/delta-details
Show extra info when there are multiple devices upload cgm data
2016-12-11 11:01:51 -08:00
Jason Calabrese 4d1aadc2c9 don't forget to check the length 2016-12-11 10:52:49 -08:00
Jason Calabrese 103fce06af bump version to 0.9.3-dev-20161211 2016-12-11 10:46:17 -08:00
Jason Calabrese c2e3ec4d0c use _.forIn, remove name field, fix bug 2016-12-11 10:35:18 -08:00
Jason Calabrese 37241b5a37 Show extra info when there are multiple devices uploading cgm data 2016-12-11 10:18:43 -08:00
Jason Calabrese ff10eb8547 Merge branch 'dev' of github.com:nightscout/cgm-remote-monitor into dev 2016-12-06 17:03:24 -08:00
Jason CalabreseandGitHub c82f6c060c Merge pull request #2305 from rickggaribay/patch-1
A couple of doc suggestions
2016-12-06 17:02:32 -08:00
Jason Calabrese b2d4433d7f bump version to 0.9.2 2016-12-06 16:59:32 -08:00
Jason CalabreseandGitHub b78312d578 Merge pull request #2312 from nightscout/wip/pin-jsonwebtoken
pin jsonwebtoken to 7.1.9
2016-12-06 16:14:17 -08:00
Jason Calabrese 451cf64db2 pin jsonwebtoken to 7.1.9 2016-12-06 16:04:21 -08:00
Jason Calabrese 9e5df41539 bump version to 0.9.2-dev-20161206 2016-12-06 16:00:13 -08:00
Jason CalabreseandGitHub 2e98adab9f Merge pull request #2289 from PieterGit/dutch_translations
Shortened dutch translations
2016-12-02 08:40:31 -08:00
Jason CalabreseandGitHub 2ca39d086e Merge pull request #2280 from nightscout/wip/cob-devicestatus
Check devicestatus for COB from OpenAPS and Loop
2016-12-01 19:15:25 -08:00
Jason Calabrese a145fd1dab bump version to 0.9.2-dev-20161201 2016-12-01 19:08:32 -08:00
Jason CalabreseandGitHub 0de7ff4739 Merge pull request #2283 from warstar2187/master
Fix activityContrib
2016-12-01 18:58:49 -08:00
Jason Calabrese 57510b106e add tests and clean up 2016-12-01 18:44:00 -08:00
Jason Calabrese 82006dfac8 clean up 2016-12-01 01:07:48 -08:00
Jason Calabrese ce12f6cbcb Check devicestatus for COB from OpenAPS and Loop along with calculating from treatments 2016-12-01 01:07:38 -08:00
Jason CalabreseandGitHub 2ee48322ec Merge pull request #2279 from nightscout/wip/alexa-fixes
alexa fixes
2016-11-30 20:23:53 -08:00
Jason Calabrese 51fa0e0671 bump version to 0.9.2-dev-20161130 2016-11-30 20:14:38 -08:00
Jason Calabrese d7eccc492d ignore some direction like None and Not Computable 2016-11-30 20:10:39 -08:00
Jason Calabrese 97844ea51c fix iob test for new rounding 2016-11-30 20:09:31 -08:00
Jason CalabreseandGitHub 8b09a06248 Merge pull request #2267 from nightscout/wip/alexa-mmol
Alexa mmol conversion from dexterbooty
2016-11-27 12:07:56 -08:00
Jason CalabreseandGitHub 4e59a66d97 Merge pull request #2259 from martijnmcb/patch-3
Small corrections in Dutch [NL] part
2016-11-27 12:06:14 -08:00
Jason Calabrese 216efae45c add back some of the readme that got lost in a merge 2016-11-26 14:51:43 -08:00
Jason CalabreseandGitHub d407bab209 Merge pull request #2247 from nightscout/dev
0.9.1 (Grilled Cheese)
2016-11-25 12:21:28 -08:00
Jason Calabrese beacd91002 bump version to 0.9.1 2016-11-25 12:05:53 -08:00
Jason CalabreseandGitHub b5ed598a54 Merge pull request #2258 from nightscout/xpucuto-patch-2
Fix Bulgarian translation November 22nd
2016-11-25 11:57:09 -07:00
Jason Calabrese 07bbfd5cf2 fix typos 2016-11-25 10:39:37 -08:00
Jason Calabrese 8c51cdf34f Merge branch 'patch-2' of https://github.com/xpucuto/cgm-remote-monitor into xpucuto-patch-2 2016-11-25 10:37:35 -08:00
Jason CalabreseandGitHub caecef7e27 Merge pull request #2257 from nightscout/wip/rajat-upbat
Upbat Alexa fix from Rajat
2016-11-25 11:26:06 -07:00
Jason Calabrese 06ef9e2ae7 fix upbat test to match new results using display value again 2016-11-25 10:16:18 -08:00
Jason Calabrese 295e8799e8 fix upbat test to match new results using display value 2016-11-25 10:09:20 -08:00
Jason CalabreseandGitHub 089ac22ac8 Merge pull request #2250 from martijnmcb/patch-1
Patch 1
2016-11-22 22:40:03 -07:00
Jason CalabreseandGitHub 404cbd289e Merge pull request #2246 from dm61/dev
Prioritize Loop IOB over Pump IOB if both are available
2016-11-21 22:52:13 -07:00
Jason Calabrese 50de48608e bump version to 0.9.1-dev-20161121 2016-11-21 22:33:19 -07:00
Jason CalabreseandGitHub 1b65d540e0 Merge pull request #2194 from nightscout/wip/import-ddata-audio
import settings by url; new ddata endpoints; sgv radio
2016-11-21 21:19:05 -07:00
Jason Calabrese 80aa36976d add count example to readme 2016-11-21 20:37:39 -07:00
Jason Calabrese 2fd8248914 Merge branch 'dev' into wip/import-ddata-audio 2016-11-21 20:27:06 -07:00
Jason CalabreseandGitHub 2e844af7a9 Merge pull request #2245 from nightscout/francescaneri-patch-1
update language ITA 0.9.1
2016-11-21 20:21:00 -07:00
Jason CalabreseandGitHub d26b52db10 Merge pull request #2240 from MilosKozak/jungsomyeong-patch-14
Jungsomyeong patch 14
2016-11-21 19:41:39 -07:00
Jason CalabreseandGitHub 80a4eb4e4c Merge pull request #2229 from nightscout/wip/range-align-fix
fix alignment of the range selectors in some cases
2016-11-18 07:53:22 -08:00
Jason Calabrese 4a6b6a50f0 add padding to the bottom of the bg status to fix alignment of the range selectors in some cases 2016-11-17 16:18:52 -08:00
Jason CalabreseandGitHub 204280895c Merge pull request #2222 from dougtakeuti/patch-5
4th Portuguese update
2016-11-15 13:05:59 -08:00
Jason CalabreseandGitHub cff9464dd5 Merge pull request #2218 from dougtakeuti/patch-5
3rd Portuguese Update
2016-11-14 10:29:20 -08:00
Jason Calabrese e32927588c bump version to 0.9.1-dev-20161112 2016-11-12 14:47:52 -08:00
Jason CalabreseandGitHub d7768dc537 Merge pull request #2200 from jasoncalabrese/wip/alexa
Alexa Integration
2016-11-12 14:35:45 -08:00
Jason Calabrese 0b9c4aa477 replace more Date.now()s with sbx.time 2016-11-12 14:19:37 -08:00
Jason Calabrese 929f876e09 use sbx.time instead of Date.now() 2016-11-12 14:15:33 -08:00
Jason Calabrese dc1aaee68f check that alexa requests have readable permissions (with token support); bug fix 2016-11-12 14:02:58 -08:00
Jason Calabrese 9e57218e7e replace more fromNow's 2016-11-12 13:15:43 -08:00
Jason Calabrese 1375bb92ad fix basal alexa test 2016-11-12 13:12:31 -08:00
Jason CalabreseandGitHub dd439df7d9 Merge pull request #2211 from baembel08/patch-4
Update azuredeploy.json mongo collection
2016-11-12 12:59:02 -08:00
Jason CalabreseandGitHub f1152344ec Merge pull request #2217 from dougtakeuti/patch-4
2nd Portuguese Update
2016-11-12 12:58:29 -08:00
Jason Calabrese 89d354eadd merge in dev, fix conflict in readme 2016-11-12 12:57:37 -08:00
Jason Calabrese 00b93d572d refactoring, add alexa tests 2016-11-12 12:55:21 -08:00
Jason CalabreseandGitHub 1b1da5632f Merge pull request #2207 from nightscout/wip/enable-cors
option to enable CORS
2016-11-07 23:54:21 -08:00
Jason Calabrese c970cb71a3 clean up 2016-11-07 22:43:38 -08:00
Jason Calabrese c60920cdad fix link 2016-11-07 20:24:32 -08:00
Jason Calabrese 0b98c56fa0 added cors to readme 2016-11-07 20:22:10 -08:00
Jason Calabrese 796b70b77c option to enable CORS 2016-11-07 20:17:36 -08:00
Jason CalabreseandGitHub a242b31c42 Merge pull request #2206 from dougtakeuti/patch-3
Portuguese translation
2016-11-07 15:58:18 -08:00
Jason Calabrese f4919d76b0 fix some codacy warnings 2016-11-06 18:28:34 -08:00
Jason CalabreseandGitHub bdb6db2a8f Formating 2016-11-06 15:37:36 -08:00
Jason Calabrese 4138690247 fix link in toc 2016-11-06 00:52:36 -07:00
Jason Calabrese 1cebfa714d add link in toc 2016-11-06 00:51:58 -07:00
Jason Calabrese e96bb71770 require alexa to be enabled, add to readme 2016-11-06 00:48:45 -07:00
Jason Calabrese e4862cc3f7 basic OpenAPS Alexa integration 2016-11-06 00:41:52 -07:00
Jason Calabrese a47d8e0cbf Alexa integration from some friends of Nightscout 2016-11-06 00:41:15 -07:00
Jason Calabrese 8aa4b63c03 when loading a frame of ddata stop at requested time instead of adding 2 hours 2016-11-05 14:45:25 -07:00
Jason Calabrese a8db824977 also support importing extended settings; add IMPORT_CONFIG to readme; clean up 2016-11-05 13:00:08 -07:00
Jason Calabrese b7f1257c3e codacy clean up 2016-11-04 01:31:18 -07:00
Jason Calabrese 57b3c6cc6d merge in wip/audio-experiments, update to work with new client init 2016-11-04 01:10:31 -07:00
Jason Calabrese d09eddddb1 Merge branch 'wip/audio-experiments' of https://github.com/nightscout/cgm-remote-monitor into wip/import-ddata-audio 2016-11-04 00:50:41 -07:00
Jason Calabrese a7f734aa84 resolve conflicts and cleanup after merging wip/ddata-endpoints 2016-11-04 00:50:19 -07:00
Jason Calabrese bedb76a62a resolve conflict after merging wip/import-boot-config 2016-11-03 23:47:27 -07:00
Jason CalabreseandGitHub 8dc3bbf947 Merge pull request #2175 from moomoobloo/wip/minify
minify bundle.js
2016-10-31 08:35:36 -07:00
Jason CalabreseandGitHub d6a5559769 Merge pull request #2177 from sebastianlorant/patch-13
Swedish_v4
2016-10-31 08:34:47 -07:00