Commit graph

4036 commits

Author SHA1 Message Date
Roumen Georgiev 85d4ef4419 trying pump followup screen 2018-05-08 17:09:37 +03:00
Roumen Georgiev e357c7fd1b adding pump selection 2018-05-08 15:14:36 +03:00
Milos Kozak 963f1e1abf
Merge branch 'dev' into startupwizard 2018-05-04 13:26:40 +02:00
swissalpine 10b67a0c11
Update GraphData.java 2018-05-04 12:31:11 +02:00
swissalpine 7312bf061a
Update colors.xml 2018-05-04 12:30:28 +02:00
Milos Kozak 91f3db782d SWButton rename option to text 2018-05-04 10:20:22 +02:00
Milos Kozak 55661ca7a0 SWButton 2018-05-04 10:17:50 +02:00
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
Radoslav Radev 52411f7afe
half of the Bulgarian translation 2018-05-03 23:34:50 +03: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
McHoffi 39e9448c67
Typo fix 2018-05-03 21:20:54 +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
AdrianLxM 43dc7d1846 wear cathegorize preferences 2018-05-03 17:49:31 +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
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
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
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
Johannes Mockenhaupt 396268d9c8
Send invalid boluses (prime boluses) to watch. 2018-05-02 22:49:31 +02:00
Johannes Mockenhaupt 599c87f794
Combo: better error message when initialization fails. 2018-05-02 22:48:57 +02:00
Milos Kozak a64bfe7a39
Merge pull request #977 from MilosKozak/persistent-text
show bg missing not no profile
2018-05-02 22:38:07 +02:00
Milos Kozak f9bbb72831
Merge pull request #979 from MilosKozak/lp-ps-always
LP: Allow ProfileSwitch before pump is connected.
2018-05-02 22:37:23 +02:00
Johannes Mockenhaupt 79458a1c73
Ignore harmless errors (un)subscribing to the message bus. 2018-05-02 22:36:52 +02:00
Milos Kozak 28430cc757 fix cob calculation 2018-05-02 22:35:51 +02:00
Milos Kozak e2f28e0ae4 fix rounding on bolus delivery 2018-05-02 22:20:27 +02:00
AdrianLxM a3421316ac
Allow ProfileSwitch before pump is connected.
https://github.com/MilosKozak/AndroidAPS/issues/969
2018-05-02 21:38:45 +02:00
Johannes Mockenhaupt 3b19db14fd
Clean up. 2018-05-02 21:25:04 +02:00
Johannes Mockenhaupt 22e90743aa
Fix #939. 2018-05-02 21:24:06 +02:00
AdrianLxM eb594c1867
show bg missing not no profile 2018-05-02 21:09:04 +02:00
AdrianLxM f1736f048e
Update strings.xml 2018-05-02 20:20:13 +02:00
Milos Kozak 8419f8d0e9 update socket.io to 1.0.0 2018-05-02 18:49:40 +02:00
Milos Kozak a36b1b2a10 Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2018-05-02 18:39:47 +02:00
Milos Kozak 4cc952900d show progress reason from iobcobthread 2018-05-02 18:39:37 +02:00
Milos Kozak 5671b99f30
Merge pull request #974 from MilosKozak/swedish-update
Swedis Update strings.xml
2018-05-02 18:02:51 +02:00
CaroGo a768c03462
Update strings.xml 2018-05-02 17:43:17 +02:00
Milos Kozak a4ff9d29e2
Merge branch 'dev' into swedish-update 2018-05-02 17:10:01 +02:00