Commit graph

2652 commits

Author SHA1 Message Date
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
Milos Kozak 6a6a02f212 Merge branch 'dev' into history 2017-05-12 23:04:39 +02:00
Milos Kozak 3f4cf57bbc make all Spiners centered 2017-05-12 23:04:14 +02:00
Milos Kozak 7bbd2cff2d consolidate DanaR code 2017-05-12 22:40:22 +02:00
Milos Kozak d641b0edd9 move rest of PumpInterface to TreatmentInterface 2017-05-12 21:21:31 +02:00
Milos Kozak 52177cead1 move part of PumpInterface to TreatmentInterface 2017-05-12 21:07:29 +02:00
AdrianLxM bb35f58eab Get correct calibration value if entered with (onboard) keyboard 2017-05-12 18:31:52 +02:00
Milos Kozak 22bb49aa60 hide DanaRv2 constraints 2017-05-12 18:05:22 +02:00
Milos Kozak 863e6454eb calculate iob based on insulin stored with treatment 2017-05-12 17:57:57 +02:00
Milos Kozak 9fc1d59bd0 allow to enforce Treatment plugin 2017-05-12 17:30:52 +02:00
Milos Kozak c6830baf8f Merge branch 'dev' into history 2017-05-12 16:35:07 +02:00
Milos Kozak bcd5cba962 Merge pull request #240 from AdrianLxM/xdripstatusline
some German translations
2017-05-12 16:29:41 +02:00
Milos Kozak abdc1022bf merge bolus & basal into one plugin 2017-05-12 16:27:33 +02:00
AdrianLxM a60afbceb9 typo 2017-05-12 16:08:48 +02:00
AdrianLxM a9e093ad0d some German translations 2017-05-12 16:06:14 +02:00
Milos Kozak ceb767dcd7 Merge pull request #239 from AdrianLxM/xdripstatusline
make buttons scrollable for small heights
2017-05-12 15:40:20 +02:00
AdrianLxM c88b8eaa9a make buttons scrollable for small heights 2017-05-12 15:26:16 +02:00
Milos Kozak eddd8ac56d Merge branch 'DanaRv2' into history 2017-05-12 13:06:05 +02:00
Milos Kozak e005d6bd69 Merge branch 'dev' into history 2017-05-12 13:05:57 +02:00
Milos Kozak 831b45fac5 DanaRv2 mod7 2017-05-12 13:05:29 +02:00
Milos Kozak df424ea5ff overview buttons 2017-05-12 11:06:33 +02:00
Milos Kozak 19c23a3c02 Merge pull request #238 from AdrianLxM/xdripstatusline
No permission to read statusline
2017-05-12 09:22:09 +02:00
AdrianLxM 7517ee4930 No permission to read statusline 2017-05-12 03:54:24 +02:00
Milos Kozak b782a5b8dc Merge branch 'dev' into history 2017-05-12 00:39:20 +02:00
Milos Kozak be4aa1131e Merge branch 'DanaRv2' into history 2017-05-12 00:39:08 +02:00
Milos Kozak 2610edae55 DanaRv2 Modify 6 2017-05-12 00:38:26 +02:00
Milos Kozak 8a11d232df Merge pull request #236 from slavidex/patch-37
Update strings.xml
2017-05-11 18:56:32 +02:00
Milos Kozak a0d31b2118 rename identical functions 2017-05-11 18:54:50 +02:00
Radoslav Radev d58ddf48c6 Update strings.xml 2017-05-11 17:01:49 +03:00
Milos Kozak 7e99ce416a move buttons back to bottom 2017-05-11 10:59:05 +02:00