Find a file
Johannes Mockenhaupt 1bd5dc3719
Merge remote-tracking branch 'origin/dev' into develop
* origin/dev: (53 commits)
  bump 1.53
  BG & IOB contribution on by default in wizard
  check for NaN
  Revert "Rounding issues visible in nightscout insulin field"
  Clarified boolean logic with parentheses :)
  loadEvents after bolus in separate thread
  use notification for bolus delivery failed message when window has been destroyed
  fix null pointer exception
  Added cases to accept both a.m./p.m. and AM/PM
  split JSON arrays to 50 elements
  Update strings.xml
  Changed rounding to use BigDecimals to avoid noisy long doubles in output
  Revert "Merge branch 'dev' of C:\Users\Dylan\StudioProjects\AndroidAPS fork with conflicts."
  Changed how time strings are parsed to fix a problem where PM times were being saved as the AM version any time toSeconds was called
  Merge branch 'dev' of C:\Users\Dylan\StudioProjects\AndroidAPS fork with conflicts.
  Removed unused imports
  Rounding fix
  VirtualPump: set PumpEnactResult.enacted.
  Use correct units for low/high from TT.
  Remove duplicate logging.
  ...

# Conflicts:
#	app/build.gradle
#	app/src/main/java/info/nightscout/androidaps/MainApp.java
#	app/src/main/java/info/nightscout/androidaps/PreferencesActivity.java
#	app/src/main/res/values/strings.xml
2017-09-18 22:54:35 +02:00
app Merge remote-tracking branch 'origin/dev' into develop 2017-09-18 22:54:35 +02:00
gradle/wrapper Gradle update 2017-03-05 12:13:03 +01:00
wear Merge remote-tracking branch 'origin/dev' into develop 2017-09-18 22:54:35 +02:00
.gitignore fix gitignore 2017-02-11 01:50:25 +01:00
.travis.yml revert sdk to 23 2017-04-22 10:18:31 +02:00
build.gradle gradle 2.3.3 2017-06-10 12:57:03 +02:00
Combo-Setup.md Update Combo-Setup.md - typo 2017-08-29 06:03:48 +00:00
gradle.properties Revert "Merge branch 'dev' of C:\Users\Dylan\StudioProjects\AndroidAPS fork with conflicts." 2017-09-16 20:02:08 -04:00
gradlew permission access for travis 2016-12-28 16:10:06 +01:00
gradlew.bat Objectives design 2016-06-04 17:28:05 +02:00
LICENSE.txt Create LICENSE.txt 2016-12-15 22:14:53 +01:00
README.md Travis badge 2016-12-29 14:13:04 +01:00
settings.gradle wear installing on watch 2016-11-24 16:23:31 +01:00

AndroidAPS

Gitter Build status