Commit graph

7137 commits

Author SHA1 Message Date
Milos Kozak d0a0b30c8e Merge branch 'master' of https://github.com/MilosKozak/AndroidAPS 2016-12-29 23:11:01 +01:00
Milos Kozak 2f52091b67 show upload profile button only when pump is capable to this 2016-12-29 23:10:39 +01:00
Milos Kozak b2be49e631 simple profile layout 2016-12-29 22:40:30 +01:00
Milos Kozak ec25008e61 Merge pull request #105 from slavidex/patch-23
Update strings.xml
2016-12-29 22:40:11 +01:00
Radoslav Radev ddcc4c147d Update strings.xml 2016-12-29 20:49:18 +02:00
Milos Kozak 1e99c00626 allow sms string to be translated separately 2016-12-29 16:22:40 +01:00
Milos Kozak 8e46a55e48 allow better translation of min ago 2016-12-29 16:06:00 +01:00
Milos Kozak 0059266791 loop status font size 2016-12-29 14:23:05 +01:00
Milos Kozak 0c0e29e73d Travis badge 2016-12-29 14:13:04 +01:00
Milos Kozak 24c5bb9303 Merge branch 'master' into mm640g 2016-12-29 14:01:24 +01:00
Milos Kozak 83f4dbf9ca Merge pull request #103 from AdrianLxM/patch-8
remove mm640g translation again
2016-12-29 13:51:24 +01:00
Milos Kozak c06d25b235 more rearrangements 2016-12-29 00:12:52 +01:00
Milos Kozak f127e7bec1 better allign bg arrows 2016-12-28 23:48:43 +01:00
AdrianLxM 834398b8f0 remove mm640g translation again 2016-12-28 23:31:02 +01:00
AdrianLxM b151b795b9 Merge pull request #40 from MilosKozak/master
update to milos master
2016-12-28 23:22:53 +01:00
Milos Kozak 6b86818464 Merge pull request #102 from AdrianLxM/avgdelta
Avgdelta
2016-12-28 23:15:23 +01:00
Milos Kozak c8a58808e0 more logging on setting extended bolus 2016-12-28 23:13:11 +01:00
AdrianLxM d70c9673d5 average delta 2016-12-28 22:39:40 +01:00
AdrianLxM 527a0ffd92 Merge pull request #39 from MilosKozak/master
update from milos master
2016-12-28 22:34:30 +01:00
Milos Kozak d53bbc5f01 Merge branch 'master' of https://github.com/MilosKozak/AndroidAPS 2016-12-28 22:31:17 +01:00
Milos Kozak 9a47e521d2 show result in loop plugin when correct basal settoo 2016-12-28 22:30:38 +01:00
Milos Kozak c117cff132 Merge pull request #101 from MilosKozak/tests2
Tests
2016-12-28 16:36:55 +01:00
Milos Kozak de4021ca3d permission access for travis 2016-12-28 16:10:06 +01:00
Milos Kozak d6f4135d6e travis 2016-12-28 15:58:44 +01:00
Milos Kozak 86c8748fa5 Merge branch 'master' of https://github.com/MilosKozak/AndroidAPS 2016-12-28 15:23:21 +01:00
Milos Kozak 4108e57589 Merge pull request #95 from AdrianLxM/ongoingnotif
Ongoing Notification
2016-12-28 15:22:05 +01:00
Milos Kozak d2d3e024a2 Merge branch 'ongoingnotif' of https://github.com/AdrianLxM/AndroidAPS 2016-12-28 15:15:24 +01:00
Milos Kozak e2c2f49f6f MM640g bg source 2016-12-28 14:57:11 +01:00
Milos Kozak 4cab381e2c Merge pull request #99 from slavidex/patch-22
Update strings.xml
2016-12-28 13:35:50 +01:00
Radoslav Radev 71461e38ca Update strings.xml 2016-12-28 12:17:17 +02:00
Milos Kozak 9982004e9a Merge pull request #98 from warstar2187/master
kr translation update
2016-12-28 10:26:47 +01:00
warstar2187 804cdba7cf Update strings.xml 2016-12-28 18:22:50 +09:00
AdrianLxM 6ac889cecd ongoing notification integration 2016-12-28 00:03:08 +01:00
Milos Kozak 26b260a85a use bolus step from pump description 2016-12-27 23:46:39 +01:00
AdrianLxM 4afd2295f8 Ongoing Notification 2 2016-12-27 23:39:47 +01:00
AdrianLxM d597be71de ongoing notification 2016-12-27 23:39:16 +01:00
Milos Kozak 405ae28e38 cz translations 2016-12-27 23:39:00 +01:00
AdrianLxM 2ab1a0cbeb Merge pull request #38 from MilosKozak/master
update to Milos master
2016-12-27 23:36:22 +01:00
Milos Kozak 29327aef01 MDI pump driver 2016-12-27 23:35:50 +01:00
Milos Kozak fdb252b62d show direction next to BG 2016-12-27 20:41:28 +01:00
Milos Kozak 13f2fce31e product flavors dimensions update 2016-12-27 18:47:48 +01:00
Milos Kozak 2ca698dba3 git ignore wear/wear.iml 2016-12-27 16:28:10 +01:00
Milos Kozak 34fce81563 fix build warning 2016-12-27 16:21:04 +01:00
Milos Kozak ecd787bdb3 detect broken communication during bolusing 2016-12-27 16:06:49 +01:00
Milos Kozak 42b581ec29 log bolus start 2016-12-27 15:13:27 +01:00
Milos Kozak b3f026992e Merge pull request #83 from MilosKozak/koreandanar
Koreandanar
2016-12-27 14:27:40 +01:00
Milos Kozak 71b6b11993 Merge pull request #94 from MilosKozak/smsnotify
Smsnotify
2016-12-27 12:19:16 +01:00
Milos Kozak cd41bff2bb SMS command BG 2016-12-27 12:17:26 +01:00
Milos Kozak a109bb9853 handle switching profiles in correct order 2016-12-25 23:18:46 +01:00
Milos Kozak 463a913cd1 add debug to profile comparation 2016-12-25 15:08:40 +01:00