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
|
96c1a18a66
|
Merge pull request #435 from PoweRGbg/dev
alesinka's icons added to the DanaR tab
|
2017-10-03 22:28:04 +02:00 |
|
Roumen Georgiev
|
ef803d6a41
|
In one line
|
2017-09-29 15:06:23 +03:00 |
|
Roumen Georgiev
|
e004b95a60
|
Update danar_fragment.xml
|
2017-09-29 09:50:07 +03:00 |
|
Roumen Georgiev
|
7444bc11fa
|
text identation
|
2017-09-29 09:47:29 +03:00 |
|
Roumen Georgiev
|
2e61bc136f
|
Add files via upload
|
2017-09-29 09:44:25 +03:00 |
|
Roumen Georgiev
|
3c0a509541
|
Add files via upload
|
2017-09-29 09:43:42 +03:00 |
|
Roumen Georgiev
|
a152f94f53
|
Add files via upload
|
2017-09-29 09:42:42 +03:00 |
|
Roumen Georgiev
|
cb982477cd
|
Add files via upload
|
2017-09-29 09:41:32 +03:00 |
|
Roumen Georgiev
|
271534a64b
|
Add files via upload
|
2017-09-29 09:40:58 +03:00 |
|
Roumen Georgiev
|
92e2008692
|
Adding button Icons
|
2017-09-29 09:40:11 +03:00 |
|
Milos Kozak
|
ba54dacffb
|
1.54-dev
|
2017-09-25 19:51:05 +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
|
b3bcb778e0
|
check for NPE in posted dialogs
|
2017-09-23 20:12:53 +02:00 |
|
Milos Kozak
|
2972b48d5a
|
Merge pull request #424 from samihusseingit/clear_SMS_number_field
Clear sms number field
|
2017-09-22 15:40:50 +02:00 |
|
SMUSTAF1
|
81fe9ebdcc
|
Clear the SMS text field if the user removes the old number.
|
2017-09-20 13:54:05 +02:00 |
|
samihusseingit
|
0113092023
|
Merge pull request #4 from MilosKozak/dev
Dev
|
2017-09-20 13:11:41 +02:00 |
|
Milos Kozak
|
e1903840dd
|
handle received foods in nsclient
|
2017-09-20 10:20:50 +02:00 |
|
Milos Kozak
|
cd7c7733ea
|
bump 1.53
|
2017-09-18 21:59:01 +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
|
2eca4ba90c
|
Merge pull request #423 from MilosKozak/revert-421-dev
Revert "Rounding issues visible in nightscout insulin field"
|
2017-09-18 21:24:39 +02:00 |
|
Milos Kozak
|
d7f8d75d06
|
Revert "Rounding issues visible in nightscout insulin field"
|
2017-09-18 21:24:22 +02:00 |
|
Milos Kozak
|
a98d2e846f
|
Merge pull request #419 from dylanleonard/feature_time_spinner_fix
Time Spinner Local Profile Fix
|
2017-09-18 21:06:34 +02:00 |
|
Dylan Leonard
|
d8590fe8f1
|
Clarified boolean logic with parentheses :)
|
2017-09-18 15:04:46 -04: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
|
c53b5918ab
|
Merge pull request #415 from jotomo/tt-in-wizard
TT in wizard
|
2017-09-18 20:56:26 +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
|
42ee7c668e
|
Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev
|
2017-09-18 20:43:24 +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 |
|
Dylan Leonard
|
4f5987b72a
|
Added cases to accept both a.m./p.m. and AM/PM
|
2017-09-18 14:20:28 -04:00 |
|
Milos Kozak
|
3f7819937b
|
split JSON arrays to 50 elements
|
2017-09-18 20:10:53 +02:00 |
|
Milos Kozak
|
aa89e8f886
|
Merge pull request #421 from wouterla/dev
Rounding issues visible in nightscout insulin field
|
2017-09-18 19:46:40 +02:00 |
|
Milos Kozak
|
6b9d457b73
|
Merge pull request #422 from boysim/dev
Dev
|
2017-09-18 19:36:30 +02:00 |
|
samihusseingit
|
12b22ddc6d
|
Merge pull request #3 from MilosKozak/dev
Dev
|
2017-09-18 09:53:28 +02:00 |
|
boysim
|
81aadcc1be
|
Update strings.xml
|
2017-09-17 17:02:27 +02:00 |
|
Wouter Lagerweij
|
02c2213545
|
Changed rounding to use BigDecimals to avoid noisy long doubles in output
|
2017-09-17 14:27:49 +02:00 |
|
Dylan Leonard
|
db4d203437
|
Revert "Merge branch 'dev' of C:\Users\Dylan\StudioProjects\AndroidAPS fork with conflicts."
This reverts commit 4bda222786.
|
2017-09-16 20:02:08 -04:00 |
|
Dylan Leonard
|
91f0c21306
|
Changed how time strings are parsed to fix a problem where PM times were being saved as the AM version any time toSeconds was called
|
2017-09-16 19:30:07 -04:00 |
|
Dylan Leonard
|
4bda222786
|
Merge branch 'dev' of C:\Users\Dylan\StudioProjects\AndroidAPS fork with conflicts.
|
2017-09-16 19:27:10 -04:00 |
|
Wouter Lagerweij
|
aaa3f648d0
|
Removed unused imports
|
2017-09-17 00:56:00 +02:00 |
|
Wouter Lagerweij
|
e350c8c3c3
|
Rounding fix
|
2017-09-17 00:53:16 +02:00 |
|
boysim
|
9d62d498df
|
Merge pull request #4 from MilosKozak/dev
Dev
|
2017-09-16 23:07:56 +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 |
|