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 |
|
|
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 |
|
|
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 |
|
|
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
|
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 |
|
|
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
|
aaba503cd0
|
Fix crash due to not found theme
|
2016-11-08 22:57:56 +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 |
|
|
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 |
|
|
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
|
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
|
2e6a37dcbd
|
Add base basal rate to Overview when temp is running
Now that there is more space with less buttons, it should fit ;)
|
2016-11-07 10:18:16 +01:00 |
|
|
Milos Kozak
|
925b5612fc
|
Merge pull request #49 from AdrianLxM/disableLoopLongpress
Disable loop on Longpress on Loop-Status in Overview
|
2016-11-07 10:14:14 +01:00 |
|
|
Milos Kozak
|
3533ec16ba
|
Merge pull request #50 from AdrianLxM/patch-7
fix for net IOB
|
2016-11-07 09:36:16 +01:00 |
|
|
Milos Kozak
|
6263b98683
|
Merge pull request #39 from warstar2187/master
Update strings.xml
|
2016-11-07 09:13:21 +01:00 |
|
|
AdrianLxM
|
e948a6f955
|
fix for net IOB
|
2016-11-07 07:55:41 +01:00 |
|
|
AdrianLxM
|
686593986c
|
Update PreferencesActivity.java
|
2016-11-07 01:02:08 +01:00 |
|
|
AdrianLxM
|
c851aefc8e
|
Update MainActivity.java
|
2016-11-07 01:01:33 +01:00 |
|
|
AdrianLxM
|
68be6179f8
|
Update EventRefreshGui.java
|
2016-11-07 01:00:50 +01:00 |
|
|
AdrianLxM
|
be39a35d68
|
Update ConfigBuilderFragment.java
|
2016-11-07 00:59:47 +01:00 |
|
|
AdrianLxM
|
c93322f2da
|
Overview Loopdisable on longclick 1
|
2016-11-07 00:58:44 +01:00 |
|
|
Milos Kozak
|
f84777bf00
|
Merge branch 'master' of https://github.com/MilosKozak/AndroidAPS
|
2016-11-06 12:10:55 +01:00 |
|
|
Milos Kozak
|
95ffb03a26
|
fix resources crash
|
2016-11-06 12:10:24 +01:00 |
|
|
AdrianLxM
|
3f02c8fc8c
|
Show decimal place
The time since last bolus has one decimal place but it was shown as zero.
|
2016-11-06 02:01:22 +01:00 |
|
|
Milos Kozak
|
65b8ca00db
|
looper to profile switch
|
2016-11-05 20:32:47 +01:00 |
|
|
Milos Kozak
|
45ffc18d25
|
move set temp and set extended buttons to actions
|
2016-11-05 20:12:58 +01:00 |
|