AdrianLxM
|
c620f17d3f
|
Merge branch 'MilosKozak-dev' into tempt-pill
|
2017-01-19 21:16:34 +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
|
2754e23c08
|
CS translations
|
2017-01-19 19:52:14 +01:00 |
|
|
Milos Kozak
|
98a95fb16e
|
1.1c
|
2017-01-19 19:22:04 +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
|
452edd5771
|
1.1b
|
2017-01-18 21:41:10 +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 |
|
|
Milos Kozak
|
ba370b3cf3
|
ver 1.1a
|
2017-01-18 08:05:46 +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
|
46d70e8dca
|
Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into AMA
|
2017-01-17 23:44:00 +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 |
|
|
AdrianLxM
|
58282e23ee
|
Merge pull request #46 from MilosKozak/dev
update from Milos dev
|
2017-01-17 21:30:48 +01:00 |
|
|
Milos Kozak
|
b8d4e63fc7
|
Merge pull request #114 from MilosKozak/AMA
AMA
|
2017-01-17 18:57:42 +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 |
|
|
AdrianLxM
|
f4ce4a1587
|
Merge pull request #42 from MilosKozak/master
update to milos master
|
2017-01-17 17:55:28 +01:00 |
|
|
Milos Kozak
|
432c937a46
|
Merge branch 'dev' into AMA
|
2017-01-17 17:49:21 +01:00 |
|
|
Milos Kozak
|
08c078466a
|
Merge pull request #127 from MilosKozak/temptarget
Temptarget
|
2017-01-17 17:47:14 +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 |
|
|
Milos Kozak
|
7c90dfe03c
|
confirm dialog on removing temptarget
|
2017-01-16 23:54:46 +01:00 |
|
|
Milos Kozak
|
b6714ae254
|
use notification instead of toast
|
2017-01-16 23:37:58 +01:00 |
|
|
Milos Kozak
|
87c84da3d9
|
minimal NSClient version 1.21
|
2017-01-16 23:25:31 +01:00 |
|
|
Milos Kozak
|
218190e92f
|
support for removing temp targets from GUI
|
2017-01-16 23:23:20 +01:00 |
|
|
Milos Kozak
|
8c38090031
|
apply temp targets to MA
|
2017-01-16 21:03:31 +01:00 |
|
|
Milos Kozak
|
eaa16402a7
|
show running temp target on overview
|
2017-01-16 20:47:57 +01:00 |
|
|
Milos Kozak
|
61b1ee781f
|
temp target treatment dialog & sync fix
|
2017-01-16 16:59:12 +01:00 |
|
|
viktoria
|
61a1e5bc04
|
Korean DanaR Stats Activity
|
2017-01-16 13:23:41 +01:00 |
|
|
viktoria
|
e851d15aff
|
DanaR Stats Activity
|
2017-01-16 13:23:41 +01:00 |
|
|
Milos Kozak
|
262dae3ab3
|
Merge pull request #129 from slavidex/patch-26
Update pref_others.xml
|
2017-01-14 16:37:57 +01:00 |
|
|
Milos Kozak
|
5c46516b77
|
Merge pull request #128 from slavidex/patch-25
Update strings.xml
|
2017-01-14 16:37:21 +01:00 |
|
|
Milos Kozak
|
61a8cad4e8
|
allow refrest temp targets from NS & fix bugs
|
2017-01-14 16:36:42 +01:00 |
|
|
Radoslav Radev
|
8f0a28419d
|
Update pref_others.xml
|
2017-01-14 15:25:06 +02:00 |
|
|
Radoslav Radev
|
cbd7aa74eb
|
Update strings.xml
|
2017-01-14 15:21:47 +02:00 |
|
|
Milos Kozak
|
a96bc52e01
|
handle temp targets data from NS
|
2017-01-14 00:37:35 +01:00 |
|