Commit graph

2604 commits

Author SHA1 Message Date
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
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
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
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
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
RoumenGeorgiev
78236b674c Update overview_fragment.xml 2017-08-05 12:28:28 +03:00
RoumenGeorgiev
9546c6f493 Update overview_fragment.xml 2017-08-05 12:27:43 +03:00
RoumenGeorgiev
222c357456 Added check for enabled openAPS stale data alarm in NS 2017-08-05 11:58:49 +03:00
RoumenGeorgiev
ad122153a9 added openAPSEnabledAlerts()
check for OpenAPS alerts enabled
2017-08-05 11:26:12 +03:00
RoumenGeorgiev
3d9df4e18e Using equals() instead of == on line 1811 2017-08-05 11:20:09 +03:00
RoumenGeorgiev
cdee9bf703 Get staleData setting from NS first 2017-08-04 17:04:57 +03:00
RoumenGeorgiev
aff62d86b1 Changed name of button to snooze if it's staleDataAlarm 2017-08-04 16:43:46 +03:00
RoumenGeorgiev
714a292d78 fixed wrong pasting 2017-08-04 15:05:09 +03:00
RoumenGeorgiev
837dcdb23b If alarm is staledata dismis snoozes it 2017-08-04 14:51:25 +03:00
RoumenGeorgiev
82541a50e4 Added functions for snoozing and unsnoozing 2017-08-04 14:49:46 +03:00
RoumenGeorgiev
a8b17a1f22 adding staleDataThreshold as snooze time 2017-08-04 14:48:44 +03:00
RoumenGeorgiev
529d267b9d Added check for staleData and notification
with every loop
2017-08-04 12:29:48 +03:00
RoumenGeorgiev
232590e707 Added staleData 2017-08-03 18:48:45 +03:00
RoumenGeorgiev
450634418e added isAlarmForStaleData() 2017-08-03 18:47:51 +03:00
RoumenGeorgiev
74bb05a654 added staledataalarm 2017-08-03 17:14:14 +03:00
Milos Kozak
541a261dda Merge pull request #334 from AdrianLxM/colored-activetemp
Colored activetemp
2017-08-03 09:11:30 +02:00
AdrianLxM
36e6cb8497 remove canceltemp button from all layouts and click handling from overview fragment 2017-08-03 08:22:59 +02:00