Milos Kozak
|
3df0e8f9ce
|
Merge branch 'dev' into smb060
|
2017-12-27 18:02:06 +01:00 |
|
Milos Kozak
|
259c7abffd
|
Merge pull request #567 from MilosKozak/AdrianLxM-patch-2
wear update
|
2017-12-27 16:31:24 +01:00 |
|
Milos Kozak
|
b25e403215
|
Merge pull request #566 from MilosKozak/rs-create-bond
RS create bond
|
2017-12-27 15:01:33 +01:00 |
|
AdrianLxM
|
9387665df9
|
wear update
|
2017-12-27 14:57:54 +01:00 |
|
AdrianLxM
|
79d05488c3
|
RS create bond
|
2017-12-27 02:24:26 +01:00 |
|
Milos Kozak
|
0ab259f61f
|
Merge branch 'dev' into smb060
|
2017-12-26 01:22:49 +01:00 |
|
Milos Kozak
|
72d6c4494b
|
add scrollview
|
2017-12-26 01:22:35 +01:00 |
|
Milos Kozak
|
162e73e64d
|
Merge branch 'dev' into smb060
|
2017-12-26 00:35:16 +01:00 |
|
Milos Kozak
|
8fdd16c305
|
QuickWizard detailed settings
|
2017-12-26 00:27:34 +01:00 |
|
Milos Kozak
|
e2f6e6a450
|
Merge pull request #547 from MilosKozak/wear-noFakebolusProgressDismiss2
don't show single connection timeouts on the watch
|
2017-12-25 20:44:39 +01:00 |
|
AdrianLxM
|
e50c6fc8ed
|
RS BLE modifications
|
2017-12-25 20:39:14 +01:00 |
|
Milos Kozak
|
dd58952b42
|
Merge pull request #548 from MilosKozak/COB-Wizard-idea
Use autosensdata for wizard instead of APSResult
|
2017-12-25 19:22:02 +01:00 |
|
Milos Kozak
|
b0bf9b5c79
|
Merge branch 'dev' into smb060
|
2017-12-25 17:01:53 +01:00 |
|
Milos Kozak
|
f968ec630c
|
fix non smooth ratio graph
|
2017-12-25 17:01:31 +01:00 |
|
Milos Kozak
|
ae30046c95
|
Merge branch 'dev' into smb060
|
2017-12-23 11:18:37 +01:00 |
|
Milos Kozak
|
3ce260dfe9
|
fix of fix
|
2017-12-23 11:18:17 +01:00 |
|
Milos Kozak
|
51de0f16c1
|
Merge branch 'dev' into smb060
|
2017-12-23 11:07:48 +01:00 |
|
Milos Kozak
|
6e09bfbbe4
|
fix wrong button type
|
2017-12-23 11:07:29 +01:00 |
|
Milos Kozak
|
7380065bd9
|
Merge branch 'dev' into smb060
|
2017-12-22 21:11:38 +01:00 |
|
Milos Kozak
|
2bb37a4bfc
|
fix doubled percentage when comming from NS
|
2017-12-22 21:03:36 +01:00 |
|
Milos Kozak
|
248d3d1697
|
proper select last used profile
|
2017-12-22 20:34:53 +01:00 |
|
Milos Kozak
|
93b954fffe
|
when using profile percentage limit basal rate to minimal value supported by pump
|
2017-12-22 20:17:31 +01:00 |
|
Milos Kozak
|
600e2ade1c
|
SingleClickButton
|
2017-12-22 19:50:16 +01:00 |
|
Milos Kozak
|
0851581f7f
|
Merge branch 'dev' into smb060
|
2017-12-22 12:03:11 +01:00 |
|
Milos Kozak
|
25667bc79e
|
RS fix crash when pairing is not confirmed on pump
|
2017-12-22 11:57:59 +01:00 |
|
Milos Kozak
|
e77e7ffbbd
|
Merge branch 'smb060' of https://gitlab.com/MilosKozak/AndroidAPS into smb060
|
2017-12-22 10:35:33 +01:00 |
|
Milos Kozak
|
99e5a39b33
|
Merge branch 'dev' into smb060
|
2017-12-22 10:34:45 +01:00 |
|
Milos Kozak
|
5bc6ea04c2
|
Double -> double
|
2017-12-22 03:27:13 +01:00 |
|
Milos Kozak
|
31975396a2
|
use joda-time
|
2017-12-22 02:55:40 +01:00 |
|
Milos Kozak
|
74abdc0271
|
fix disconnecting pump
|
2017-12-22 01:35:52 +01:00 |
|
Milos Kozak
|
6b23ba10bd
|
format output date to be displayed on iDevices correctly
|
2017-12-22 00:37:22 +01:00 |
|
Milos Kozak
|
a5c4495a5d
|
BolusWizard use 0 for insulin correction if in range
|
2017-12-22 00:17:46 +01:00 |
|
Milos Kozak
|
771f9eac1a
|
LocalProfile TimeListEdit min, max
|
2017-12-22 00:12:40 +01:00 |
|
Milos Kozak
|
5c7ad1e650
|
Merge pull request #553 from MilosKozak/AdrianLxM-patch-1
remove string with no default translation
|
2017-12-21 09:51:41 +01:00 |
|
Andrew Warrington
|
176c5f46ff
|
Ensure basal rate shown as a percentage if required according to user preferences.
|
2017-12-21 09:50:16 +01:00 |
|
Milos Kozak
|
fb12c0bc96
|
enable SMB for G5
|
2017-12-21 09:02:49 +01:00 |
|
Milos Kozak
|
cb2368f535
|
Merge branch 'dev' into smb060
|
2017-12-21 08:58:33 +01:00 |
|
AdrianLxM
|
2d2bd6d77a
|
remove string with no default translation
|
2017-12-21 08:26:55 +01:00 |
|
Milos Kozak
|
2bdda9af43
|
Rv2,RS fix loading events
|
2017-12-21 07:45:56 +01:00 |
|
Milos Kozak
|
5d3b307672
|
Merge branch 'dev' into smb060
|
2017-12-20 22:37:29 +01:00 |
|
Milos Kozak
|
adff0329dd
|
initialize lastCommandTime too after BT reset
|
2017-12-20 20:55:14 +01:00 |
|
Milos Kozak
|
0f43e95644
|
Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev
|
2017-12-20 20:45:35 +01:00 |
|
Milos Kozak
|
63b0efede3
|
allow to read status after every command
|
2017-12-20 20:45:21 +01:00 |
|
Milos Kozak
|
beb87acc9f
|
Merge pull request #552 from MilosKozak/nsoffline
Nsoffline
|
2017-12-20 20:17:30 +01:00 |
|
Milos Kozak
|
c33dd1e7d7
|
RS enable BT before scanning
|
2017-12-20 19:50:44 +01:00 |
|
Milos Kozak
|
70f4b72ff9
|
Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev
|
2017-12-20 18:26:52 +01:00 |
|
Milos Kozak
|
096b2e93a3
|
wait a few sec before disconnection for another command
|
2017-12-20 18:26:47 +01:00 |
|
Johannes Mockenhaupt
|
7651107167
|
Merge branch 'bolus-progress-dialog' into 'smb060'
Only show progress dialog for normal boluses, not SMBs.
See merge request MilosKozak/AndroidAPS!375
|
2017-12-20 16:58:33 +00:00 |
|
Johannes Mockenhaupt
|
c5089d821e
|
Merge branch 'disappearing-predections-checkbox' into 'smb060'
Overview: fix predictions checkbox disappearing after unchecking it.
See merge request MilosKozak/AndroidAPS!370
|
2017-12-20 16:58:12 +00:00 |
|
Johannes Mockenhaupt
|
2955dd7ec6
|
Only show progress dialog for normal boluses, not SMBs.
(cherry picked from commit b3d4607)
|
2017-12-20 17:42:39 +01:00 |
|