Commit graph

8671 commits

Author SHA1 Message Date
Milos Kozak
8456f87de1 Merge remote-tracking branch 'origin/master' into AMA 2017-01-07 00:04:26 +01:00
Milos Kozak
25a3b678e9 most new AMA code added 2017-01-06 22:42:37 +01:00
Milos Kozak
6dc3d38a2f fix passing carb ratio 2017-01-06 09:52:17 +01:00
Milos Kozak
26102848f5 refactor MealData 2017-01-04 23:03:13 +01:00
Milos Kozak
ebb3e90587 extract MealData 2017-01-04 22:47:21 +01:00
Milos Kozak
e585ab4030 Merge branch 'AMA' of https://github.com/MilosKozak/AndroidAPS into AMA 2017-01-04 22:37:10 +01:00
Milos Kozak
3eee917979 add sample data 2017-01-04 22:37:03 +01:00
Milos Kozak
724a041341 refactor classes 2017-01-04 22:33:17 +01:00
Milos Kozak
8aad003311 copy basic files oref0 dev 2017/01/04, make it running without crash 2017-01-04 22:21:46 +01:00
Milos Kozak
9d5c2e5dac fix visibility of aps plugin at start 2017-01-03 22:13:25 +01:00
Milos Kozak
50f75e3404 upload AMA result to NS too 2017-01-03 21:42:32 +01:00
Milos Kozak
05911be4e0 remove parcelable code from determinebasaladapter 2017-01-03 21:37:23 +01:00
Milos Kozak
3dfac49b82 duplicate MA -> AMA 2017-01-03 21:15:40 +01:00
Milos Kozak
faf8e07248 renaming before adding AMA 2017-01-03 21:01:01 +01:00
Milos Kozak
f3f6a911ae use android.text.format.DateUtils 2017-01-03 19:06:35 +01:00
Milos Kozak
fe75298263 safer display values in openapsma fragment 2017-01-03 10:24:08 +01:00
Milos Kozak
54278dd794 Merge pull request #109 from LadyViktoria/translation
german translation
2017-01-02 17:01:53 +01:00
viktoria
f3551dda7f german translation 2017-01-02 16:44:20 +01:00
Milos Kozak
952a2342a8 Merge pull request #104 from MilosKozak/mm640g
MM640g bg source
2017-01-02 13:58:56 +01:00
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
AdrianLxM
8185d88d32 Merge pull request #41 from MilosKozak/master
Update to Milos master
2017-01-01 19:52:51 +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
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