boysim
|
b8c4a34484
|
Merge pull request #2 from MilosKozak/dev
Dev
|
2017-09-04 22:13:54 +02:00 |
|
Milos Kozak
|
90496d0a02
|
Merge pull request #410 from jotomo/ok-cancel-profile-change-refresh
Use OK/Cancel buttons for 'profile changes refresh from NS' dialog in…
|
2017-09-03 17:13:43 +02:00 |
|
Johannes Mockenhaupt
|
3bebea37ae
|
Use OK/Cancel buttons for 'profile changes refresh from NS' dialog in Treatments tab.
|
2017-09-03 01:53:30 +02:00 |
|
Milos Kozak
|
fa24368701
|
Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev
|
2017-09-02 10:26:07 +02:00 |
|
Milos Kozak
|
7801db5a29
|
fix danar bolus step
|
2017-09-02 10:25:46 +02:00 |
|
Milos Kozak
|
737c1f4e0b
|
Merge pull request #409 from MilosKozak/treatments-splotbroadcast
Split treatments into smaller packages before broadcasting
|
2017-09-01 16:30:54 +02:00 |
|
AdrianLxM
|
15a40cba80
|
Split treatments into smaller packages before broadcasting
|
2017-09-01 14:02:47 +02:00 |
|
Milos Kozak
|
3d956ed34a
|
Merge pull request #408 from apanasef/patch-2
update russian
|
2017-09-01 10:41:46 +02:00 |
|
fedor apanasenko
|
ed8582b36a
|
update russian
|
2017-09-01 10:37:59 +03:00 |
|
Milos Kozak
|
46f111076f
|
Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev
|
2017-08-31 22:01:25 +02:00 |
|
Milos Kozak
|
db952759e1
|
Insulin fragments consolidation
|
2017-08-31 22:00:45 +02:00 |
|
Milos Kozak
|
c312b51fcf
|
consolidate DanaR fragments
|
2017-08-31 19:32:28 +02:00 |
|
Milos Kozak
|
49b3a7cc1d
|
Merge pull request #407 from RadoslavR/patch-44
Update strings.xml
|
2017-08-31 10:52:11 +02:00 |
|
Radoslav Radev
|
e1c4074663
|
Update strings.xml
|
2017-08-31 09:09:26 +03:00 |
|
Milos Kozak
|
7da8b2de5c
|
visibility icon
|
2017-08-29 21:40:06 +02:00 |
|
Milos Kozak
|
7dfe77dc9c
|
single line in configbuilder
|
2017-08-29 19:47:32 +02:00 |
|
Milos Kozak
|
13b8a9ecf2
|
Merge pull request #404 from kakoni/master
Adding out_units support for determine-basal.js
|
2017-08-29 18:23:36 +02:00 |
|
Milos Kozak
|
981a96aa16
|
ConfigBuilder layout
|
2017-08-29 17:59:46 +02:00 |
|
Karri Niemelä
|
034faa4f6e
|
Adding support out_units
|
2017-08-29 15:06:53 +03:00 |
|
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 |
|