caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity
AndroidAPS/app/src/main/java/info/nightscout/androidaps/plugins/Treatments
History
Johannes Mockenhaupt fa1c282699
Merge remote-tracking branch 'origin/dev' into smb 
* origin/dev: (28 commits)
  Singleton & Crashlytics logging part 2
  treatments in config builder
  Singleton & Crashlytics logging part 1
  checkboxes for NS-Client layouts
  overview checkboxes cutoff fix
  update NP value after manual entry
  restore preferences
  temp target presets
  Rv2 percent fix
  korean percent fix
  serialize reload of treatments
  getTempBasalFromHistory -> getRealTempBasalFromHistory
  Do not misinterpret a fake-extended as 0% temp.
  In one line
  Update danar_fragment.xml
  text identation
  Add files via upload
  Add files via upload
  Add files via upload
  Add files via upload
  ...

# Conflicts:
#	app/build.gradle
#	app/src/main/java/info/nightscout/androidaps/MainApp.java
2017-10-07 21:33:22 +02:00
..
fragments Merge remote-tracking branch 'origin/dev' into smb 2017-10-07 21:33:22 +02:00
TreatmentsFragment.java Singleton & Crashlytics logging part 2 2017-10-07 17:48:03 +02:00
TreatmentsPlugin.java Merge remote-tracking branch 'origin/dev' into smb 2017-10-07 21:33:22 +02:00