Commit graph

6542 commits

Author SHA1 Message Date
AdrianLxM
69355c5609 Merge pull request #7 from MilosKozak/master
Update to Milos master
2016-11-08 06:01:58 +01:00
Milos Kozak
a5d68395c8 Merge pull request #52 from AdrianLxM/activityContrib
Activity contrib
2016-11-07 16:03:55 +01:00
AdrianLxM
93accc0d9f Add in basalIOB.activity 2016-11-07 15:18:48 +01:00
AdrianLxM
8bdc86f359 Calculate activityContrib for TempBasal 2016-11-07 15:17:16 +01:00
AdrianLxM
82443bc8ab Merge pull request #6 from MilosKozak/master
Update to Milos master
2016-11-07 15:14:44 +01:00
Milos Kozak
48388496f5 Merge pull request #51 from AdrianLxM/patch-8
Add base basal rate to Overview when temp is running
2016-11-07 10:19:44 +01:00
AdrianLxM
2e6a37dcbd Add base basal rate to Overview when temp is running
Now that there is more space with less buttons, it should fit ;)
2016-11-07 10:18:16 +01:00
Milos Kozak
d67ae5df78 version bump 1.0.20 2016-11-07 10:16:13 +01:00
Milos Kozak
925b5612fc Merge pull request #49 from AdrianLxM/disableLoopLongpress
Disable loop on Longpress on Loop-Status in Overview
2016-11-07 10:14:14 +01:00
Milos Kozak
3533ec16ba Merge pull request #50 from AdrianLxM/patch-7
fix for net IOB
2016-11-07 09:36:16 +01:00
Milos Kozak
6263b98683 Merge pull request #39 from warstar2187/master
Update strings.xml
2016-11-07 09:13:21 +01:00
AdrianLxM
e948a6f955 fix for net IOB 2016-11-07 07:55:41 +01:00
AdrianLxM
686593986c Update PreferencesActivity.java 2016-11-07 01:02:08 +01:00
AdrianLxM
c851aefc8e Update MainActivity.java 2016-11-07 01:01:33 +01:00
AdrianLxM
68be6179f8 Update EventRefreshGui.java 2016-11-07 01:00:50 +01:00
AdrianLxM
be39a35d68 Update ConfigBuilderFragment.java 2016-11-07 00:59:47 +01:00
AdrianLxM
c93322f2da Overview Loopdisable on longclick 1 2016-11-07 00:58:44 +01:00
AdrianLxM
0aa4fbba45 Merge pull request #5 from MilosKozak/master
update to milos master
2016-11-07 00:55:01 +01:00
Milos Kozak
f84777bf00 Merge branch 'master' of https://github.com/MilosKozak/AndroidAPS 2016-11-06 12:10:55 +01:00
Milos Kozak
95ffb03a26 fix resources crash 2016-11-06 12:10:24 +01:00
Milos Kozak
3e56c87e6a Merge pull request #48 from AdrianLxM/patch-6
Show decimal place
2016-11-06 09:40:29 +01:00
AdrianLxM
3f02c8fc8c Show decimal place
The time since last bolus has one decimal place but it was shown as zero.
2016-11-06 02:01:22 +01:00
Milos Kozak
c5c1a194d5 Merge pull request #47 from MilosKozak/profileswitch
Actions page & offline profile switch
2016-11-05 21:55:20 +01:00
Milos Kozak
65b8ca00db looper to profile switch 2016-11-05 20:32:47 +01:00
Milos Kozak
45ffc18d25 move set temp and set extended buttons to actions 2016-11-05 20:12:58 +01:00
Milos Kozak
3ac9811d9a Actions page & offline profile switch 2016-11-05 15:46:11 +01:00
Milos Kozak
75b07d0f18 Merge pull request #46 from slavidex/patch-16
update BG translation - another attempt
2016-11-03 07:36:40 +01:00
Radoslav Radev
b9d4a5fc0a Update strings.xml 2016-11-03 07:47:24 +02:00
Milos Kozak
15ca64e218 Merge pull request #43 from ecorman/master
Basal % rate
2016-11-02 23:37:17 +01:00
Milos Kozak
57b032065f Merge pull request #45 from AdrianLxM/disableLoopLabel
Disable loop label
2016-11-02 22:20:48 +01:00
Milos Kozak
1f9501e9c1 Merge pull request #44 from AdrianLxM/patch-5
Update German translation
2016-11-02 22:19:03 +01:00
AdrianLxM
b7f4dd3366 borders again on loopmode label 2016-11-02 18:27:46 +01:00
AdrianLxM
b1f3bb17bb Show in Overview when loop is disabled 2016-11-02 18:04:14 +01:00
AdrianLxM
7bcdf36ca0 Merge pull request #1 from MilosKozak/master
merge in milos master
2016-11-02 15:04:14 +01:00
AdrianLxM
80e8ac465a Update German translation 2016-11-02 14:33:41 +01:00
AdrianLxM
b265be3536 Some updates on German translation 2016-11-02 14:17:16 +01:00
Milos Kozak
100f39fa8d Update README.md 2016-11-01 19:35:56 +01:00
Milos Kozak
0707780680 Merge pull request #42 from AdrianLxM/patch-4
Show current total
2016-10-31 15:50:21 +01:00
AdrianLxM
2294093aab Show current total
The total of the calculation in the wizard was showing the value from the previous calculation when you enable/disable to include Bolus-IOB or Basal-IOB into the calculation.

The button to send to the pump showed the current amount of units.
2016-10-31 13:01:50 +01:00
ecorman
f2baa32e40 Basal % rate 2016-10-31 13:01:38 +01:00
ecorman
cf3bb52c7b Add percent to result to allow manual adjust 2016-10-31 02:29:19 +01:00
warstar2187
46fd0c87dd Update strings.xml 2016-10-27 08:16:19 +09:00
Milos Kozak
6d6987e7f9 Merge pull request #38 from warstar2187/master
Update strings.xml
2016-10-26 20:05:14 +02:00
warstar2187
e4e2ea3aac Update strings.xml 2016-10-27 02:53:23 +09:00
Milos Kozak
b0968cde81 Merge pull request #37 from warstar2187/master
Update SmsCommunicatorPlugin.java
2016-10-26 19:26:40 +02:00
warstar2187
5443bb4fba Update SmsCommunicatorPlugin.java 2016-10-27 02:23:47 +09:00
warstar2187
79a6b65bb9 Update SmsCommunicatorPlugin.java 2016-10-26 19:38:36 +09:00
Milos Kozak
8a9848de4b Merge pull request #36 from warstar2187/master
Korean Translation
2016-10-26 11:59:15 +02:00
warstar2187
a49afea27c Update strings.xml 2016-10-26 15:57:21 +09:00
warstar2187
58591514f7 Update strings.xml 2016-10-26 15:34:26 +09:00