Commit graph

956 commits

Author SHA1 Message Date
Tim Gunn 585f4e2bc2 merge in SMBInterval 2019-08-10 16:18:58 +12:00
Tim Gunn 2b4f27421a Merge branch 'uam-smb-basal' into update-oref 2019-08-10 16:00:31 +12:00
Milos Kozak 6802c0ea85 fix activities 2019-08-08 18:39:56 +02:00
Milos Kozak 8f3c4e25c5 DanaRFragment -> kotlin 2019-08-07 15:50:37 +02:00
Milos Kozak c1a1cc3108 ProfileViewerDialog -> kotlin 2019-08-06 01:19:24 +02:00
Milos Kozak 49ae8747fd remove code redundancy 2019-08-03 21:22:24 +02:00
Milos Kozak 7db98bf810 Splash logo 2019-08-01 16:29:20 +02:00
Milos Kozak 3ffa75aede
Merge pull request #1899 from MarieT1D/patch-1
string.xml: specify description for Open Loop setting
2019-07-28 14:25:27 +02:00
Marie 0ea9118fc6
string.xml: specify description for Open Loop setting
Adding "Open" to description of 'Minimum request change' in open loop mode and adding " in %" to value,

so that people immediatly know for what it's for
2019-07-28 13:32:16 +02:00
Milos Kozak e98ae5078f
Merge pull request #1857 from MilosKozak/iobfix
calculate iob prediction based on autosens
2019-07-28 11:38:21 +02:00
Milos Kozak a0854a895c Language cleanup 2019-07-28 10:20:31 +02:00
Milos Kozak 7db694044d Merge branch 'dev' into iobfix 2019-07-28 01:49:52 +02:00
Milos Kozak b448bbe670
Merge branch 'dev' into signature_verifier 2019-07-26 22:28:22 +02:00
Milos Kozak 595bf0314c Merge branch 'dev' into iobfix 2019-07-26 00:39:40 +02:00
Milos Kozak 76439777b0 Better bolus wizard warning 2019-07-25 23:32:00 +02:00
Milos Kozak 97c75052e5 Merge branch 'dev' into automation 2019-07-25 18:22:46 +02:00
Milos Kozak 0d5ea4f700 add Lithuanian language 2 2019-07-25 16:43:39 +02:00
Milos Kozak 838e19877b add Lithuanian language 2019-07-25 16:43:00 +02:00
Milos Kozak 09270f36bf
Merge branch 'dev' into automation 2019-07-25 16:17:16 +02:00
Milos Kozak 0b28c92c2d
Merge pull request #1868 from andyrozman/medtronic_andy_merge
Medtronic driver merge
2019-07-25 16:15:17 +02:00
Milos Kozak 283fa0debf fix string 2019-07-25 15:17:58 +02:00
Milos Kozak 51bc5d3618 Merge branch 'dev' into medtronic_andy_merge 2019-07-25 13:40:37 +02:00
Andy Rozman da0b3c84f9 - added translatable="false" to all new keys 2019-07-24 16:42:10 +01:00
Andy Rozman b1320c4bcb - added keys for preferences and fixes on all other places 2019-07-23 16:09:56 +01:00
Milos Kozak e02681ac31
Merge branch 'dev' into automation 2019-07-23 13:13:26 +02:00
Milos Kozak 58da7fc854 Preconditions, code cleanup 2019-07-16 21:57:45 +02:00
Milos Kozak c0d85e85a0 Merge branch 'dev' into iobfix 2019-07-15 15:52:02 +02:00
Milos Kozak b26b583f2b
Merge pull request #1867 from Paulusma/IA-in-BG-graph
Insulin Activity in bg graph
2019-07-15 15:27:04 +02:00
Milos Kozak 7ddf5dd5f6 make translation easier 2019-07-15 12:33:03 +02:00
Milos Kozak c4ba821dc1
Merge branch 'dev' into automation 2019-07-14 20:00:42 +02:00
Milos Kozak 8c2c2b21ea
Merge branch 'dev' into medtronic_andy_merge 2019-07-14 19:50:07 +02:00
Milos Kozak 72ff3e1e7f
Merge branch 'dev' into IA-in-BG-graph 2019-07-14 19:44:01 +02:00
Johannes Mockenhaupt 0e37228a07
Tidepool: remove category summary (is never displayed). 2019-07-14 11:54:03 +02:00
Milos Kozak 968bccaacc Merge branch 'dev' into tidepool 2019-07-13 17:45:34 +02:00
Paulus 96d20d835f Modified string resources, included IA on both primary and secondary graph 2019-07-13 17:03:04 +02:00
Andy Rozman 0b1ef81d40 Updated files that had only formating changes and removed lcoal files. 2019-07-13 12:26:42 +01:00
Paulus fc1dd360b3 split menu for 1st & secondary graphs 2019-07-11 21:17:41 +02:00
Milos Kozak 4df1127a8c jetpack compliance, code cleanup, extracted resources 2019-07-11 18:18:05 +01:00
Paulus 4ff9206dad #1851 included code from fra-orolo, now using color identifier for activity and line is optional in graph 2019-07-09 11:42:40 +02:00
Andy Rozman 992f69daaa medtronic-0.12.0-SNAPSHOT
- Merge branch 'dev' into medtronic_andy
2019-07-05 14:18:28 +01:00
Milos Kozak c0345ce56c
Merge branch 'dev' into automation 2019-07-04 23:37:36 +01:00
Milos Kozak 61097b3ac6
Merge branch 'dev' into sdk28 2019-07-04 20:06:09 +01:00
Milos Kozak 323c282b9f Tidepool in engineering mode only 2019-06-30 15:38:30 +02:00
Andy Rozman a77f10dc94 - small fix for 0.11.8 2019-06-29 18:25:12 +01:00
Andy Rozman 32fad688fc Merge branch 'dev' into medtronic_andy 2019-06-25 14:50:41 +01:00
Milos Kozak 7e8059c3d8
Merge branch 'automation' into triggerLastBolus 2019-06-21 15:34:06 +02:00
Milos Kozak a9d8420451
Merge branch 'automation' into deltaTrigger 2019-06-21 15:22:40 +02:00
Roumen Georgiev 046e2b7495 added triggerCob 2019-06-20 11:12:03 +03:00
Roumen Georgiev 15f6a577c2 trigger bolusAgo 2019-06-19 14:58:13 +03:00
Tebbe Ubben 5af80ceb02 Support for new Dexcom app 2019-06-19 01:38:55 +02:00