Permalink
Branch: combo
Commits on Jun 19, 2018
  1. Merge pull request #3 from MilosKozak/empty-bolus-history-support

    jotomo committed Jun 19, 2018
    Empty bolus history support
Commits on Jun 18, 2018
Commits on May 2, 2018
Commits on Apr 30, 2018
Commits on Apr 22, 2018
Commits on Apr 18, 2018
Commits on Apr 16, 2018
  1. 12pm fix

    AdrianLxM committed Apr 16, 2018
Commits on Mar 16, 2018
  1. Merge branch 'dev' into combo

    jotomo committed Mar 16, 2018
    * dev:
      Revert "Revert "fix ups""
      Revert "Revert "fix shutdown of connection to disable layers correctly ""
      Revert "Avoid (potential) NPEs when an activity goes for a hike again."
      Avoid (potential) NPEs when an activity goes for a hike again.
Commits on Mar 1, 2018
  1. Revert "Revert "fix ups""

    jotomo committed Mar 1, 2018
    This reverts commit 4afcece.
  2. Revert "Revert "fix shutdown of connection to disable layers correctl…

    jotomo committed Mar 1, 2018
    …y ""
    
    This reverts commit b41216f.
Commits on Feb 12, 2018
Commits on Feb 10, 2018
Commits on Jan 31, 2018
  1. Merge pull request #2 from jotomo/experimental

    jotomo committed Jan 31, 2018
    Fix race condition
Commits on Jan 23, 2018
Commits on Jan 15, 2018
  1. Revert "fix ups"

    jotomo committed Jan 15, 2018
    This reverts commit 57e723d.
Commits on Jan 13, 2018
  1. fix Crash on Orientation change

    SandraK82 authored and jotomo committed Jul 28, 2017
    (cherry picked from commit cdc496f)
Commits on Jan 6, 2018
  1. fix ups

    jotomo committed Jan 6, 2018
  2. Merge remote-tracking branch 'sandra/clean-shutdown' into combo-scrip…

    jotomo committed Jan 6, 2018
    …ter-v2
    
    * sandra/clean-shutdown:
      update docs
      fix shutdown of connection to disable layers correctly
  3. update docs

    SandraK82 committed Jan 6, 2018
Commits on Nov 25, 2017
  1. Android Studio 3.0.1 tooling / Google repos.

    jotomo committed Nov 25, 2017
    Signed-off-by: Johannes Mockenhaupt <git@jotomo.de>
Commits on Nov 19, 2017
  1. Affect on pairing?

    jotomo committed Nov 19, 2017
    Signed-off-by: Johannes Mockenhaupt <git@jotomo.de>
  2. Logging around pairing.

    jotomo committed Nov 19, 2017
Commits on Nov 18, 2017
  1. Revert "Selectively take over upstream changes till bdbeaa3."

    jotomo committed Nov 18, 2017
    This reverts commit 4193533.
  2. Fix parsing quick info menu when cartridge is low.

    jotomo committed Nov 18, 2017
    Signed-off-by: Johannes Mockenhaupt <git@jotomo.de>
Commits on Nov 14, 2017
  1. Raise log level for a few items.

    jotomo committed Nov 14, 2017
    Signed-off-by: Johannes Mockenhaupt <git@jotomo.de>
  2. Menu: add toString.

    jotomo committed Nov 14, 2017
    Signed-off-by: Johannes Mockenhaupt <git@jotomo.de>
  3. MenuDate: add getters.

    jotomo committed Nov 14, 2017
    Signed-off-by: Johannes Mockenhaupt <git@jotomo.de>
  4. Hopefully fix race condition on disconnect, crashing ruffy.

    jotomo committed Nov 14, 2017
    Signed-off-by: Johannes Mockenhaupt <git@jotomo.de>