Milos Kozak
|
9ec3efbaab
|
fix conflict
|
2017-10-09 23:14:46 +02:00 |
|
Milos Kozak
|
8f259042d6
|
fix NPE
|
2017-10-07 22:24:42 +02:00 |
|
Milos Kozak
|
6618d2fef2
|
fix negative timeshift
|
2017-10-07 20:42:56 +02:00 |
|
Milos Kozak
|
60086dac8d
|
Merge remote-tracking branch 'origin/dev' into profile
|
2017-10-07 18:30:55 +02:00 |
|
Milos Kozak
|
c56ecfced6
|
Merge pull request #447 from AdrianLxM/treatments-configbuilder2
treatments in config builder
|
2017-10-07 18:29:44 +02:00 |
|
Milos Kozak
|
ef645ca600
|
fix merge conflict
|
2017-10-07 18:27:20 +02:00 |
|
Milos Kozak
|
d6fb912ff9
|
Singleton & Crashlytics logging part 2
|
2017-10-07 17:48:03 +02:00 |
|
AdrianLxM
|
046c28856c
|
treatments in config builder
|
2017-10-07 01:18:28 +02:00 |
|
Milos Kozak
|
0e763724f6
|
Singleton & Crashlytics logging part 1
|
2017-10-06 16:39:59 +02:00 |
|
Milos Kozak
|
a1ca4677c0
|
log exception
|
2017-10-06 16:07:41 +02:00 |
|
Milos Kozak
|
4db82fd275
|
Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev
|
2017-10-06 13:15:57 +02:00 |
|
Milos Kozak
|
32d6e06b07
|
Merge pull request #444 from AdrianLxM/temptarget-presets
Temptarget presets
|
2017-10-06 13:15:06 +02:00 |
|
AdrianLxM
|
bd93fc1adb
|
temp target presets
|
2017-10-06 02:53:23 +02:00 |
|
Milos Kozak
|
e0794a6e7f
|
fix time shifting
|
2017-10-05 00:54:35 +02:00 |
|
Milos Kozak
|
f08809ff9e
|
rename button to activate profile
|
2017-10-04 23:33:02 +02:00 |
|
AdrianLxM
|
d6089bef73
|
Rv2 percent fix
|
2017-10-04 19:39:41 +02:00 |
|
AdrianLxM
|
7ce282dc4e
|
korean percent fix
|
2017-10-04 19:38:42 +02:00 |
|
Milos Kozak
|
9f6962cee5
|
serialize reload of treatments
|
2017-10-04 18:04:34 +02:00 |
|
AdrianLxM
|
3d2647321b
|
getTempBasalFromHistory -> getRealTempBasalFromHistory
|
2017-10-04 16:51:54 +02:00 |
|
AdrianLxM
|
9e2968f21a
|
Do not misinterpret a fake-extended as 0% temp.
|
2017-10-04 16:00:48 +02:00 |
|
Milos Kozak
|
8cecac0a7f
|
more LocalProfile work
|
2017-10-02 19:57:41 +02:00 |
|
Milos Kozak
|
dc6cbadbdf
|
fix TB & EB is not set
|
2017-09-25 19:34:49 +02:00 |
|
Milos Kozak
|
d9f59840b6
|
Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into food
|
2017-09-24 22:47:50 +02:00 |
|
Milos Kozak
|
4fbe7d1000
|
food database support
|
2017-09-24 22:47:18 +02:00 |
|
Milos Kozak
|
91b02d4d39
|
fill dialog refactor & code clean
|
2017-09-24 14:51:16 +02:00 |
|
Milos Kozak
|
3c7abff88d
|
remove unused imports
|
2017-09-24 14:28:26 +02:00 |
|
Milos Kozak
|
1823cd3f24
|
extended bolus dialog refactor
|
2017-09-24 13:00:59 +02:00 |
|
Milos Kozak
|
547f09ffbd
|
allow to view profile from overview
|
2017-09-24 11:45:32 +02:00 |
|
Milos Kozak
|
c79b750a9c
|
reactor OptionsToShow
|
2017-09-24 11:08:04 +02:00 |
|
Milos Kozak
|
082414f0d3
|
CPP support to profile switch
|
2017-09-24 10:39:54 +02:00 |
|
Milos Kozak
|
349b27e31a
|
NS profile fragment shows all profiles
|
2017-09-23 23:54:43 +02:00 |
|
Milos Kozak
|
6393ee5e10
|
CPP functionality to Profile.class
|
2017-09-23 23:12:08 +02:00 |
|
Milos Kozak
|
b3bcb778e0
|
check for NPE in posted dialogs
|
2017-09-23 20:12:53 +02:00 |
|
SMUSTAF1
|
81fe9ebdcc
|
Clear the SMS text field if the user removes the old number.
|
2017-09-20 13:54:05 +02:00 |
|
Milos Kozak
|
e1903840dd
|
handle received foods in nsclient
|
2017-09-20 10:20:50 +02:00 |
|
Milos Kozak
|
b797530c9d
|
BG & IOB contribution on by default in wizard
|
2017-09-18 21:57:35 +02:00 |
|
Milos Kozak
|
d2815e4045
|
check for NaN
|
2017-09-18 21:52:06 +02:00 |
|
Milos Kozak
|
bf748f3d4b
|
Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev
|
2017-09-18 20:56:42 +02:00 |
|
Milos Kozak
|
8785bc63d5
|
loadEvents after bolus in separate thread
|
2017-09-18 20:54:53 +02:00 |
|
Milos Kozak
|
c2afa328e3
|
Merge branch 'dev' into tt-in-wizard
|
2017-09-18 20:44:54 +02:00 |
|
Milos Kozak
|
8daf9e5c2c
|
use notification for bolus delivery failed message when window has been destroyed
|
2017-09-18 20:40:03 +02:00 |
|
Milos Kozak
|
17fa2617f7
|
fix null pointer exception
|
2017-09-18 20:23:05 +02:00 |
|
Milos Kozak
|
3f7819937b
|
split JSON arrays to 50 elements
|
2017-09-18 20:10:53 +02:00 |
|
Milos Kozak
|
01002f11e7
|
Merge pull request #416 from jotomo/vpump-enact
VirtualPump: set PumpEnactResult.enacted.
|
2017-09-14 10:06:01 +02:00 |
|
Johannes Mockenhaupt
|
cb3b472488
|
VirtualPump: set PumpEnactResult.enacted.
(cherry picked from commit ec49bc3)
|
2017-09-13 13:16:48 +02:00 |
|
Milos Kozak
|
69b04fdf26
|
Merge pull request #413 from samihusseingit/dev
Dev
|
2017-09-11 20:12:51 +02:00 |
|
Johannes Mockenhaupt
|
936ce42cc0
|
Remove duplicate logging.
|
2017-09-10 14:24:00 +02:00 |
|
Johannes Mockenhaupt
|
612efa6a13
|
Revert "Make the BolusProgress dialog a bit more self-contained."
Breaks dismissal of dialog (only one invocation of
EventDismissBolusprogressIfRunning also sets bolusEnded=true).
This reverts commit c11455dff1.
|
2017-09-09 18:16:13 +02:00 |
|
Johannes Mockenhaupt
|
c11455dff1
|
Make the BolusProgress dialog a bit more self-contained.
(cherry picked from commit 75db72a)
|
2017-09-09 16:41:21 +02:00 |
|
Johannes Mockenhaupt
|
c227e0e5fa
|
Dead code be gone.
(cherry picked from commit bb626ce)
|
2017-09-09 16:41:16 +02:00 |
|