Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

merge master #4

Merged
merged 25 commits into from
Jan 31, 2018
Merged

merge master #4

merged 25 commits into from
Jan 31, 2018

Commits on Jan 11, 2018

  1. Merge remote-tracking branch 'refs/remotes/NightscoutFoundation/master'

    @ahaarrestad
    ahaarrestad committed Jan 11, 2018
    Configuration menu
    Copy the full SHA
    5fcdbff View commit details
    Browse the repository at this point in the history

Commits on Jan 12, 2018

  1. Merge remote-tracking branch 'refs/remotes/NightscoutFoundation/master'

    @ahaarrestad
    ahaarrestad committed Jan 12, 2018
    Configuration menu
    Copy the full SHA
    c73c62c View commit details
    Browse the repository at this point in the history

Commits on Jan 17, 2018

  1. Merge remote-tracking branch 'refs/remotes/NightscoutFoundation/master'

    @ahaarrestad
    ahaarrestad committed Jan 17, 2018
    Configuration menu
    Copy the full SHA
    b1f1229 View commit details
    Browse the repository at this point in the history

Commits on Jan 19, 2018

  1. fill method isCollecting()

    @gregorybel
    gregorybel committed Jan 19, 2018
    Configuration menu
    Copy the full SHA
    e1f5511 View commit details
    Browse the repository at this point in the history

Commits on Jan 20, 2018

  1. BgGraphBuilder: scale heartrate to match mg/dl

    @jamorham
    jamorham committed Jan 20, 2018
    Configuration menu
    Copy the full SHA
    1602a3f View commit details
    Browse the repository at this point in the history

  2. WebServices: Move RouteFinder to SingletonHotel

    @jamorham
    jamorham committed Jan 20, 2018
    Configuration menu
    Copy the full SHA
    7a793a5 View commit details
    Browse the repository at this point in the history

  3. DexCollectionType: preparation for isCollecting()

    @jamorham
    jamorham committed Jan 20, 2018
    Configuration menu
    Copy the full SHA
    74b02de View commit details
    Browse the repository at this point in the history

Commits on Jan 22, 2018

  1. WebServices: sgv service now contains units hint

    @jamorham
    jamorham committed Jan 22, 2018
    Configuration menu
    Copy the full SHA
    de45f85 View commit details
    Browse the repository at this point in the history

  2. Pref: add getStringToInt

    @jamorham
    jamorham committed Jan 22, 2018
    Configuration menu
    Copy the full SHA
    6d74c6e View commit details
    Browse the repository at this point in the history

  3. add check case something got wrong during commnication

    @gregorybel
    gregorybel committed Jan 22, 2018
    Configuration menu
    Copy the full SHA
    00ac7fd View commit details
    Browse the repository at this point in the history

  4. G5: add customizable battery warning level

    @jamorham
    jamorham committed Jan 22, 2018
    Configuration menu
    Copy the full SHA
    d896694 View commit details
    Browse the repository at this point in the history

  5. Widget: make layout background transparent

    @jamorham
    jamorham committed Jan 22, 2018
    Configuration menu
    Copy the full SHA
    17e3be6 View commit details
    Browse the repository at this point in the history

  6. BgToSpeech: mgdl trend fix thanks to MasterPlexus

    @jamorham
    jamorham committed Jan 22, 2018
    Configuration menu
    Copy the full SHA
    9380b79 View commit details
    Browse the repository at this point in the history

  7. Merge pull request #46 from gregorybel/update-interface-collecting 

    Update interface collecting for blukon
    @jamorham
    jamorham authored Jan 22, 2018
    Configuration menu
    Copy the full SHA
    90eb7f1 View commit details
    Browse the repository at this point in the history

  8. Merge branch 'master' of https://github.com/jamorham/xDrip-plus into … 

    …jamorhamvoice
    @jamorham
    jamorham committed Jan 22, 2018
    Configuration menu
    Copy the full SHA
    b128487 View commit details
    Browse the repository at this point in the history

  9. G5: improve battery data reset

    @jamorham
    jamorham committed Jan 22, 2018
    Configuration menu
    Copy the full SHA
    ec363f1 View commit details
    Browse the repository at this point in the history

  10. Wear: Update for recent code changes

    @jamorham
    jamorham committed Jan 22, 2018
    Configuration menu
    Copy the full SHA
    d8e7097 View commit details
    Browse the repository at this point in the history

Commits on Jan 23, 2018

  1. Merge remote-tracking branch 'refs/remotes/NightscoutFoundation/master'

    @ahaarrestad
    ahaarrestad committed Jan 23, 2018
    Configuration menu
    Copy the full SHA
    927f851 View commit details
    Browse the repository at this point in the history

  2. * Organized Imports 

    * Utilizing Truth a bit better
* suggested alternative linebreaking when using Truth.assertWithMessage
    @ahaarrestad
    ahaarrestad committed Jan 23, 2018
    Configuration menu
    Copy the full SHA
    8e179cd View commit details
    Browse the repository at this point in the history

Commits on Jan 26, 2018

  1. Merge pull request #277 from ahaarrestad/RouteFinderTestImprovements 

    RouteFinderTest improvements
    @jamorham
    jamorham authored Jan 26, 2018
    Configuration menu
    Copy the full SHA
    07ac772 View commit details
    Browse the repository at this point in the history

Commits on Jan 30, 2018

  1. Update strings.xml

    @bordeb
    bordeb authored Jan 30, 2018
    Configuration menu
    Copy the full SHA
    e538cf9 View commit details
    Browse the repository at this point in the history

  2. Declutter graph when using AAPS

    @jamorham
    jamorham committed Jan 30, 2018
    Configuration menu
    Copy the full SHA
    c298517 View commit details
    Browse the repository at this point in the history

  3. Don't aggressively restart if collection service reports collecting

    @jamorham
    jamorham committed Jan 30, 2018
    Configuration menu
    Copy the full SHA
    26aa909 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #286 from bordeb/patch-1 

    Update strings.xml - correct typo
    @jamorham
    jamorham authored Jan 30, 2018
    Configuration menu
    Copy the full SHA
    2fce1bf View commit details
    Browse the repository at this point in the history

  5. Merge branch 'master' of https://github.com/NightscoutFoundation/xDrip … 

    …into jamorhamvoice
    @jamorham
    jamorham committed Jan 30, 2018
    Configuration menu
    Copy the full SHA
    3081e8f View commit details
    Browse the repository at this point in the history