Milos Kozak
|
08880b8032
|
Merge branch 'master' into dev
|
2017-01-26 18:31:31 +01:00 |
|
|
Milos Kozak
|
e78de8b622
|
fix static func
|
2017-01-26 18:27:09 +01:00 |
|
|
Milos Kozak
|
0c289bfb6e
|
Merge branch 'master' of https://github.com/MilosKozak/AndroidAPS
|
2017-01-26 18:23:47 +01:00 |
|
|
Milos Kozak
|
87ba28136a
|
log new firmware pump
|
2017-01-26 18:23:30 +01:00 |
|
|
Milos Kozak
|
72fc4ec096
|
Merge branch 'master' into dev
|
2017-01-26 17:00:10 +01:00 |
|
|
Milos Kozak
|
750cea7bcf
|
Merge branch 'master' of https://github.com/MilosKozak/AndroidAPS
|
2017-01-26 16:57:11 +01:00 |
|
|
Milos Kozak
|
5c5468b55b
|
use minimal basal rate from description
|
2017-01-26 16:56:29 +01:00 |
|
|
Milos Kozak
|
df0af4da94
|
fix uploading profile
|
2017-01-23 15:56:32 +01:00 |
|
|
Milos Kozak
|
750ac19b41
|
upload data for temp target only if needed
|
2017-01-23 14:47:14 +01:00 |
|
|
Milos Kozak
|
22f9817f8e
|
upload cpp setting to NS
|
2017-01-23 09:31:14 +01:00 |
|
|
Milos Kozak
|
ceaf4f7f78
|
Merge branch 'dev' into adjusttargetsse
|
2017-01-22 11:30:59 +01:00 |
|
|
AdrianLxM
|
ea78dd5bc1
|
Shorten tabs first
|
2017-01-21 19:44:58 +01:00 |
|
|
Milos Kozak
|
404a4de916
|
Merge pull request #136 from AdrianLxM/adjusttargetsse
Preference Switches for Autosens
|
2017-01-21 11:22:34 +01:00 |
|
|
Milos Kozak
|
53f9b30b3e
|
temp target display update
|
2017-01-21 11:22:03 +01:00 |
|
|
AdrianLxM
|
50b7e619fc
|
Preference switches for Autosens
|
2017-01-21 01:35:15 +01:00 |
|
|
Milos Kozak
|
ea37d9eaa8
|
Merge pull request #131 from AdrianLxM/tempt-pill
Tempt pill
|
2017-01-21 00:11:07 +01:00 |
|
|
viktoria
|
5a09c3df70
|
DanaR Stats Korean react on touch elsewwhere
|
2017-01-20 22:43:02 +01:00 |
|
|
AdrianLxM
|
377a55c69f
|
DanaR Stats react on touch elsewhere
|
2017-01-20 20:47:31 +01:00 |
|
|
viktoria
|
33bb7d80a6
|
DanaR Stats small fixes and move Listeners
|
2017-01-20 16:45:01 +01:00 |
|
|
viktoria
|
722976f6b0
|
DanaR Stats beautify layout and add some listeners
|
2017-01-20 14:51:16 +01:00 |
|
|
viktoria
|
d2acad1942
|
Korean DanaR Stats some improvements
|
2017-01-20 03:19:17 +01:00 |
|
|
viktoria
|
2d966c9feb
|
DanaR Stats some improvements
|
2017-01-20 03:13:41 +01:00 |
|
|
viktoria
|
62853326ed
|
Merged branch dev into danarstats
|
2017-01-20 00:10:56 +01:00 |
|
|
AdrianLxM
|
3f3d519c84
|
Merge branch 'dev' into tempt-pill
|
2017-01-19 21:57:42 +01:00 |
|
|
AdrianLxM
|
992d95744d
|
remove duplicate code
|
2017-01-19 21:53:08 +01:00 |
|
|
AdrianLxM
|
0c11f78ed3
|
cleanup after merge
|
2017-01-19 21:15:08 +01:00 |
|
|
LadyViktoria
|
1597f74bd0
|
Merge branch 'dev' into danarstats
|
2017-01-19 20:52:01 +01:00 |
|
|
AdrianLxM
|
6c3a07cc62
|
Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into MilosKozak-dev
|
2017-01-19 20:47:53 +01:00 |
|
|
viktoria
|
6120add315
|
Add very Hard Limits to constants
|
2017-01-19 20:36:19 +01:00 |
|
|
Milos Kozak
|
c701b5d125
|
waiting for pump message
|
2017-01-19 19:21:25 +01:00 |
|
|
Milos Kozak
|
f8feaf565b
|
show how is value hard limited
|
2017-01-19 18:40:08 +01:00 |
|
|
Milos Kozak
|
649cab63fc
|
allow some diff on profile check
|
2017-01-19 18:07:16 +01:00 |
|
|
Milos Kozak
|
e808bcedee
|
remove logging
|
2017-01-19 15:17:43 +01:00 |
|
|
Milos Kozak
|
75b53cfc0d
|
iob calc fix
|
2017-01-19 14:35:16 +01:00 |
|
|
Milos Kozak
|
07c9a21ff9
|
autosens log
|
2017-01-19 13:54:56 +01:00 |
|
|
Milos Kozak
|
e8dcf73c83
|
remove carbsAbsorbed from debug
|
2017-01-18 21:45:27 +01:00 |
|
|
Milos Kozak
|
8586ed5adb
|
show autosens result
|
2017-01-18 21:40:43 +01:00 |
|
|
AdrianLxM
|
480b832efe
|
temptarget zero-duration cleanup
|
2017-01-18 16:49:48 +01:00 |
|
|
AdrianLxM
|
b79743588d
|
temptarget sort and allow for zero-duration to cancel predated ones
|
2017-01-18 15:52:20 +01:00 |
|
|
viktoria
|
b70e895b95
|
DanaR Stats fixes
|
2017-01-18 04:31:47 +01:00 |
|
|
viktoria
|
9ba24b4ffd
|
DanaR Stats Beautify
|
2017-01-18 03:08:19 +01:00 |
|
|
viktoria
|
678fbedcbf
|
Merge branch 'dev'
Conflicts:
app/src/main/res/values/strings.xml
|
2017-01-18 03:03:58 +01:00 |
|
|
Milos Kozak
|
9f4cc28c0f
|
allow removing temp target records with null _id
|
2017-01-17 23:43:50 +01:00 |
|
|
AdrianLxM
|
d36a515d45
|
temp target overview
|
2017-01-17 21:32:30 +01:00 |
|
|
Milos Kozak
|
f9ed2ed4b4
|
temp targets to AMA
|
2017-01-17 18:56:08 +01:00 |
|
|
Milos Kozak
|
0e21b67a42
|
fix merge conflicts
|
2017-01-17 18:00:44 +01:00 |
|
|
Milos Kozak
|
432c937a46
|
Merge branch 'dev' into AMA
|
2017-01-17 17:49:21 +01:00 |
|
|
Milos Kozak
|
b0392b997e
|
fix crash
|
2017-01-17 17:02:57 +01:00 |
|
|
Milos Kozak
|
1b385c10e3
|
fix iob calculation in the past
|
2017-01-17 16:19:34 +01:00 |
|
|
Milos Kozak
|
12eec7108a
|
detect oldest data available
|
2017-01-17 15:19:02 +01:00 |
|