Commit graph

11429 commits

Author SHA1 Message Date
swissalpine 010a2f3fd8 Make deviation bars transparent 2018-05-04 10:04:45 +02:00
Milos Kozak 88d964f135 SW reuse save, cleanup 2018-05-04 09:35:57 +02:00
Milos Kozak f7532b31be
Merge pull request #996 from RadoslavR/patch-55
half of the Bulgarian translation
2018-05-03 23:12:59 +02:00
AdrianLxM c34cc73b1e fix wear wizard 2018-05-03 23:08:16 +02:00
Radoslav Radev 52411f7afe
half of the Bulgarian translation 2018-05-03 23:34:50 +03:00
AdrianLxM 8d6997f519 ecarb ignore 0 carbs 2018-05-03 22:08:54 +02:00
AdrianLxM fb75346bcd ecarb make settings consistent 2018-05-03 22:08:50 +02:00
AdrianLxM 61f07da1a2 ecarb doECarb 2018-05-03 22:08:43 +02:00
AdrianLxM b05b300faf ecarb duration format 2018-05-03 22:08:35 +02:00
AdrianLxM c69a541b75 ecarb ash first response 2018-05-03 22:08:27 +02:00
AdrianLxM f2168ff36b ecarb hang in activity again 2018-05-03 22:08:19 +02:00
AdrianLxM 76277d11ad ecarb hang in activity 2018-05-03 22:08:11 +02:00
AdrianLxM 71db7b60c9 ecarb first activity 2018-05-03 22:08:02 +02:00
Milos Kozak 4539756455 Merge branch 'startupwizard' of https://github.com/MilosKozak/AndroidAPS into startupwizard 2018-05-03 22:02:12 +02:00
Milos Kozak dea5ff0080 styles cleanup 2018-05-03 22:01:59 +02:00
Milos Kozak d1958a3e2d
Merge branch 'dev' into startupwizard 2018-05-03 21:31:55 +02:00
Milos Kozak 02590ddd72 SW remove unneeded code 2018-05-03 21:29:34 +02:00
Milos Kozak 52bca03601
Merge pull request #993 from McHoffi/McHoffi-typo-fix
Typo fix
2018-05-03 21:23:12 +02:00
McHoffi 28d03c85a7
Merge pull request #1 from McHoffi/McHoffi-typo-fix
Typo fix
2018-05-03 21:21:05 +02:00
McHoffi 39e9448c67
Typo fix 2018-05-03 21:20:54 +02:00
Milos Kozak 83fcc0723e
Merge pull request #990 from MilosKozak/wear-wizard
Wear wizard
2018-05-03 20:48:24 +02:00
Milos Kozak cc532b9107 SWRadioButton cleanup 2018-05-03 20:13:27 +02:00
Milos Kozak 94db444acb SW validator, language, cleanup 2018-05-03 20:06:13 +02:00
Milos Kozak 36265ab1c6 SWPlugin 2018-05-03 18:41:47 +02:00
Andy Rozman 421946269a Merge branch 'dev' into riley_link_medtronic 2018-05-03 17:23:23 +01:00
Andy Rozman f6110bd096 Merge branch 'virtual_pump_Bug863' into riley_link_medtronic 2018-05-03 16:54:03 +01:00
AdrianLxM 43dc7d1846 wear cathegorize preferences 2018-05-03 17:49:31 +02:00
AdrianLxM 917fcb5953 wearwizard reorder menu 2018-05-03 17:49:27 +02:00
AdrianLxM 62a38ed537 wearwizard fix NPE when CobInfo not available - missing part 2018-05-03 17:49:22 +02:00
AdrianLxM b37b892eea wearwizard fix NPE when CobInfo not available 2018-05-03 17:49:17 +02:00
AdrianLxM fe0f2e3ce6 wearwizard settings on phone 2018-05-03 17:49:13 +02:00
AdrianLxM c394c045c9 wearwizard reduced watch settings 2018-05-03 17:49:09 +02:00
AdrianLxM bdfce784c0 wearwizard ensure watch apk is up to date 2018-05-03 17:49:05 +02:00
AdrianLxM ec106726a7 wearwizard trend 2018-05-03 17:49:01 +02:00
AdrianLxM 24dd4e1710 wearwizard cob 2018-05-03 17:48:54 +02:00
Andy Rozman f4648e44b2 - minor changes 2018-05-03 16:31:23 +01:00
Andy Rozman 8a451bab4d Merge branch 'dev' of https://github.com/andyrozman/AndroidAPS into dev 2018-05-03 16:11:16 +01:00
Andy Rozman acff61339c Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2018-05-03 16:09:53 +01:00
Milos Kozak d025b4b03d
Merge pull request #988 from PoweRGbg/dev
added insulin, APS, BGSOURCEscreens
2018-05-03 16:14:06 +02:00
Andy Rozman 5b8779f8a7 Feature Request/Bug #863
- added PumpCapability (to set boolean values)
- added Dana Pumps to PumpType and to VirtulaPumps array
2018-05-03 15:10:34 +01:00
Roumen Georgiev 5bb9861a9b
Merge pull request #16 from MilosKozak/startupwizard
Startupwizard
2018-05-03 17:05:44 +03:00
Roumen Georgiev 515590cdf6 other screens 2018-05-03 17:04:56 +03:00
Roumen Georgiev 425ba77200 other screens 2018-05-03 16:59:23 +03:00
Milos Kozak d03fd2752c cleanup 2018-05-03 15:56:01 +02:00
Milos Kozak 446d58f866
Merge pull request #987 from MilosKozak/channel-sound
channel sound
2018-05-03 13:17:23 +02:00
AdrianLxM 012593a480
Update NotificationStore.java 2018-05-03 12:18:48 +02:00
Roumen Georgiev 083730f476 WIP: BGSOURCE screen 2018-05-03 09:02:16 +03:00
Andy Rozman 416bd2ff41 Feature Request/Bug #863
- added package PumpCommon for common pump files
- added DoseSettings, DoseStepSize, PumpTempBasalType which are needed for PumpType
- added PumpType which contains all definitions for pumps
- extended fragement to display Pump Type and Pump Type definitions
- extended plugin to read configuration and set pumpDescription object
- extended pref_virtualpump to add pump type selection
2018-05-02 23:59:33 +01:00
Milos Kozak e5ed63a46f fix name on future profile switches 2018-05-03 00:13:49 +02:00
Milos Kozak a35c925930
Merge pull request #983 from jotomo/issue-939
WIP: Fix bolus progress dialog not closing with onPause/onResume cycle
2018-05-02 23:20:29 +02:00