Commit graph

2898 commits

Author SHA1 Message Date
AdrianLxM
2e44734b61
Merge branch 'dev' into spanishmerge 2018-02-01 22:07:06 +01:00
AdrianLxM
276784c799 Merge branch 'patch-1' of https://github.com/CaroGo/AndroidAPS into dev180127 2018-02-01 22:02:27 +01:00
Markus M. May
b7ec90ca07 Remove java file object 2018-02-01 21:25:37 +01:00
Markus M. May
6d8c0770c3 Rework copying of libs 2018-02-01 21:11:28 +01:00
Milos Kozak
65ad55ef98
Merge pull request #638 from MilosKozak/AdrianLxM-wearnullprofile
check for null profile
2018-02-01 20:23:42 +01:00
Milos Kozak
463031bd31 FR language 2018-02-01 20:17:42 +01:00
Markus M. May
629b626306 Download jniLibs as dependency, delete on clean (in gradle) 2018-02-01 20:09:29 +01:00
AdrianLxM
96668cbf9b
check for null profile 2018-02-01 18:45:48 +01:00
Jamorham
b3c0daaeae
Enable isRefillingCapable 2018-02-01 17:39:28 +00:00
Milos Kozak
416c9f817b fix smb iob calculation 2018-02-01 17:12:19 +01:00
Milos Kozak
d088bfccc8 remove unused microBolusInsulin 2018-02-01 16:35:04 +01:00
Jamorham
6a12b0a931
Use bolus id for history entry 2018-02-01 14:37:16 +00:00
Jamorham
73ea3628b2
Extracted insight strings 2018-02-01 10:33:54 +00:00
Milos Kozak
fa46798fdf remove unused microBolusIOB 2018-02-01 10:57:05 +01:00
Milos Kozak
e779dbf221 fix merge conflict 2018-02-01 10:29:00 +01:00
Milos Kozak
f3769521a5 bump 1.59-dev 2018-02-01 10:25:28 +01:00
Milos Kozak
2157022735 bump 1.58 2018-01-31 23:21:02 +01:00
AdrianLxM
588cae4282
Merge pull request #627 from andrew-warrington/watchfaces
Watchfaces
2018-01-31 23:05:41 +01:00
Milos Kozak
035770f6d3
Merge pull request #631 from jotomo/issue-template
Add issue template.
2018-01-31 20:26:19 +01:00
CaroGo
815247dabb
Update strings.xml
I did a few changes...
2018-01-31 16:51:00 +01:00
Jamorham
7f73c59530
Nightscout + UI performance improvements 2018-01-31 14:23:22 +00:00
Johannes Mockenhaupt
1ea324d871
Add issue template. 2018-01-31 14:45:57 +01:00
Jamorham
d07d9d309e
Implement additional methods 2018-01-31 09:53:31 +00:00
Jamorham
ce0650a495
Check remote protocol version 2018-01-31 00:33:10 +00:00
Jamorham
c3b07d2a0f
Match library refactoring 2018-01-31 00:31:55 +00:00
Milos Kozak
fada51c380
Merge pull request #597 from triplem/test
Add a unit test for Insulin Plugin
2018-01-30 22:47:33 +01:00
Markus M. May
be6047066a Remove libs from this repository - moved to another one 2018-01-30 22:06:49 +01:00
Markus M. May
a6f65f5d33 Enhance insulin plugin test 2018-01-30 19:52:57 +01:00
Milos Kozak
56451a67bf
Merge pull request #628 from MilosKozak/AdrianLxM-filter-null-btdevices
filter null BT devices
2018-01-30 09:24:03 +01:00
Milos Kozak
df2a8ec835 Merge branch 'patch-5' into 'smb060'
show output in mmol like in AMA

See merge request MilosKozak/AndroidAPS!385
2018-01-30 07:57:56 +00:00
AdrianLxM
3a0d5d73f8
filter null BT devices 2018-01-30 01:02:21 +01:00
Jamorham
ff0256345f
Display more live pump data 2018-01-29 22:55:53 +00:00
Andrew Warrington
0f9273093a BaseWatchFace: Resolve issue causing Bolus and Wizard activities to fail to complete. 2018-01-29 23:34:03 +01:00
Andrew Warrington
44e6c874c0 BaseWatchFace: Resolve issue causing Bolus and Wizard activities to fail to complete. 2018-01-29 23:31:54 +01:00
Milos Kozak
af3b77e646 history browser initial work 2018-01-29 22:48:47 +01:00
Jamorham
ef2189fec6
Insight faux cancel tbr option 2018-01-29 21:31:06 +00:00
Milos Kozak
9255b93800 Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into history 2018-01-29 20:06:16 +01:00
Milos Kozak
b11e301391 ES translations 2018-01-29 20:05:16 +01:00
Roumen Georgiev
5e24289387 show output in mmol like in AMA 2018-01-29 16:43:45 +00:00
Milos Kozak
1eba5b79b8 Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2018-01-29 13:28:36 +01:00
Milos Kozak
c2dc3f9848 Merge branch 'danas' into smb060 2018-01-29 12:01:53 +01:00
Milos Kozak
af31c29134 Merge branch 'dev' into smb060 2018-01-29 12:01:02 +01:00
Milos Kozak
d6f9dd819c Merge branch 'smb-misc' into 'smb060'
Smb misc

See merge request MilosKozak/AndroidAPS!381
2018-01-29 10:50:27 +00:00
Milos Kozak
e55f88a255 Merge branch 'smb-apsresult' into 'smb060'
Clean up parsing OpenAPS result and applying it

See merge request MilosKozak/AndroidAPS!383
2018-01-29 10:46:40 +00:00
Milos Kozak
ac6a9ac723 Merge branch 'last-bolus-time' into 'smb060'
Make TreatmentsPlugin.getLastBolusTime robust.

See merge request MilosKozak/AndroidAPS!384
2018-01-29 10:37:25 +00:00
Milos Kozak
4cef8db54b Dana plugin refactoring 2018-01-29 11:24:03 +01:00
Johannes Mockenhaupt
449dbd79f7
Rename TBR to 'temp basal' 2018-01-29 03:14:10 +01:00
Johannes Mockenhaupt
6fa1badcdb
Clean up parsing of SMB result and applying the requests. 2018-01-29 03:13:57 +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
Johannes Mockenhaupt
b1fd66aae5
Make TreatmentsPlugin.getLastBolusTime robust.
Ignore carb-only treatments, ignore future records.

(cherry picked from commit cba015e)
2018-01-29 03:05:12 +01:00