Commit graph

1161 commits

Author SHA1 Message Date
Milos Kozak
be8003da4b Merge branch 'master' into koreandanar 2016-12-06 23:18:02 +01:00
Milos Kozak
64de2fd736 Merge branch 'master' of https://github.com/MilosKozak/AndroidAPS 2016-12-06 23:15:23 +01:00
Milos Kozak
10d30571a9 fix IC and ISF in DanaR profile 2016-12-06 23:14:25 +01:00
Milos Kozak
d897b778a0 Merge pull request #84 from MilosKozak/notifications
basic notification functionality
2016-12-06 23:05:23 +01:00
Milos Kozak
3a3fc5d508 one more ICF with 1 decimal 2016-12-06 23:03:45 +01:00
Milos Kozak
86755599df show IC and ICF with 1 decimal 2016-12-06 23:00:57 +01:00
Milos Kozak
0af894aa56 change info color to green 2016-12-06 22:57:49 +01:00
Milos Kozak
b61108eb2b remove test data 2016-12-06 22:55:49 +01:00
Milos Kozak
1c719bbd9a Merge pull request #85 from AdrianLxM/wear-nullprofile-fix
limit readings to values above 38
2016-12-05 20:15:59 +01:00
AdrianLxM
1a20b637b6 limit readings to values above 38 2016-12-05 17:47:03 +01:00
Milos Kozak
abfb832a10 basic notification functionality 2016-12-05 15:20:44 +01:00
AdrianLxM
db6f658991 Merge pull request #28 from MilosKozak/master
update to milos master
2016-12-04 15:21:54 +01:00
Milos Kozak
4b389c2cad dana drivers switching working 2016-12-03 17:42:08 +01:00
Milos Kozak
e430a0a06b Merge pull request #82 from AdrianLxM/wear-nullprofile-fix
Wear nullprofile fix
2016-12-01 13:16:59 +01:00
AdrianLxM
1af28d007f wear make sendData() private 2016-12-01 12:10:58 +01:00
AdrianLxM
7eb8702a9c wear profile-null fix Toasts from strings.xml the second 2016-12-01 10:54:19 +01:00
AdrianLxM
68f4a2db50 wear profile-fix toast from strings.xml 2016-12-01 10:47:39 +01:00
AdrianLxM
0d8fd9df5c wear profile may be null 2016-12-01 09:30:39 +01:00
AdrianLxM
2caa58f07e Merge pull request #27 from MilosKozak/master
update to milos master
2016-12-01 09:24:02 +01:00
Milos Kozak
db2fd55f7c copy files for Korean DanaR 2016-11-29 20:52:40 +01:00
Milos Kozak
97a22344e3 CZ translations 2016-11-29 19:07:09 +01:00
Milos Kozak
36d5f1dc29 proper danar errors detection 2016-11-29 18:28:36 +01:00
Milos Kozak
9c0c41f4f0 Merge pull request #81 from AdrianLxM/wear-prepare-final
Wear support
2016-11-29 15:52:30 +01:00
AdrianLxM
896503918c wear extract strings 2016-11-29 15:01:00 +01:00
AdrianLxM
081b6b81e4 Merge pull request #26 from AdrianLxM/wear-test04
Wear test04
2016-11-29 13:18:40 +01:00
AdrianLxM
1eacf35e47 Merge pull request #25 from AdrianLxM/wear-prepare-final
wear merge current master
2016-11-29 13:17:21 +01:00
AdrianLxM
ff134f56f3 Merge pull request #24 from MilosKozak/master
update to milos master
2016-11-29 13:14:40 +01:00
Milos Kozak
ee408ada79 Merge pull request #80 from warstar2187/master
Fix Insulin Activity and Korean update
2016-11-29 07:44:58 +01:00
warstar2187
7f97b232da Update Treatment.java 2016-11-29 12:08:45 +09:00
Milos Kozak
2912d1cce1 Merge pull request #79 from AdrianLxM/viktoria-permissions
Viktoria permissions
2016-11-28 19:02:28 +01:00
AdrianLxM
70338ac158 wear PoweRGbg fixes 2016-11-28 18:42:19 +01:00
Milos Kozak
942f50e250 Merge pull request #76 from ecorman/master
Note basal start / end to see note in Xdrip+ with basal rate data
2016-11-28 16:47:54 +01:00
AdrianLxM
96e6303a42 wear no single value line for better distinction to basal lines 2016-11-27 17:26:39 +01:00
AdrianLxM
b02fba11e8 wear cleanup unused resources 2016-11-27 14:51:08 +01:00
AdrianLxM
736c87a9cc wear low bit mode 2016-11-27 06:25:04 +01:00
AdrianLxM
299e235f4b wear adopt basal to light theme 2016-11-27 06:24:44 +01:00
AdrianLxM
d53217dfe0 wear active-inactive mode 2016-11-27 06:24:22 +01:00
AdrianLxM
d7eacde0a4 Merge pull request #21 from LadyViktoria/axis
wear axis in bright mode fix
2016-11-27 06:21:45 +01:00
viktoria
39c5278b37 wear axis in bright mode fix 2016-11-27 06:15:37 +01:00
AdrianLxM
a32c3ef15e wear add clockwise lib 2016-11-26 14:21:01 +01:00
AdrianLxM
389344cfb9 wear integrate colors 2016-11-26 07:11:12 +01:00
AdrianLxM
3adb6b2c15 Merge branch 'watchface-colors' of https://github.com/LadyViktoria/AndroidAPS into wear-working1 2016-11-26 07:10:48 +01:00
AdrianLxM
87d49c03c8 wear product flavors 2016-11-26 07:10:22 +01:00
AdrianLxM
ee80a220f1 wear double tap will change timeframe 2016-11-26 07:10:11 +01:00
AdrianLxM
a69c1150ea tap tests 2016-11-26 07:09:57 +01:00
AdrianLxM
a261a1b687 wear add iml 2016-11-25 16:45:05 +01:00
AdrianLxM
b2d2f462f6 first check if element exist, then access it 2016-11-25 13:35:53 +01:00
LadyViktoria
39be1bb4c7 Android 6+ Permissions #6 2016-11-25 13:35:34 +01:00
AdrianLxM
ff29a795db SMS permission crashfix 2016-11-25 13:32:27 +01:00
LadyViktoria
33d783e9b0 Android 6+ Permissions #4 2016-11-25 13:32:17 +01:00