Milos Kozak
|
c034f77b71
|
fix merge conflict 2
|
2016-11-11 13:09:50 +01:00 |
|
Milos Kozak
|
a341fa4343
|
fix merge conflict
|
2016-11-11 13:09:11 +01:00 |
|
Milos Kozak
|
ad475ace90
|
Merge pull request #63 from AdrianLxM/profileLongpress
profile switch dialog on long press on profile pill
|
2016-11-11 12:57:00 +01:00 |
|
Milos Kozak
|
753fb4664d
|
Merge pull request #61 from AdrianLxM/fill-action
Fill action
|
2016-11-11 12:56:21 +01:00 |
|
AdrianLxM
|
4a23d4ce0d
|
profile switch dialog on long press on profile pill
|
2016-11-11 12:29:13 +01:00 |
|
Milos Kozak
|
33100ea6b8
|
Merge pull request #62 from AdrianLxM/profileprefix
Show DanaR as part of profile name
|
2016-11-11 08:30:11 +01:00 |
|
AdrianLxM
|
41e68a03a2
|
SimpleProfile as profile name
|
2016-11-11 01:45:41 +01:00 |
|
AdrianLxM
|
4b27c9212a
|
DanaR as part of profile name
|
2016-11-11 01:45:28 +01:00 |
|
AdrianLxM
|
a6d5d68938
|
fill action
|
2016-11-11 00:56:15 +01:00 |
|
AdrianLxM
|
5f4a8330e1
|
Merge pull request #12 from MilosKozak/master
update from milos master
|
2016-11-10 23:46:10 +01:00 |
|
Milos Kozak
|
e8d169f078
|
allow automated actions only whem pump is initialized
|
2016-11-10 23:33:12 +01:00 |
|
Milos Kozak
|
86a3df1996
|
lower allowed diff to perform action from 0.1 to 0.05
|
2016-11-10 23:33:12 +01:00 |
|
Milos Kozak
|
c71f72d88c
|
Merge pull request #60 from AdrianLxM/profile_overview
Profile overview
|
2016-11-10 23:29:42 +01:00 |
|
AdrianLxM
|
7b4b4f7cfc
|
Overview profile redesign
|
2016-11-10 23:20:23 +01:00 |
|
AdrianLxM
|
4ee87d1cca
|
basal profile on overview
|
2016-11-10 21:03:26 +01:00 |
|
AdrianLxM
|
80e875b821
|
Merge pull request #11 from MilosKozak/master
update from milos master
|
2016-11-10 21:02:43 +01:00 |
|
Milos Kozak
|
585d3fbb2c
|
Merge pull request #59 from AdrianLxM/uploadOnly2
Upload only2
|
2016-11-10 19:39:45 +01:00 |
|
AdrianLxM
|
a6ae92bb2f
|
Receive profile updates on uploadOnly when NS-Profiles are used
|
2016-11-10 18:53:01 +01:00 |
|
AdrianLxM
|
c900d6611c
|
Warn on "refresh treatments from NS" button in upload only mode.
|
2016-11-10 18:52:42 +01:00 |
|
AdrianLxM
|
f85f04d33f
|
NS upload only
|
2016-11-10 18:33:50 +01:00 |
|
AdrianLxM
|
37813861ec
|
Merge pull request #10 from MilosKozak/master
update to milos master
|
2016-11-10 17:59:39 +01:00 |
|
Milos Kozak
|
21f732b378
|
report app start/restart to NS
|
2016-11-10 16:42:59 +01:00 |
|
Milos Kozak
|
a5778b4916
|
Merge pull request #58 from AdrianLxM/loadmorehightemps
Load more "extended bolus" high temps
|
2016-11-10 13:54:11 +01:00 |
|
AdrianLxM
|
5088b84417
|
Receive profile updates on uploadOnly when NS-Profiles are used
|
2016-11-10 13:50:13 +01:00 |
|
Milos Kozak
|
156f42da5f
|
always report active profile
|
2016-11-10 13:15:23 +01:00 |
|
Milos Kozak
|
770f44118b
|
Merge pull request #56 from AdrianLxM/hapticFeedback
Haptic feedback
|
2016-11-10 10:02:26 +01:00 |
|
Milos Kozak
|
8d360f837d
|
Merge pull request #57 from warstar2187/master
kr translation update
|
2016-11-10 10:02:01 +01:00 |
|
AdrianLxM
|
3ee1cf5023
|
haptic feedback for loop pill on overview
|
2016-11-10 00:02:51 +01:00 |
|
AdrianLxM
|
3a84abb4f1
|
Merge pull request #9 from MilosKozak/master
update to Milos master
|
2016-11-09 12:41:11 +01:00 |
|
Milos Kozak
|
8707b42526
|
Merge pull request #54 from AdrianLxM/confirm_reset_db
Confirm reset db
|
2016-11-08 23:02:03 +01:00 |
|
AdrianLxM
|
aaba503cd0
|
Fix crash due to not found theme
|
2016-11-08 22:57:56 +01:00 |
|
Milos Kozak
|
bad7e5d7c4
|
gradle fix
|
2016-11-08 22:55:08 +01:00 |
|
AdrianLxM
|
341d7222e5
|
Strings for reset DB
|
2016-11-08 22:36:47 +01:00 |
|
AdrianLxM
|
218ccc803b
|
Ask before resetting DB
|
2016-11-08 22:35:57 +01:00 |
|
AdrianLxM
|
d3582dab36
|
Merge pull request #8 from MilosKozak/master
Update to milos master
|
2016-11-08 22:34:07 +01:00 |
|
Milos Kozak
|
a2d4f22bd7
|
added git HEAD and version to pump status and logs
|
2016-11-08 19:10:25 +01:00 |
|
Milos Kozak
|
94a7033e0c
|
always upload current basal rate
|
2016-11-08 17:55:39 +01:00 |
|
Milos Kozak
|
a4a9efd812
|
TAB_VIEW_PADDING_DIPS = 9
|
2016-11-08 14:24:02 +01:00 |
|
warstar2187
|
1f35018148
|
Update strings.xml
|
2016-11-08 20:04:19 +09:00 |
|
warstar2187
|
9ae3d88f9c
|
Update DanaRPlugin.java
|
2016-11-08 19:59:54 +09:00 |
|
Milos Kozak
|
4a4dc04865
|
fix iob reporting to NS
|
2016-11-08 10:29:24 +01:00 |
|
Milos Kozak
|
b0c4f0f655
|
Merge pull request #53 from AdrianLxM/TDD-History
Tdd history
|
2016-11-08 07:17:33 +01:00 |
|
AdrianLxM
|
ff66edf064
|
Add TDD to DanaR daily view
... also don't show the time for the day. It is always 00:00 anyways.
|
2016-11-08 06:11:50 +01:00 |
|
AdrianLxM
|
ede982c8c5
|
Update danar_history_item.xml
|
2016-11-08 06:08:12 +01:00 |
|
AdrianLxM
|
69355c5609
|
Merge pull request #7 from MilosKozak/master
Update to Milos master
|
2016-11-08 06:01:58 +01:00 |
|
Milos Kozak
|
a5d68395c8
|
Merge pull request #52 from AdrianLxM/activityContrib
Activity contrib
|
2016-11-07 16:03:55 +01:00 |
|
AdrianLxM
|
93accc0d9f
|
Add in basalIOB.activity
|
2016-11-07 15:18:48 +01:00 |
|
AdrianLxM
|
8bdc86f359
|
Calculate activityContrib for TempBasal
|
2016-11-07 15:17:16 +01:00 |
|
AdrianLxM
|
82443bc8ab
|
Merge pull request #6 from MilosKozak/master
Update to Milos master
|
2016-11-07 15:14:44 +01:00 |
|
Milos Kozak
|
48388496f5
|
Merge pull request #51 from AdrianLxM/patch-8
Add base basal rate to Overview when temp is running
|
2016-11-07 10:19:44 +01:00 |
|