Commit graph

1868 commits

Author SHA1 Message Date
Milos Kozak
622097aabc fix wrong merge 2017-06-01 19:33:56 +02:00
Milos Kozak
32084094fd v 1.46 2017-06-01 18:59:39 +02:00
Milos Kozak
0a2cdff5e5 fix conflict 2017-05-31 09:29:39 +02:00
Milos Kozak
fb4ea156d6 disable loop as a fist action on superbolus 2017-05-31 09:26:08 +02:00
Milos Kozak
496872a58e resend after 10sec allowed 2017-05-31 09:14:31 +02:00
Milos Kozak
15f44e6085 basic sync for v2 2017-05-30 22:44:26 +02:00
Milos Kozak
b3d18b2537 disable bolus when pump is suspended 2017-05-30 18:23:07 +02:00
Milos Kozak
f5f7d28cc1 temp basal dialog design 2017-05-30 18:10:05 +02:00
Milos Kozak
3861bece54 extended bolus dialog 2017-05-30 15:07:44 +02:00
Milos Kozak
5f6a77983b Merge branch 'dev' into history 2017-05-29 22:42:17 +02:00
Milos Kozak
9e3edbb530 typo in checkbox handling 2017-05-29 22:36:04 +02:00
Milos Kozak
358de54322 redesign uploading treatments to NS 2017-05-29 21:45:59 +02:00
Milos Kozak
ec76908eca redesign uploading tb&eb to NS 2017-05-29 19:43:19 +02:00
Milos Kozak
dec627946d 0xE004 DanaRv2 message 2017-05-29 16:45:09 +02:00
Milos Kozak
9032deaaf3 better cache invalidate handling 2017-05-29 15:26:25 +02:00
Milos Kozak
c90de88ec1 better logging & double treatment plugin fix 2017-05-29 13:07:58 +02:00
Milos Kozak
442ff12aa1 initialize treatment data first by another message 2017-05-29 11:39:12 +02:00
Milos Kozak
fa695b9399 Merge branch 'dev' into history 2017-05-29 10:04:09 +02:00
Milos Kozak
e91acf3fed eliminate multiple resends in nsclient 2017-05-29 10:03:55 +02:00
Milos Kozak
4dff0e3a56 rename treatment interfaace functions to be more clear 2017-05-26 15:33:42 +02:00
Milos Kozak
0371e97391 Merge branch 'dev' into history 2017-05-26 15:06:04 +02:00
Milos Kozak
60a41b7dce switch order of commands when setting superbolus 2017-05-26 15:02:59 +02:00
Milos Kozak
0973ef97ac synchronize danar and danarv2 plugins 2017-05-26 14:41:05 +02:00
Milos Kozak
b8b9827b61 synchronize danar and danarkorean plugins 2017-05-26 13:28:27 +02:00
Milos Kozak
4b39578d9c fix adding contribution from faked extended 2017-05-26 12:07:56 +02:00
Milos Kozak
a9b251ce12 Merge branch 'history' of https://github.com/MilosKozak/AndroidAPS into history 2017-05-26 10:31:46 +02:00
Milos Kozak
559e07904c remove unneeded call 2017-05-26 10:31:05 +02:00
Milos Kozak
bb4302c02f Merge branch 'dev' into history 2017-05-26 10:24:48 +02:00
Milos Kozak
0b8499cb7f Merge pull request #251 from AdrianLxM/historytest1
lint disable 'ExtraTranslation'
2017-05-26 10:23:51 +02:00
AdrianLxM
7bf8a31e02 check for unused translations again 2017-05-26 10:11:38 +02:00
AdrianLxM
8b81960ceb remove unused strings from russion translation 2017-05-26 10:10:57 +02:00
Milos Kozak
650b792099 mark selected tab in treatments 2017-05-26 10:05:42 +02:00
AdrianLxM
cc4419f57a lint ExtraTranslation 2017-05-26 10:00:41 +02:00
AdrianLxM
99b8e48031 lint ExtraTranslation 2017-05-26 09:58:38 +02:00
Milos Kozak
a066580896 handle faked tempbasals synchronization 2017-05-26 08:54:48 +02:00
Milos Kozak
5fb72181ee careportal cage, sage, iage 2017-05-25 20:18:29 +02:00
Milos Kozak
87993c6163 return functionality of faking by extended boluses 2017-05-25 17:26:05 +02:00
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