Commit graph

1730 commits

Author SHA1 Message Date
Milos Kozak 59de00d663 Merge pull request #250 from apanasef/patch-1
Update strings.xml
2017-05-25 09:09:55 +02:00
fedor apanasenko 4406bb3f06 Update strings.xml 2017-05-25 09:51:08 +03:00
Milos Kozak 86af9eab3d stop extended bolus in actions 2017-05-24 20:37:58 +02:00
Milos Kozak 2ae30fe9b4 temptarget design 2017-05-24 19:42:23 +02:00
Milos Kozak bb9c68fd4d Merge remote-tracking branch 'origin/dev' into history 2017-05-24 19:18:30 +02:00
Milos Kozak 45df7ddd26 Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2017-05-24 18:50:10 +02:00
Milos Kozak f936580734 Russsian language 2017-05-24 18:46:19 +02:00
Milos Kozak 5208f23661 Temptargets under treatments 2017-05-23 23:56:53 +02:00
Milos Kozak 771fbdc303 sync of treatments, tempbasals, extended tested and working 2017-05-23 22:59:06 +02:00
Milos Kozak 8db1bd5ae5 tempbasal ns sync 2017-05-23 20:15:14 +02:00
Milos Kozak 7bed883368 Merge branch 'dev' into history 2017-05-22 22:13:42 +02:00
Milos Kozak e63ca588e3 Merge pull request #249 from AdrianLxM/cancel-tmp-on-suspend
cancel temp on suspend loop
2017-05-22 22:12:32 +02:00
Milos Kozak 6394421017 boluses working 2017-05-22 22:10:56 +02:00
Milos Kozak 6cd046459a original treatmens plugin removed, temp basals working 2017-05-22 20:58:05 +02:00
AdrianLxM 6d90f79521 also cancel temp on disable loop plugin 2017-05-22 19:14:57 +02:00
AdrianLxM 448a420fad cancel temp on suspend loop 2017-05-22 17:39:25 +02:00
Milos Kozak 85e6375026 make all getDao private 2017-05-22 12:52:19 +02:00
Milos Kozak 6004a17594 change database structures 2017-05-21 22:05:03 +02:00
Milos Kozak 3330c6a3fd Merge branch 'dev' into history 2017-05-21 16:46:13 +02:00
Milos Kozak 462849af12 russian language entry 2017-05-21 10:06:34 +02:00
Milos Kozak 012b6a2c26 v 1.45 2017-05-20 20:42:10 +02:00
Milos Kozak 56d54a6988 italian language 2017-05-20 20:41:23 +02:00
Milos Kozak 6ee6eff759 fix objective 1 2017-05-19 14:15:21 +02:00
Milos Kozak 0a182fb022 v 1.44 2017-05-17 18:54:48 +02:00
Milos Kozak 3ec08ab10f fix app crash 2017-05-16 20:02:09 +02:00
Milos Kozak 91fa355d8c remove unneeded code 2017-05-16 18:51:31 +02:00
Milos Kozak d0ae965054 fix basal rounding for v2 2017-05-16 18:02:58 +02:00
Milos Kozak 8452c42746 fix merge 2017-05-16 18:02:01 +02:00
Milos Kozak 8d2e7a34ae same workaround for korean danar 2017-05-16 17:58:18 +02:00
Milos Kozak a362c77afe fix temp basal netRatio display 2017-05-16 17:57:18 +02:00
Milos Kozak 8c5ce7290d more work on treatments fragment 2017-05-16 17:48:58 +02:00
Milos Kozak 0347ebaffb Merge pull request #245 from AdrianLxM/xdripstatusline
Workaround for DanaR truncation
2017-05-16 17:44:55 +02:00
AdrianLxM 44c3303e0e Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into xdripstatusline 2017-05-16 16:30:26 +02:00
AdrianLxM 3869b143c4 Workaround for DanaR truncation 2017-05-16 16:29:30 +02:00
Milos Kozak 3ee9bf5ff7 Merge branch 'dev' into history 2017-05-16 15:15:32 +02:00
Milos Kozak 1ad424a178 use Activity instead of FramgmentActivity 2017-05-16 15:15:28 +02:00
Milos Kozak 86c975e9d6 Add Italian language 2017-05-16 13:39:24 +02:00
Milos Kozak 45477f96ee Merge pull request #243 from AdrianLxM/xdripstatusline
basal and bolus step in DanaR Fragment
2017-05-16 13:28:39 +02:00
AdrianLxM 572e726678 basal and bolus step in DanaR Fragment 2017-05-16 13:10:02 +02:00
Milos Kozak 6fff6f63a4 bolus dialog redesign 2017-05-16 12:09:32 +02:00
Milos Kozak 4201709e2a finish careportal dialog redesign 2017-05-16 11:47:33 +02:00
Milos Kozak 54758d08d8 Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2017-05-16 09:47:23 +02:00
Milos Kozak 894923664e Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into history 2017-05-16 09:46:59 +02:00
Milos Kozak fd62c572af more treatments plugin tweaking 2017-05-16 09:46:09 +02:00
Milos Kozak 704ad383e9 careportal layout part1 2017-05-15 21:10:43 +02:00
Milos Kozak 25110cfea4 move database actions from pump to treatments plugin 2017-05-15 18:44:40 +02:00
Milos Kozak 85744548d8 typo in log 2017-05-14 11:48:59 +02:00
Milos Kozak 2aaa7f42d6 gradle update 2017-05-14 10:13:56 +02:00
Milos Kozak b1d9e647c6 Merge branch 'dev' into history 2017-05-12 23:14:07 +02:00
Milos Kozak b19bf628b8 Merge pull request #241 from AdrianLxM/xdripstatusline
Get correct calibration value if entered with (onboard) keyboard
2017-05-12 23:12:49 +02:00