Commit graph

  • f8310d6974
    Merge pull request #982 from jotomo/init-failed-msg Milos Kozak 2018-05-02 23:19:32 +0200
  • 396268d9c8
    Send invalid boluses (prime boluses) to watch. Johannes Mockenhaupt 2018-05-02 22:49:31 +0200
  • 599c87f794
    Combo: better error message when initialization fails. Johannes Mockenhaupt 2018-05-02 22:34:55 +0200
  • a64bfe7a39
    Merge pull request #977 from MilosKozak/persistent-text Milos Kozak 2018-05-02 22:38:07 +0200
  • f9bbb72831
    Merge pull request #979 from MilosKozak/lp-ps-always Milos Kozak 2018-05-02 22:37:23 +0200
  • 79458a1c73
    Ignore harmless errors (un)subscribing to the message bus. Johannes Mockenhaupt 2018-05-02 22:36:52 +0200
  • 28430cc757 fix cob calculation Milos Kozak 2018-05-02 22:35:51 +0200
  • e2f28e0ae4 fix rounding on bolus delivery Milos Kozak 2018-05-02 22:20:27 +0200
  • 07c47a4ba7 Start de translation Markus M. May 2018-05-02 21:45:16 +0200
  • a3421316ac
    Allow ProfileSwitch before pump is connected. AdrianLxM 2018-05-02 21:38:45 +0200
  • 3b19db14fd
    Clean up. Johannes Mockenhaupt 2018-05-02 21:25:04 +0200
  • 22e90743aa
    Fix #939. Johannes Mockenhaupt 2018-05-02 21:24:06 +0200
  • eb594c1867
    show bg missing not no profile AdrianLxM 2018-05-02 21:09:04 +0200
  • d0e6a2258f
    Merge pull request #976 from MilosKozak/swedish-update-1 Milos Kozak 2018-05-02 21:07:26 +0200
  • f1736f048e
    Update strings.xml AdrianLxM 2018-05-02 20:20:13 +0200
  • 8419f8d0e9 update socket.io to 1.0.0 Milos Kozak 2018-05-02 18:49:40 +0200
  • a36b1b2a10 Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev Milos Kozak 2018-05-02 18:39:47 +0200
  • 4cc952900d show progress reason from iobcobthread Milos Kozak 2018-05-02 18:39:37 +0200
  • 5671b99f30
    Merge pull request #974 from MilosKozak/swedish-update Milos Kozak 2018-05-02 18:02:51 +0200
  • 6c78bdcdca
    Merge pull request #975 from CaroGo/patch-2 AdrianLxM 2018-05-02 17:51:30 +0200
  • a768c03462
    Update strings.xml CaroGo 2018-05-02 17:43:17 +0200
  • a4ff9d29e2
    Merge branch 'dev' into swedish-update Milos Kozak 2018-05-02 17:10:01 +0200
  • e42d5f1204 Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev Milos Kozak 2018-05-02 17:05:32 +0200
  • 42164489c8 cs translations Milos Kozak 2018-05-02 17:05:20 +0200
  • f52451085c
    remove translation of language names AdrianLxM 2018-05-02 16:41:56 +0200
  • fb61f3cde2
    Update strings.xml AdrianLxM 2018-05-02 16:39:28 +0200
  • 6697c66435
    Merge pull request #971 from jotomo/watch-pred-colors Milos Kozak 2018-05-02 16:38:01 +0200
  • c51635dba4
    Watch: colored preds. Johannes Mockenhaupt 2018-05-02 00:51:59 +0200
  • efff5d4e10
    Merge pull request #966 from jotomo/greener-grass Milos Kozak 2018-05-02 15:05:27 +0200
  • e856306267
    Merge pull request #919 from PoweRGbg/dev Milos Kozak 2018-05-02 15:04:24 +0200
  • e562d0f437
    Merge pull request #957 from triplem/charging_merged Milos Kozak 2018-05-02 15:04:00 +0200
  • b715c3f0c7
    Merge pull request #963 from MilosKozak/use-gs Milos Kozak 2018-05-02 15:02:04 +0200
  • 32323d673b
    Brighter green for "treatment active" for better readability. Johannes Mockenhaupt 2018-05-02 15:01:49 +0200
  • 926ee535d5 use MainApp.gs instead of context 2 AdrianLxM 2018-05-02 14:28:16 +0200
  • d289c5c7d7 use MainApp.gs instead of context AdrianLxM 2018-05-02 14:27:23 +0200
  • 3f3959f785 use MainApp.gs instead of getString from Activity/Dialog 2 AdrianLxM 2018-05-02 14:21:53 +0200
  • 611d761a41 use MainApp.gs instead of getString from Activity/Dialog AdrianLxM 2018-05-02 14:16:40 +0200
  • 4a22fd355d Merge remote-tracking branch 'milosremote/dev' into use-gs AdrianLxM 2018-05-02 14:11:45 +0200
  • a42bded248
    Merge pull request #962 from MilosKozak/cob-status AdrianLxM 2018-05-02 14:04:16 +0200
  • 5aa3a88c7f remove direct access to sResources 9 AdrianLxM 2018-05-02 13:59:27 +0200
  • 166f2843df remove direct access to sResources 8 AdrianLxM 2018-05-02 13:58:52 +0200
  • de4643d16f remove direct access to sResources 8 AdrianLxM 2018-05-02 13:57:28 +0200
  • 74d0c71712 remove direct access to sResources 7 AdrianLxM 2018-05-02 13:51:24 +0200
  • 545d1d1586 remove direct access to sResources 6 AdrianLxM 2018-05-02 13:50:31 +0200
  • 0e4e36f2b1 remove direct access to sResources 5 AdrianLxM 2018-05-02 13:49:24 +0200
  • 3979913a6d remove direct access to sResources 4 AdrianLxM 2018-05-02 13:46:38 +0200
  • 2af62d8e4e remove direct access to sResources 3 AdrianLxM 2018-05-02 13:42:50 +0200
  • a8382daefd remove direct access to sResources 2 AdrianLxM 2018-05-02 13:36:56 +0200
  • 81ad2779bc remove direct access to sResources 1 AdrianLxM 2018-05-02 13:32:41 +0200
  • cfaa26d337 remove one more gs helper AdrianLxM 2018-05-02 13:28:58 +0200
  • 20263c9fe4 remove other gs helper methods AdrianLxM 2018-05-02 13:17:57 +0200
  • 73b41a7162 some more gs AdrianLxM 2018-05-02 13:12:08 +0200
  • 7b6402de09 use gs function in MainApp to get strings AdrianLxM 2018-05-02 13:04:21 +0200
  • 2749c1c853 refactor cob string AdrianLxM 2018-05-02 11:19:03 +0200
  • 6fa3c04db8
    Merge pull request #959 from MilosKozak/cob-status Milos Kozak 2018-05-02 11:08:49 +0200
  • 24bd509ec6 COB in ongoing notification AdrianLxM 2018-05-02 08:04:34 +0200
  • c445c078e1 add g to default COB as well AdrianLxM 2018-05-02 07:57:29 +0200
  • 915dac8ef3 COB in external status AdrianLxM 2018-05-02 07:55:55 +0200
  • f75329f5dc move COB string representation to CobInfo AdrianLxM 2018-05-02 07:51:04 +0200
  • 15f4f64c4f using View.generateId() instead of fixed value Roumen Georgiev 2018-05-02 09:22:26 +0300
  • 55db89b547
    Merge pull request #958 from triplem/refix_objectives Milos Kozak 2018-05-02 07:38:03 +0200
  • 02a8519f28 Merge branch 'master' into riley_link_medtronic Andy Rozman 2018-05-01 22:53:09 +0100
  • 4b121ae892 - copied roundtrip2 project into here (for easier use), some of it might be reused - added PumpCommon - added PumpMedtronic Andy Rozman 2018-05-01 22:44:53 +0100
  • 2d3d39d1dc Use common helper method for day calculation Markus M. May 2018-05-01 23:43:18 +0200
  • a46b038381 use correct number format Markus M. May 2018-05-01 23:34:40 +0200
  • de92125967 Fixes wrong algo Markus M. May 2018-05-01 22:49:44 +0200
  • 8a627603ea Revert lib change Markus M. May 2018-05-01 22:23:24 +0200
  • 306d45bb3e Fix Boolean thingy Markus M. May 2018-05-01 22:15:22 +0200
  • 02e9ce105c Add boolean thingie from Adrian ;-) Markus M. May 2018-05-01 22:01:08 +0200
  • 12d80e96ef Merge latest dev version Markus M. May 2018-05-01 21:56:33 +0200
  • e91fd00836 Add Unit-Test, as well as fixtures for SSID handling Markus M. May 2018-05-01 21:46:37 +0200
  • 6755df4482
    Merge pull request #954 from soko78/patch-1 AdrianLxM 2018-05-01 20:33:50 +0200
  • 183f2cd6b3
    Update strings.xml soko78 2018-05-01 20:30:53 +0200
  • dbca668afd
    Merge pull request #952 from jotomo/rainbow Milos Kozak 2018-05-01 20:10:59 +0200
  • 537be09493
    Merge pull request #950 from jotomo/oreo-persistent-notification-annoyance Milos Kozak 2018-05-01 20:08:17 +0200
  • eb7b67781c
    Merge pull request #947 from jotomo/issue-940 Milos Kozak 2018-05-01 20:07:46 +0200
  • c991673de1
    Merge pull request #948 from MilosKozak/zerotempiob Milos Kozak 2018-05-01 20:06:32 +0200
  • cc8d950ca6
    Merge pull request #951 from TebbeUbben/dev Milos Kozak 2018-05-01 20:06:16 +0200
  • a362eeb31b
    Fix unit tests for added Combo plugin w/o engineering mode. Johannes Mockenhaupt 2018-05-01 13:25:12 +0200
  • af563474d5
    Skip predictions below 40. Johannes Mockenhaupt 2018-05-01 18:18:06 +0200
  • 1e80ca22c6
    Don't draw invalidated SMBs. Johannes Mockenhaupt 2018-05-01 19:23:38 +0200
  • ee61a71181
    Sort predictions so they're properly displayed in the graph. Johannes Mockenhaupt 2018-05-01 19:23:12 +0200
  • 5ef7506e5f
    Clean up prediction colors. Johannes Mockenhaupt 2018-05-01 19:16:28 +0200
  • e70791dc2f
    gradle rc2 AdrianLxM 2018-05-01 18:07:08 +0200
  • 60d3cde0d3 Compat for SR 1.6.0 TebbeUbben 2018-05-01 17:29:21 +0200
  • 4d1515769f
    Make persistent notification not peak on every update on Oreo. Johannes Mockenhaupt 2018-05-01 14:59:40 +0200
  • 3d5fb96d7d fix zeroTempIOB AdrianLxM 2018-05-01 13:29:15 +0200
  • 55077d3ad8 Merge remote-tracking branch 'milosremote/dev' into aaps20_rc2 AdrianLxM 2018-05-01 13:29:23 +0200
  • 4789ac0616 fix zeroTempIOB AdrianLxM 2018-05-01 13:29:15 +0200
  • 7fbab357e8
    Fix unit tests for added Combo plugin w/o engineering mode. Johannes Mockenhaupt 2018-05-01 13:25:12 +0200
  • 8c3df40fdf
    Don't create empty future carbs records. Fixes #940. Johannes Mockenhaupt 2018-05-01 12:22:01 +0200
  • 73d7d98354
    Merge pull request #944 from winni67/patch-1 Milos Kozak 2018-05-01 09:20:00 +0200
  • 1da5fb2030
    Merge pull request #2 from MilosKozak/master Andy Rozman 2018-04-30 23:11:44 +0100
  • 904a3d5028
    Merge pull request #1 from MilosKozak/dev Andy Rozman 2018-04-30 23:06:33 +0100
  • d68f74bb68
    Update strings.xml Winfried Kuiper 2018-04-30 23:09:35 +0200
  • 3f0c2958c7 WIP: change of language works Roumen Georgiev 2018-04-30 16:41:40 +0300
  • 099cb6c4e4 add battery charging state Markus M. May 2018-04-29 22:49:43 +0200
  • faa09f8505 2.0 rc1 AdrianLxM 2018-04-28 19:49:55 +0200
  • 81037cde5c
    Merge pull request #935 from jotomo/calculator-carb-only AdrianLxM 2018-04-28 19:29:13 +0200
  • c8ca904709
    Merge pull request #936 from jotomo/ext-combo-carbs AdrianLxM 2018-04-27 20:06:07 +0200