diabetesdt1
|
0b62669079
|
Update strings.xml
typo fixed
|
2017-08-11 07:30:53 +02:00 |
|
Milos Kozak
|
26fbd450b0
|
Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into sv
|
2017-08-10 22:39:25 +02:00 |
|
Milos Kozak
|
3ca058ce60
|
SV language cleanup
|
2017-08-10 22:33:38 +02:00 |
|
diabetesdt1
|
d78928a264
|
Update strings.xml
typo fixed and empty strings removed
|
2017-08-10 21:40:03 +02:00 |
|
diabetesdt1
|
c5b5d65efc
|
Update strings.xml
|
2017-08-10 21:29:41 +02:00 |
|
diabetesdt1
|
8df0ccdbb1
|
Update strings.xml
rollback language-names
|
2017-08-10 21:28:09 +02:00 |
|
diabetesdt1
|
33f5e97ac6
|
Update strings.xml
add more german translation and typos fixed
|
2017-08-10 21:12:56 +02:00 |
|
Milos Kozak
|
3a574c3803
|
Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev
|
2017-08-10 17:28:57 +02:00 |
|
Milos Kozak
|
f703c82ca7
|
microbolus calculation
|
2017-08-10 17:28:41 +02:00 |
|
Milos Kozak
|
dae82d49fb
|
Merge remote-tracking branch 'patrik/dev' into sv
|
2017-08-10 16:29:42 +02:00 |
|
ellabellakaramella
|
0766ac812c
|
SV translation
|
2017-08-10 15:15:40 +02:00 |
|
Timm Korte
|
e7249bf72e
|
Merge remote-tracking branch 'milosremote/dev' into develop
|
2017-08-10 11:13:21 +02:00 |
|
Milos Kozak
|
61a208f937
|
Merge pull request #349 from winni67/dev
Dev
|
2017-08-10 08:34:55 +02:00 |
|
Winfried Kuiper
|
5b43f11a3f
|
Update strings.xml
Confirmation=Bestätigung statt Konfiguration (configuration)
|
2017-08-09 22:12:09 +02:00 |
|
Winfried Kuiper
|
99a0edfa06
|
Update strings.xml
Missing units in german translation
|
2017-08-09 22:03:59 +02:00 |
|
Winfried Kuiper
|
4ce643ae08
|
Merge pull request #5 from MilosKozak/dev
Dev
|
2017-08-09 21:55:03 +02:00 |
|
Milos Kozak
|
57f5e5a92d
|
add bolus metadata when reading pump history
|
2017-08-08 23:14:56 +02:00 |
|
Milos Kozak
|
bbc68b2266
|
synchronized getAutosensData
|
2017-08-08 15:55:31 +02:00 |
|
Milos Kozak
|
2f8ca8bb04
|
fix setting zero temp
|
2017-08-08 15:06:31 +02:00 |
|
Milos Kozak
|
cfe51757a1
|
Merge pull request #345 from AdrianLxM/wear-versionnumber-settings
Version-Number in settings
|
2017-08-08 12:03:38 +02:00 |
|
AdrianLxM
|
7bc0a18f6e
|
Version-Number in settings
|
2017-08-08 02:06:46 +02:00 |
|
Timm Korte
|
8182f99bd2
|
add userRequested parameter to cancelTBR as needed in current AAPS dev
|
2017-08-07 22:25:57 +02:00 |
|
Savek-CC
|
f3044a7cbb
|
Merge branch 'feature_90-110-percent_savek-cc' into 'develop'
change cancel to 90 or 110 percent basal depending on previous running temp
See merge request !14
|
2017-08-07 20:18:44 +00:00 |
|
Timm Korte
|
07822811ac
|
Merge remote-tracking branch 'milosremote/dev' into develop
|
2017-08-07 22:16:37 +02:00 |
|
RoumenGeorgiev
|
122efb1b8e
|
Fix for getting double of alarmTimeagoWarnMins
|
2017-08-07 20:06:15 +03:00 |
|
RoumenGeorgiev
|
1dd9086924
|
added snoozing if bgReadingAgo is smaller than threshold
|
2017-08-07 18:53:56 +03:00 |
|
Milos Kozak
|
3bfecd6da8
|
check for existing
|
2017-08-07 16:13:09 +02:00 |
|
Milos Kozak
|
2ae0028495
|
Swedish
|
2017-08-07 14:06:11 +02:00 |
|
RoumenGeorgiev
|
4f054907cb
|
Merge pull request #1 from MilosKozak/dev
Dev
|
2017-08-07 09:17:07 +03:00 |
|
Savek-CC
|
e01c8740c2
|
Merge branch 'mainline' into 'develop'
update develop from changes introduced to stable / mainline
See merge request !15
|
2017-08-06 22:37:39 +00:00 |
|
Savek-CC
|
d520643d45
|
Merge branch 'develop' into 'mainline'
# Conflicts:
# app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ComboPlugin.java
|
2017-08-06 22:35:07 +00:00 |
|
Timm Korte
|
59e9502f22
|
change cancel to 90 or 110 percent basal depending on previous running temp
|
2017-08-07 00:27:23 +02:00 |
|
Johannes Mockenhaupt
|
c524e2a685
|
Revert merge which was committed due to a misunderstanding.
|
2017-08-06 21:47:17 +02:00 |
|
Milos Kozak
|
a40afd0948
|
1.5g
|
2017-08-06 14:28:01 +02:00 |
|
Milos Kozak
|
848863aca5
|
calculateFromTreatmentsAndTempsSynchronized
|
2017-08-06 14:25:25 +02:00 |
|
Milos Kozak
|
f1f7a6ca6c
|
check for null
|
2017-08-06 14:14:03 +02:00 |
|
Milos Kozak
|
066283a4b0
|
add SMB flag to treatments
|
2017-08-06 12:19:25 +02:00 |
|
Milos Kozak
|
6de154d16d
|
Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into move-to-range-in-profile
|
2017-08-06 11:43:13 +02:00 |
|
Milos Kozak
|
6ab6f82b10
|
more debug on setting temp basal
|
2017-08-06 11:42:20 +02:00 |
|
Milos Kozak
|
1bfc0011a1
|
Merge pull request #340 from MilosKozak/move-to-range-in-profile
Move to range in profile - WIP
|
2017-08-06 11:21:55 +02:00 |
|
Johannes Mockenhaupt
|
c69bc3489b
|
Merge branch 'read-maxtbr' into 'develop'
Read maxtbr
See merge request !6
|
2017-08-05 23:20:54 +00:00 |
|
Milos Kozak
|
4e4088f164
|
remove unneeded strings
|
2017-08-05 18:47:01 +02:00 |
|
Milos Kozak
|
4fda4fd547
|
convert target values to mdgl before passing to openaps
|
2017-08-05 18:14:10 +02:00 |
|
Milos Kozak
|
e295c8a2dc
|
target range change confirm dialog
|
2017-08-05 18:09:19 +02:00 |
|
Milos Kozak
|
f834b3b7e0
|
remove unneeded texts
|
2017-08-05 17:43:31 +02:00 |
|
Milos Kozak
|
1604b85d34
|
Merge branch 'dev' into move-to-range-in-profile
|
2017-08-05 14:48:41 +02:00 |
|
Johannes Mockenhaupt
|
dbad306766
|
Resolve merge issue.
|
2017-08-05 13:23:15 +02:00 |
|
Johannes Mockenhaupt
|
0ef8fd9994
|
Some polish.
|
2017-08-05 13:11:07 +02:00 |
|
Johannes Mockenhaupt
|
8aabc346c0
|
Update ComboPlugin.cancelTempBasal to user newly added userRequested param.
|
2017-08-05 13:06:10 +02:00 |
|
Johannes Mockenhaupt
|
8369893428
|
Fix if-statement.
|
2017-08-05 12:35:05 +02:00 |
|