Milos Kozak
|
e6f173f305
|
fix merge conflict
|
2017-06-10 13:43:02 +02:00 |
|
|
Milos Kozak
|
6ce35bc36a
|
Merge branch 'history' of https://github.com/MilosKozak/AndroidAPS into history
|
2017-06-10 13:41:36 +02:00 |
|
|
Milos Kozak
|
f65d75e553
|
specify source at detailedbolusinfo
|
2017-06-10 13:39:51 +02:00 |
|
|
Milos Kozak
|
dfaf3a07c2
|
typo
|
2017-06-08 23:22:43 +02:00 |
|
|
Milos Kozak
|
4231557c9f
|
fix axis
|
2017-06-08 23:18:38 +02:00 |
|
|
Milos Kozak
|
96d760ba62
|
fix adding basals to database in danar driver
|
2017-06-08 22:26:32 +02:00 |
|
|
Milos Kozak
|
74268675af
|
optimize overview graph drawing
|
2017-06-08 22:14:55 +02:00 |
|
|
Milos Kozak
|
a39f61284a
|
profileswitch sync & v2 bolus fix
|
2017-06-08 20:52:33 +02:00 |
|
|
Milos Kozak
|
e09fba93cb
|
update graph properly
|
2017-06-08 20:08:02 +02:00 |
|
|
Milos Kozak
|
e8be720138
|
temptarget sync
|
2017-06-08 19:34:46 +02:00 |
|
|
Milos Kozak
|
1153c33200
|
tempbasal & extendedbolus 3way sync
|
2017-06-08 18:15:17 +02:00 |
|
|
Milos Kozak
|
4d30ba9cdb
|
treatments PumpHistory and NS mark
|
2017-06-07 19:43:19 +02:00 |
|
|
Johannes Mockenhaupt
|
d00e7f8b00
|
Clear notification when accepting temp basal.
This clears the notification about a new suggested basal when the
temp basal is accepted from within AndroidAPS.
|
2017-06-07 18:10:08 +02:00 |
|
|
Milos Kozak
|
e5a326c377
|
nsclient always use virtual pump, more sync fixes
|
2017-06-07 18:10:07 +02:00 |
|
|
Milos Kozak
|
fec56e7c23
|
fix bug in sync
|
2017-06-07 08:09:15 +02:00 |
|
|
Milos Kozak
|
8fab76ee9b
|
treatments synchronization improvement
|
2017-06-07 00:11:33 +02:00 |
|
|
Milos Kozak
|
5931abc860
|
BgReading optimization
|
2017-06-06 17:14:17 +02:00 |
|
|
Milos Kozak
|
a180e182eb
|
optimize rendering graph
|
2017-06-06 15:49:41 +02:00 |
|
|
Milos Kozak
|
8b8a8fcb45
|
remote time update extra task
|
2017-06-06 15:06:00 +02:00 |
|
|
Milos Kozak
|
b8b00dbc81
|
revert asynctask
|
2017-06-06 14:49:17 +02:00 |
|
|
Milos Kozak
|
f93090b012
|
allow only 1 updategui running
|
2017-06-06 10:56:26 +02:00 |
|
|
Milos Kozak
|
17f59df597
|
gui tweaking, pump battery event
|
2017-06-06 08:21:11 +02:00 |
|
|
Milos Kozak
|
7c7638a7a1
|
extract color resources
|
2017-06-05 15:34:22 +02:00 |
|
|
Milos Kozak
|
e0a6db22a2
|
run rendering calculations on background
|
2017-06-05 15:16:07 +02:00 |
|
|
Milos Kozak
|
88b9caa357
|
absolute basal line
|
2017-06-05 01:12:36 +02:00 |
|
|
Milos Kozak
|
dd7e777a24
|
simplify graph series
|
2017-06-05 00:50:31 +02:00 |
|
|
Milos Kozak
|
8934d2d6b9
|
Merge branch 'history' of https://github.com/MilosKozak/AndroidAPS into history
|
2017-06-04 22:38:42 +02:00 |
|
|
Milos Kozak
|
a3db05ec39
|
v 1.50 & fix conflict
|
2017-06-04 22:37:58 +02:00 |
|
|
Milos Kozak
|
ac038a9252
|
bigger bg dots on tablet
|
2017-06-04 22:27:36 +02:00 |
|
|
Milos Kozak
|
013025b750
|
fix crashing at start
|
2017-06-04 01:15:11 +02:00 |
|
|
Milos Kozak
|
1702ce7702
|
adjusting nsclient mode
|
2017-06-04 00:46:44 +02:00 |
|
|
Milos Kozak
|
b40cf99201
|
gui tweaking
|
2017-06-03 22:43:35 +02:00 |
|
|
Milos Kozak
|
1a4e60d3a8
|
process duration correctly
|
2017-06-02 23:59:34 +02:00 |
|
|
Milos Kozak
|
d365fcd6a4
|
fix bugs & design tweaking
|
2017-06-02 23:25:11 +02:00 |
|
|
Milos Kozak
|
6ca4811e8e
|
profiles visualisation
|
2017-06-02 12:27:21 +02:00 |
|
|
Milos Kozak
|
f267c85377
|
it compiles now with profiles
|
2017-06-02 10:25:49 +02:00 |
|
|
Milos Kozak
|
a19a5a442b
|
some v2 driver tweaking
|
2017-06-01 20:52:38 +02:00 |
|
|
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 |
|
|
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
|
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 |
|