Commit graph

404 commits

Author SHA1 Message Date
Milos Kozak ed11bb1d70 Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2018-03-02 00:00:09 +01:00
Milos Kozak c61fcdbe3f allow 15 & 30 pump disconnection 2018-03-01 23:59:44 +01:00
Milos Kozak 75a6366115 translations cleanup 2018-03-01 15:08:55 +01:00
Milos Kozak 7b91f0d490 allow to open G5 app from CGM button 2018-02-25 17:33:46 +01:00
Milos Kozak 32f2f4d6fa Merge branch 'g5cal' into buttons 2018-02-25 15:31:43 +01:00
Milos Kozak cb8fc905bb catch if G5 app is missing 2018-02-25 15:23:25 +01:00
Milos Kozak a7da0bb67a
Merge pull request #719 from jotomo/buttons
Moar buttons.
2018-02-25 11:05:21 +01:00
Jamorham 9d985ec3b7
Add FabricPrivacy 2018-02-22 12:30:36 +00:00
JamOrHam bc2f749ef3
Merge branch 'dev' into dev 2018-02-21 13:43:18 +00:00
Jamorham 67b397b417
Insight: preemptive connection preference option 2018-02-21 12:23:19 +00:00
Milos Kozak 1cb92861b5 Chinese to menu 2018-02-20 17:04:15 +01:00
Milos Kozak dc35c9f6b3 fix typos 2018-02-18 22:56:46 +01:00
Jamorham 9a76cdb3a1
Insight: add preemptive connection, keep-alive, statistics 2018-02-18 14:57:28 +00:00
Milos Kozak 0fe287bb79
Merge pull request #689 from AdrianLxM/smb-wear2
no wear vibrations on SMB (optional)
2018-02-18 12:39:36 +01:00
Johannes Mockenhaupt bf2e567f9c
Moar buttons. 2018-02-18 11:06:36 +01:00
Johannes Mockenhaupt 2bccf13213
Add shortname for G5. 2018-02-17 15:40:56 +01:00
AdrianLxM a23c76f473
Merge branch 'dev' into smb-wear2 2018-02-14 15:03:45 +01:00
AdrianLxM c821ef97d8 option to enable wear/SMB notifications 2018-02-14 15:02:04 +01:00
Johannes Mockenhaupt f8075927f2
Make new behaviour configurable, default on. 2018-02-13 00:34:24 +01:00
Milos Kozak d92a7e8ef1 Merge branch 'history' into dev 2018-02-11 23:46:20 +01:00
Milos Kozak fa2e46fbe5 remove CPP profile 2018-02-11 23:02:21 +01:00
Milos Kozak 943205c782 HardLimits refactor 2018-02-11 22:41:10 +01:00
Milos Kozak 359b8401b2
Merge pull request #678 from jamorham/dev
Updates to Insight plugin
2018-02-10 15:13:35 +01:00
Jamorham 046de51496
Insight few small changes 2018-02-10 09:29:23 +00:00
Johannes Mockenhaupt 43755f071d
Add mute button to error dialog.
So that users needn't hastily close the dialog to stop the sound
and then not being able to read the actual message.
2018-02-07 20:32:09 +01:00
Milos Kozak 6312b81e10 Merge branch 'smb060' into dev 2018-02-02 10:51:13 +01:00
Milos Kozak 411add616b
Merge pull request #632 from jamorham/dev
Add Insight Pump Plugin
2018-02-02 09:21:57 +01:00
Jamorham 73ea3628b2
Extracted insight strings 2018-02-01 10:33:54 +00:00
Milos Kozak af3b77e646 history browser initial work 2018-01-29 22:48:47 +01:00
Johannes Mockenhaupt 449dbd79f7
Rename TBR to 'temp basal' 2018-01-29 03:14:10 +01:00
Johannes Mockenhaupt 0655e4e676
SMB: clean up APSResult.toSpanned a bit.
(cherry picked from commit 10d7c79)
2018-01-29 03:13:57 +01:00
Milos Kozak 296d5059d6 SMB options in preferences 2018-01-27 14:47:04 +01:00
Milos Kozak 4af8e14417 Merge branch 'dev' into smb060 2018-01-27 13:47:41 +01:00
Milos Kozak ce3c888246 add RO language 2018-01-27 13:40:19 +01:00
Milos Kozak b2d9ad8986 Merge branch 'dev' into smb060 2018-01-26 22:49:25 +01:00
Milos Kozak d634ee7d4b CS translations 2018-01-26 22:10:27 +01:00
Milos Kozak 98e850b1b3 Merge branch 'dev' into smb060 2018-01-26 11:54:09 +01:00
Jamorham 54e2f7a712
Current work in progress 2018-01-25 17:30:16 +00:00
Jamorham 7a4bc3b694
Initial bits for Insight Pump 2018-01-24 14:18:31 +00:00
Milos Kozak f5a2c5bcd2 cancel extending bolus on pump disconnection 2018-01-21 23:38:24 +01:00
Milos Kozak fa48720f0e Merge branch 'dev' into smb060 2018-01-21 15:58:54 +01:00
Milos Kozak eedc38fbcf synchronized access to basal_v 2018-01-21 15:56:07 +01:00
Milos Kozak e5ede788ba Merge branch 'dev' into smb060 2018-01-21 13:38:21 +01:00
Milos Kozak 060895b33f better handling of wrong profiles 2018-01-21 13:37:38 +01:00
Milos Kozak 91a6c7a96c Merge branch 'dev' into smb060 2018-01-15 12:46:50 +01:00
Johannes Mockenhaupt be8534db51
Add strings for the Combo pump, including some renames.
Some virtualpump_* strings have been renamed to pump_* since they're
now used for multiple pumps.
2018-01-11 21:47:30 +01:00
Milos Kozak fbb120673f Merge branch 'dev' into smb060 2018-01-07 15:32:14 +01:00
Milos Kozak 1ff99c4814 prefill profile switch JSON from local store if not exists 2018-01-07 15:29:50 +01:00
Milos Kozak 144292576a
Merge branch 'dev' into watchfaces-steampunk 2018-01-05 11:36:48 +01:00
AdrianLxM 95bca1a92d actual bg in objective 1 2018-01-04 18:53:38 +01:00