Milos Kozak
|
addd6c8232
|
fix conflict
|
2017-08-28 19:15:33 +02:00 |
|
|
Milos Kozak
|
03bf1abdd4
|
add WakeLock#isHeld()
|
2017-08-27 11:57:06 +02:00 |
|
|
Milos Kozak
|
1417410dbb
|
add WakeLock#isHeld()
|
2017-08-27 11:53:36 +02:00 |
|
|
Milos Kozak
|
162389a7e0
|
Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev
|
2017-08-27 11:46:25 +02:00 |
|
|
Milos Kozak
|
ba967df2e3
|
disable careportal buttons until profile is set
|
2017-08-27 11:44:39 +02:00 |
|
|
Milos Kozak
|
c9bfd27d93
|
Merge pull request #396 from warstar2187/dev
KR translation update
|
2017-08-27 00:38:44 +02:00 |
|
|
Milos Kozak
|
ad22737585
|
Merge pull request #395 from RadoslavR/patch-42
Update strings.xml
|
2017-08-27 00:38:07 +02:00 |
|
|
warstar2187
|
761f9f5075
|
Update strings.xml
|
2017-08-27 06:09:17 +09:00 |
|
|
Radoslav Radev
|
6bf120e9da
|
Update strings.xml
|
2017-08-26 22:59:14 +03:00 |
|
|
Milos Kozak
|
e4c98e6cd1
|
make dev 1.52
|
2017-08-26 21:28:08 +02:00 |
|
|
Milos Kozak
|
b02b1829ad
|
put back sensitivity plugins
|
2017-08-26 21:26:40 +02:00 |
|
|
Milos Kozak
|
bd016cb876
|
Merge pull request #394 from MilosKozak/dev
Merge 1.51 to master
|
2017-08-26 21:11:38 +02:00 |
|
|
Milos Kozak
|
491378caf5
|
1.51 bump
|
2017-08-26 20:42:53 +02:00 |
|
|
Milos Kozak
|
3369ce1759
|
temporary remove untested plugin for release
|
2017-08-26 20:42:25 +02:00 |
|
|
Milos Kozak
|
40d86eb87a
|
fix strings
|
2017-08-26 14:37:38 +02:00 |
|
|
Milos Kozak
|
6ea7549e4f
|
update languages
|
2017-08-26 12:07:37 +02:00 |
|
|
Milos Kozak
|
12a0367e67
|
Merge pull request #391 from boysim/dev
Update strings.xml
|
2017-08-25 22:33:08 +02:00 |
|
|
boysim
|
196e0bb309
|
Update strings.xml
|
2017-08-24 23:18:21 +02:00 |
|
|
Milos Kozak
|
adceef3641
|
fix merge conflict
|
2017-08-23 23:42:51 +02:00 |
|
|
Milos Kozak
|
4e8d92a74b
|
Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev
|
2017-08-23 23:04:10 +02:00 |
|
|
Milos Kozak
|
ad3d175b02
|
better handling DetailedBolusInfo in v2 driver
|
2017-08-23 23:03:28 +02:00 |
|
|
Milos Kozak
|
d6a27c1af0
|
1.5h
|
2017-08-23 13:28:07 +02:00 |
|
|
Milos Kozak
|
01a93a35b9
|
Merge branch 'dev' into smb
|
2017-08-22 20:34:38 +02:00 |
|
|
Milos Kozak
|
c98cd3c834
|
Merge pull request #375 from samihusseingit/delay_in_bg_update_onResume
Delay in bg update on resume
|
2017-08-22 20:33:56 +02:00 |
|
|
Milos Kozak
|
e74c2b564a
|
fix conflicts
|
2017-08-22 20:25:10 +02:00 |
|
|
Milos Kozak
|
0551f7f16d
|
Merge pull request #387 from MilosKozak/invalid-overview
Fill treatments in Overview
|
2017-08-22 20:20:28 +02:00 |
|
|
Milos Kozak
|
5b17eee586
|
Merge pull request #389 from jotomo/cleanups
Cleanups
|
2017-08-22 20:20:10 +02:00 |
|
|
Johannes Mockenhaupt
|
bde57fde5f
|
Don't change schema.
|
2017-08-22 18:28:36 +02:00 |
|
|
Milos Kozak
|
a4d5f9b5df
|
Merge pull request #388 from MilosKozak/AdrianLxM-patch-1
correct supercall
|
2017-08-22 14:08:33 +02:00 |
|
|
Johannes Mockenhaupt
|
56423028f6
|
Fix comparing non-primitives.
|
2017-08-22 13:47:02 +02:00 |
|
|
Johannes Mockenhaupt
|
30372897c0
|
Generify MainApp.getSpecificPlugin.
|
2017-08-22 13:47:02 +02:00 |
|
|
Johannes Mockenhaupt
|
59c7dbef27
|
Fix some warnings / simplify a bit.
|
2017-08-22 13:47:02 +02:00 |
|
|
Johannes Mockenhaupt
|
97d0140614
|
Remove now unused dia, insulinInterfaceId from Treatment.
|
2017-08-22 13:47:02 +02:00 |
|
|
AdrianLxM
|
d5ea2a2f08
|
correct supercall
|
2017-08-22 13:26:48 +02:00 |
|
|
AdrianLxM
|
4d33e1df97
|
Use bolusstep granularity in fill dialog
|
2017-08-22 13:02:56 +02:00 |
|
|
AdrianLxM
|
7ea33c7de4
|
bugfix: fill as invalid treatments if triggered from phone
|
2017-08-22 12:57:03 +02:00 |
|
|
AdrianLxM
|
3f8dea1197
|
add invalid treatments to charts in "invalid" colour
|
2017-08-22 12:56:17 +02:00 |
|
|
Milos Kozak
|
6c899fbf5c
|
Merge pull request #386 from MilosKozak/boluswizard-insulin-granularity
Use bolusstep as step for insulin correction in wizard
|
2017-08-22 09:02:19 +02:00 |
|
|
samihusseingit
|
b7b196c077
|
Merge pull request #1 from MilosKozak/dev
Dev
|
2017-08-22 07:16:03 +02:00 |
|
|
AdrianLxM
|
6b0bf5860c
|
Use bolusstep as step for insulin correction in wizard
|
2017-08-22 00:41:23 +02:00 |
|
|
Milos Kozak
|
aad168c50f
|
visualize SMB
|
2017-08-21 17:42:26 +02:00 |
|
|
Milos Kozak
|
204c39880f
|
mark SMB boluses in treatments tab
|
2017-08-21 17:22:25 +02:00 |
|
|
Milos Kozak
|
4f16700dc0
|
provide lastBolusTime
|
2017-08-21 15:47:37 +02:00 |
|
|
Milos Kozak
|
ebfc4e3075
|
colored predictions
|
2017-08-21 15:36:52 +02:00 |
|
|
Milos Kozak
|
f5143b2ec4
|
display UAM prediction
|
2017-08-21 09:24:17 +02:00 |
|
|
Milos Kozak
|
650d9754c8
|
Merge pull request #383 from ellabellakaramella/patch-1
Update strings.xml
|
2017-08-21 08:54:02 +02:00 |
|
|
Milos Kozak
|
ec114c3b38
|
execute SMB
|
2017-08-21 08:41:34 +02:00 |
|
|
Patrik Nilsson
|
c91988081f
|
Update strings.xml
Updated some changes. Milos, I jjust copied the hole SV xml-file. :-)
|
2017-08-21 00:01:12 +02:00 |
|
|
Milos Kozak
|
466ba2907b
|
Merge branch 'dev' into smb
|
2017-08-20 21:53:19 +02:00 |
|
|
Milos Kozak
|
33cf707d45
|
Merge pull request #380 from MilosKozak/dia-divisor-fix
Dia divisor / bolussnooze fix
|
2017-08-20 21:52:42 +02:00 |
|