Commit graph

  • d72c243140
    Merge remote-tracking branch 'origin/dev' into combo-scripter-v2 Johannes Mockenhaupt 2018-01-07 11:38:51 +0100
  • 117b79619b
    Check reservoir level before bolus and abort if not enough left. Johannes Mockenhaupt 2018-01-07 11:23:54 +0100
  • 836abd74ab
    Read reservoir level. Johannes Mockenhaupt 2018-01-07 11:16:43 +0100
  • 8cf69006b2 check 30min interval only for basal rates Milos Kozak 2018-01-07 11:13:02 +0100
  • 3369d84de8
    Merge remote-tracking branch 'origin/dev' into combo-scripter-v2 Johannes Mockenhaupt 2018-01-06 16:27:02 +0100
  • 13ad74f77b Steampunk watch face: Chart readability improvement; point size increases when chert is highly zoomed in (less than 3 hours shown). Andrew Warrington 2018-01-06 14:21:31 +0100
  • 6c53fd11e9
    Merge pull request #586 from MilosKozak/basalupdate-notif AdrianLxM 2018-01-06 09:10:00 +0100
  • 5089947bc1
    Merge pull request #585 from MilosKozak/dialog-usability AdrianLxM 2018-01-06 09:09:29 +0100
  • 4dd238097f basal updated notification AdrianLxM 2018-01-06 07:37:39 +0100
  • b9ad3a71fd Dialogs usability tweaks AdrianLxM 2018-01-06 06:52:30 +0100
  • 3aafcc9854
    Merge remote-tracking branch 'origin/dev' into combo-scripter-v2 Johannes Mockenhaupt 2018-01-06 00:30:04 +0100
  • c939a35810
    Merge pull request #582 from MilosKozak/watchfaces-steampunk AdrianLxM 2018-01-06 00:15:55 +0100
  • 7d1405c0eb
    Merge pull request #14 from jotomo/combo-scripter-v2 Simon Pauwels 2018-01-05 23:28:22 +0100
  • 2c7b34e434
    Merge pull request #583 from andrew-warrington/watchfaces AdrianLxM 2018-01-05 12:24:47 +0100
  • 02e7752c3e Cockpit watch face: Double-tap opens MainMenuActivity Andrew Warrington 2018-01-05 11:58:57 +0100
  • 144292576a
    Merge branch 'dev' into watchfaces-steampunk Milos Kozak 2018-01-05 11:36:48 +0100
  • aff0e6f5a8 Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev Milos Kozak 2018-01-04 23:12:40 +0100
  • b7df21c7d0 prevent processing incomplete profiles Milos Kozak 2018-01-04 23:12:35 +0100
  • ead299442a
    Merge remote-tracking branch 'origin/dev' into combo-scripter-v2 Johannes Mockenhaupt 2018-01-04 21:38:19 +0100
  • 955ecc6d64 set defaults for display range Milos Kozak 2018-01-04 21:33:18 +0100
  • d47b2f8b4b
    Swallow exception on disconnect. Johannes Mockenhaupt 2018-01-04 21:20:12 +0100
  • 95bca1a92d actual bg in objective 1 AdrianLxM 2018-01-04 18:53:38 +0100
  • 30f590dca6
    Merge pull request #13 from jotomo/combo-scripter-v2 Simon Pauwels 2018-01-04 18:29:02 +0100
  • 468426bd31
    Merge pull request #581 from MilosKozak/watchfaces-steampunk AdrianLxM 2018-01-04 17:41:30 +0100
  • c3d14b506d allow old data on the wf AdrianLxM 2018-01-04 16:20:49 +0100
  • 41fb92815b request new data on preference change AdrianLxM 2018-01-04 12:22:08 +0100
  • 9457fb61e5
    RuffyScripter.isConnected: longer wait. Johannes Mockenhaupt 2018-01-04 11:05:19 +0100
  • d7200d1e8e warn if wrong profile is detected Milos Kozak 2018-01-04 11:06:57 +0100
  • 2d769ccf9a
    Remove debug code. Johannes Mockenhaupt 2018-01-01 14:04:45 +0100
  • 4643cdc3b9 accept local NS data broadcast even when ns_upload_only is selected Milos Kozak 2018-01-04 09:45:17 +0100
  • a08a6cbb70 patch SMB determine_basal to not produce error Milos Kozak 2018-01-03 22:59:26 +0100
  • ed3f076bd7 Merge branch 'dev' into smb060 Milos Kozak 2018-01-03 22:40:34 +0100
  • de1475dbba remove logging Milos Kozak 2018-01-03 22:28:48 +0100
  • 230ec7177b Merge branch 'dev' into smb060 Milos Kozak 2018-01-03 21:22:38 +0100
  • bf25af8c42
    Merge remote-tracking branch 'origin/dev' into combo-scripter-v2 Johannes Mockenhaupt 2018-01-03 21:18:12 +0100
  • cb1df61d88
    Merge pull request #579 from jotomo/activity-npe-guard Milos Kozak 2018-01-03 21:17:01 +0100
  • f09d68ad59
    Check activity != null before drawing graph. Johannes Mockenhaupt 2018-01-03 20:58:49 +0100
  • ff5d42522c Merge branch 'dev' into smb060 Milos Kozak 2018-01-03 20:31:36 +0100
  • abdad220f6
    Merge remote-tracking branch 'origin/dev' into combo-scripter-v2 Johannes Mockenhaupt 2018-01-03 20:16:50 +0100
  • 0b76290091
    Merge pull request #578 from andrew-warrington/watchfaces AdrianLxM 2018-01-03 19:58:40 +0100
  • 094737adde improve GUI response Milos Kozak 2018-01-03 19:59:18 +0100
  • 96c41881fd
    Merge pull request #17 from AdrianLxM/watchfaces-steampunk Andrew Warrington 2018-01-03 19:50:13 +0100
  • fd8f2c0801
    Clean up unintended diversions from upstream. Johannes Mockenhaupt 2018-01-03 19:07:10 +0100
  • 5270f2cc69 narrower temp basal line for steampunk watchface AdrianLxM 2018-01-03 18:58:02 +0100
  • 53a8cd4eac
    Merge remote-tracking branch 'origin/dev' into combo-scripter-v2 Johannes Mockenhaupt 2018-01-03 18:18:35 +0100
  • a75ff0d1f6 darker and gracile steampunk-chart AdrianLxM 2018-01-03 18:13:38 +0100
  • 7afb557b76
    Note on DST changes. Johannes Mockenhaupt 2018-01-03 17:13:57 +0100
  • c125e9265f
    Strings: TDD. Johannes Mockenhaupt 2018-01-03 16:57:56 +0100
  • 267bdd6a43 Steampunk: Enabled chart zoom with double-tap on bottom 1/3 of screen - xml files. Andrew Warrington 2018-01-03 16:33:39 +0100
  • 2946e2a485
    Merge remote-tracking branch 'swissalpine/patch-2' into combo-scripter-v2 Johannes Mockenhaupt 2018-01-03 16:26:35 +0100
  • 512341e603 Steampunk: Enabled chart zoom with double-tap on bottom 1/3 of screen. Andrew Warrington 2018-01-03 15:24:06 +0100
  • 7c73a72c66
    Merge pull request #16 from AdrianLxM/watchfaces-steampunk Andrew Warrington 2018-01-03 14:16:08 +0100
  • 99f0bbb478 move steampunk md to main dir AdrianLxM 2018-01-03 14:00:57 +0100
  • e0abd1b816 Merge remote-tracking branch 'andrewremote/watchfaces' into watchfaces-steampunk AdrianLxM 2018-01-03 13:53:38 +0100
  • 28a52b3ab7
    Merge pull request #574 from MilosKozak/illegalstate-fix AdrianLxM 2018-01-03 13:45:31 +0100
  • bcb94eb161
    Merge pull request #40 from swissalpine/patch-3 Johannes Mockenhaupt 2018-01-03 13:07:01 +0100
  • 7ac413553b Addition of a file linking to the location of the Steampunk source photoshop file. File is not included in the repository as it exceeds Github's 25 mb limit. Andrew Warrington 2018-01-03 10:58:10 +0100
  • 8b37826335 Steampunk watch face - improvement of the units switching functionality (less time spent on "?" on glucose dial). Andrew Warrington 2018-01-03 10:41:18 +0100
  • 5fdd88ae75
    Shortname: OBJ -> ZIEL swissalpine 2018-01-03 09:42:49 +0100
  • 61cc7fc64e
    Historie statt Historik swissalpine 2018-01-03 09:38:17 +0100
  • fd27e6c9f8
    Delete unnecessary / not used translated strings swissalpine 2018-01-03 09:16:20 +0100
  • 37f262efdc Steampunk watch face - unit testing complete. Andrew Warrington 2018-01-03 01:18:13 +0100
  • ecbab76ce7
    Merge pull request #12 from jotomo/combo-scripter-v2 Simon Pauwels 2018-01-02 19:20:12 +0100
  • 7b0cc80369 Steampunk watchface: Updated graphics for more accuracy / brighter background, enabled double-tap, corrected issue when changing from mg/dL to mmol/L (glucose would show as "low"). Andrew Warrington 2018-01-02 15:11:59 +0100
  • 1e602ef4ba
    domain links AdrianLxM 2018-01-02 13:40:37 +0100
  • 1bbd9012cb
    Merge pull request #37 from jotomo/the-clock-strikes-midnight AdrianLxM 2018-01-02 13:28:30 +0100
  • cc1cd675c7
    Merge pull request #573 from MilosKozak/combo-bolus-fix Milos Kozak 2018-01-02 10:05:20 +0100
  • 5609fbf738 Steampunk watchface (moto360 support - ignores the chin) Andrew Warrington 2018-01-02 00:30:20 +0100
  • 7475b1ba3a Merge remote-tracking branch 'origin/dev' into watchfaces Andrew Warrington 2018-01-01 22:36:07 +0100
  • 8e659f5f97
    A few minor corrections on the German translation. Johannes Mockenhaupt 2018-01-01 19:10:05 +0100
  • eb51e43d70
    Remove duplicate strings after merge. Johannes Mockenhaupt 2018-01-01 16:04:35 +0100
  • 8eeb8b748c
    Merge remote-tracking branch 'origin/dev' into combo-scripter-v2 Johannes Mockenhaupt 2018-01-01 16:02:05 +0100
  • c8fa729d8d
    update German AdrianLxM 2018-01-01 15:45:01 +0100
  • 143e0b6973
    Merge pull request #576 from swissalpine/patch-1 AdrianLxM 2018-01-01 15:37:06 +0100
  • bccfd66874
    Update strings.xml swissalpine 2018-01-01 15:16:23 +0100
  • 62da90011a
    Revised German Translation swissalpine 2018-01-01 15:10:38 +0100
  • cbf005a11e
    Merge remote-tracking branch 'origin/dev' into combo-scripter-v2 Johannes Mockenhaupt 2018-01-01 15:07:34 +0100
  • d2753e0dad another cob fix Milos Kozak 2018-01-01 14:38:37 +0100
  • 1617d6698d
    Update ComboPlugin for updated ContstraintsInterface. Johannes Mockenhaupt 2018-01-01 13:23:47 +0100
  • 8fb8182f4f
    Merge remote-tracking branch 'origin/dev' into combo-scripter-v2 Johannes Mockenhaupt 2018-01-01 13:25:36 +0100
  • 2cee957fbf
    Merge pull request #38 from jotomo/AdrianLxM-patch-1 Johannes Mockenhaupt 2018-01-01 02:20:33 +0100
  • 3bfffdb1b0
    brackets on string format AdrianLxM 2018-01-01 01:23:30 +0100
  • 4a01b14b35 missing file AdrianLxM 2017-12-31 16:51:44 +0100
  • e190f1b9ef illegalState crash fix AdrianLxM 2017-12-31 16:44:13 +0100
  • d27d1b1821 Objectives update Milos Kozak 2017-12-31 12:24:51 +0100
  • 8ee95077a8
    Merge remote-tracking branch 'origin/dev' into combo-scripter-v2 Johannes Mockenhaupt 2017-12-31 11:41:41 +0100
  • 458d812e2e fix objective 1 Milos Kozak 2017-12-31 11:07:21 +0100
  • fcbe8555a6 upload aps status and iob when loop is suspended Milos Kozak 2017-12-31 10:22:18 +0100
  • d3127bc97b
    Merge pull request #571 from MilosKozak/offline-treatments AdrianLxM 2017-12-31 09:52:29 +0100
  • 3a7fe56f64 combo-bolus-fix AdrianLxM 2017-12-31 09:50:51 +0100
  • 7b0a4d2ce7
    Merge pull request #570 from jotomo/queue-starts Milos Kozak 2017-12-31 09:27:27 +0100
  • a6b938d98a
    Correctly infer pump date when crossing midnight. Fixes #35. Johannes Mockenhaupt 2017-12-31 00:18:10 +0100
  • 937872e80c fully offline CP AdrianLxM 2017-12-30 23:01:25 +0100
  • fb2271e758
    Merge pull request #568 from MilosKozak/AdrianLxM-patch-3 AdrianLxM 2017-12-30 22:20:37 +0100
  • 220554dbd6
    Add sluggishness/unresponsiveness to known issues. Johannes Mockenhaupt 2017-12-30 20:06:18 +0100
  • 99f3fb6216
    Merge remote-tracking branch 'origin/dev' into combo-scripter-v2 Johannes Mockenhaupt 2017-12-30 19:59:39 +0100
  • 58d5c25703
    Merge remote-tracking branch 'origin/dev' into combo-scripter-v2 Johannes Mockenhaupt 2017-12-30 19:57:53 +0100
  • f3db104979 autofix error in profile Milos Kozak 2017-12-30 19:56:37 +0100
  • 5ecc0ea430
    Fix crash in Combo fragment when accessing resoures. Johannes Mockenhaupt 2017-12-30 19:53:22 +0100
  • 8c213cbc11 missing cob fix Milos Kozak 2017-12-30 19:42:07 +0100