Commit graph

10623 commits

Author SHA1 Message Date
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
Milos Kozak ca8892f480 Merge pull request #134 from LadyViktoria/constants
Add very Hard Limits to constants
2017-01-19 21:45:52 +01:00
AdrianLxM 88a1dcde51 remove empty language translation 2017-01-19 21:32:09 +01:00
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