caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity
4840 commits 1 branch 20 tags 140 MiB
Commit graph

4840 commits

This branch
This branch
All branches
Author SHA1 Message Date
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 52bca03601
Merge pull request #993 from McHoffi/McHoffi-typo-fix 
Typo fix
 2018-05-03 21:23:12 +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
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
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
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
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
Milos Kozak f8310d6974
Merge pull request #982 from jotomo/init-failed-msg 
Combo: better error message when initialization fails
 2018-05-02 23:19:32 +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
Milos Kozak d0e6a2258f
Merge pull request #976 from MilosKozak/swedish-update-1 
Update Swedish strings.xml
 2018-05-02 21:07:26 +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