Commit graph

950 commits

Author SHA1 Message Date
Milos Kozak
8637e99afe Merge branch 'master' of https://github.com/MilosKozak/AndroidAPS 2017-01-02 00:05:57 +01:00
Milos Kozak
b41d1cc710 Merge pull request #108 from AdrianLxM/patch-9
Dismiss editing when fragment is paused
2017-01-01 23:59:10 +01:00
AdrianLxM
9c40e4af34 Dismiss editing when fragment is paused 2017-01-01 21:46:25 +01:00
Milos Kozak
fded515ac1 fix TimeListEdit when fragment is restored 2017-01-01 20:22:23 +01:00
Milos Kozak
4408146f23 disable entering basals in profiles only if pump is not tempbasal capable 2017-01-01 14:34:57 +01:00
Milos Kozak
ef2e7b1a62 show basal line only if pump is tempbasal capable 2017-01-01 14:19:35 +01:00
Milos Kozak
9edb5c9a66 draw basals only if pump is tempbasal capable 2017-01-01 14:00:59 +01:00
Milos Kozak
86f5aec0bb disable visible control when plugin is not enabled 2017-01-01 13:45:03 +01:00
Milos Kozak
fb320968a1 Merge pull request #107 from MilosKozak/timeedit
Local Profile
2017-01-01 13:26:37 +01:00
Milos Kozak
38a9c94258 Local Profile 2016-12-31 20:10:36 +01:00
Milos Kozak
6b18336fa2 LocalProfile plugin 2016-12-31 15:06:45 +01:00
Milos Kozak
0458ad65ce handle arrays separately 2016-12-31 14:52:23 +01:00
Milos Kozak
2e6c168adc TimeListEdit most work done 2016-12-31 13:11:32 +01:00
Milos Kozak
e1c2e4c492 TimeListEdit initial work 2016-12-30 16:43:43 +01:00
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
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