caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity
14523 commits 1 branch 20 tags 140 MiB
Commit graph

14523 commits

This branch
This branch
All branches
Author SHA1 Message Date
Johannes Mockenhaupt f6c5b95904
Merge remote-tracking branch 'origin/master' into combo-scripter-v2 
* origin/master:
  Revert "Update strings.xml"
  bump 1.58
  Update strings.xml
  Add issue template.
  Enhance insulin plugin test
  filter null BT devices
  BaseWatchFace: Resolve issue causing Bolus and Wizard activities to fail to complete.
  BaseWatchFace: Resolve issue causing Bolus and Wizard activities to fail to complete.
  ES translations
  Dana plugin refactoring
  KO language cleanup
  Update strings.xml
  Update strings.xml
  Bg translation
  add RO language
  CS translations
  ButterKnife to Dana fragment
  bump 1.57a-dev
  Add a unit test for Insulin Plugin

# Conflicts:
#	app/build.gradle
#	app/src/main/res/values-de/strings.xml
#	app/src/main/res/values-nl/strings.xml
#	app/src/main/res/values/strings.xml
 2018-02-03 16:45:29 +01:00
Johannes Mockenhaupt 435c4dee85
Create Answer events when adding bolus to DB fails. 
(cherry picked from commit 947ea4f)
 2018-02-03 16:33:52 +01:00
Johannes Mockenhaupt 6c9effd027
Minor cleanup to reduce merge noise. 
(cherry picked from commit 4015f73)
 2018-02-03 16:33:50 +01:00
Johannes Mockenhaupt f49f3c7e4b
Clean up string resources. 
(cherry picked from commit 4adcffc)
 2018-02-03 16:33:40 +01:00
Timm Korte c33232108d remote unused import 2018-02-03 14:57:36 +01:00
Timm Korte c4a5285c24 update bg for treatment in the past via careportal 2018-02-03 12:00:59 +01:00
AdrianLxM b21fac92e9
revert min_5m_carbimpact to int 2018-02-02 22:46:52 +01:00
AdrianLxM 4f05917467
autosens deactivated -> 1 2018-02-02 22:45:18 +01:00
Milos Kozak 0832ae9491
Merge pull request #648 from jotomo/do-not-loop-for-smb-treatment-change 
Do not loop for SMB treatment change
 2018-02-02 22:26:49 +01:00
Johannes Mockenhaupt 5adaff6bc6
Don't run loop on treatment change if it's an SMB. 2018-02-02 21:27:05 +01:00
Markus M. May 41ae8e45db Revert recent changes 2018-02-02 20:00:31 +01:00
Johannes Mockenhaupt eedd2ee28b
Add bg/treatment to EventNewBG/EventTreatmentChange. 2018-02-02 19:04:28 +01:00
Jamorham 8e2fe7eaec
Insight ConstraintsInterface and Mstatus response type 2018-02-02 15:09:20 +00:00
Milos Kozak 9797f6e5f4 fix NPE 2018-02-02 15:33:19 +01:00
Milos Kozak bb21f2ae7b fix NPE 2018-02-02 15:31:25 +01:00
Simon Pauwels e3f9954e62
Merge pull request #24 from jotomo/combo-scripter-v2 
feb 2
 2018-02-02 15:13:57 +01:00
Milos Kozak d9cfe15b87 fix rendering absolute basal line 2018-02-02 14:44:56 +01:00
Johannes Mockenhaupt a07a4beaf8
Combo: update timestampOfLastKnownPumpBolusRecord after bolusing. 2018-02-02 11:59:11 +01:00
Milos Kozak 6312b81e10 Merge branch 'smb060' into dev 2018-02-02 10:51:13 +01:00
Johannes Mockenhaupt 1f06d801a2
Combo: retry twice to establish connection before giving up. 
(cherry picked from commit a16560a)
 2018-02-02 10:06:04 +01:00
Milos Kozak 6d968b099a
Merge pull request #642 from Cukrovka/patch-1 
Update strings.xml
 2018-02-02 09:47:38 +01:00
Cukrovka af5dc7cc7b
Update strings.xml 
Oprava diakritiky.
 2018-02-02 09:36:03 +01:00
Milos Kozak 411add616b
Merge pull request #632 from jamorham/dev 
Add Insight Pump Plugin
 2018-02-02 09:21:57 +01:00
Milos Kozak 87722abb64
Merge pull request #640 from MilosKozak/spanishmerge 
Spanishmerge
 2018-02-02 09:18:07 +01:00
Milos Kozak 72eed13932 Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2018-02-02 09:17:51 +01:00
Milos Kozak 727ace4cc1 check for NPE 2018-02-02 09:17:26 +01:00
Johannes Mockenhaupt 26e7834093
Clean up, no behavioral changes and a bigger bed. 2018-02-02 00:40:24 +01:00
AdrianLxM aca422dfb6
remove duplicates 2018-02-01 23:55:08 +01:00
Markus M. May 8b6bac6144 Rework ivy repo, use a homegrown mvn repo 2018-02-01 23:28:54 +01:00
Milos Kozak c953086e3d Merge branch 'smb-events' into 'smb060' 
Let IobCob handle EventNewBg and loop act on IobCob result.

See merge request MilosKozak/AndroidAPS!379
 2018-02-01 22:13:59 +00:00
Milos Kozak 90b0e6d84a Merge branch 'dev' into smb060 2018-02-01 23:02:00 +01:00
Milos Kozak 36cb4fc474 recover deviation slope calculation 2018-02-01 22:57:58 +01:00
Jamorham cdb3bc24c2
Use Config.DANAR to enable Insight 2018-02-01 21:37:21 +00:00
AdrianLxM cea99a968f
small fixes 2018-02-01 22:09:57 +01:00
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