caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity
Forked from https://github.com/nightscout/AndroidAPS/ https://github.com/caspervk/AndroidAPS/releases
3033 commits 1 branch 20 tags 140 MiB
Kotlin 66.6%
PostScript 22.5%
Java 10%
JavaScript 0.9%
Find a file
Johannes Mockenhaupt bf9f877b3d
Merge remote-tracking branch 'origin/dev' into combo-scripter-v2 
* origin/dev: (68 commits)
  max connection time to 120 sec
  make chart zoomable again
  fix NPE
  lowest priority for background calculations
  wear timestamps long
  remove unneeded code
  fix landscape overview
  synchronized wait
  fix build tools for travis
  try to fix travis
  upgrade build tools
  R: resolve thread deadlock during bolus stop
  remove unsupported code from korean pump
  handle bolus stop prior to delivery correctly
  fix translations
  better logging
  Revert unnecessary change.
  Send OpenAPS timestamp to watch rather than minAgo, for more accurate updates on watch face.
  gradle update
  parse more iso formats
  ...

# Conflicts:
#	app/build.gradle
#	app/src/main/AndroidManifest.xml
#	app/src/main/java/info/nightscout/androidaps/Config.java
#	app/src/main/java/info/nightscout/androidaps/PreferencesActivity.java
#	app/src/main/java/info/nightscout/androidaps/plugins/Actions/ActionsFragment.java
#	app/src/main/java/info/nightscout/androidaps/plugins/Actions/dialogs/FillDialog.java
#	app/src/main/java/info/nightscout/androidaps/plugins/Actions/dialogs/NewExtendedBolusDialog.java
#	app/src/main/java/info/nightscout/androidaps/plugins/ConfigBuilder/ConfigBuilderPlugin.java
#	app/src/main/java/info/nightscout/androidaps/plugins/Loop/LoopPlugin.java
#	app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/NewTreatmentDialog.java
#	app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/WizardDialog.java
#	app/src/main/java/info/nightscout/androidaps/plugins/Overview/OverviewFragment.java
#	app/src/main/java/info/nightscout/androidaps/plugins/Overview/notifications/DismissNotificationService.java
#	app/src/main/java/info/nightscout/androidaps/plugins/Overview/notifications/Notification.java
#	app/src/main/java/info/nightscout/androidaps/plugins/Overview/notifications/NotificationStore.java
#	app/src/main/java/info/nightscout/androidaps/plugins/ProfileCircadianPercentage/CircadianPercentageProfilePlugin.java
#	app/src/main/java/info/nightscout/androidaps/plugins/ProfileNS/NSProfilePlugin.java
#	app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/services/DanaRSService.java
#	app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRv2/services/DanaRv2ExecutionService.java
#	app/src/main/java/info/nightscout/androidaps/plugins/Treatments/TreatmentsFragment.java
#	app/src/main/java/info/nightscout/androidaps/plugins/Wear/ActionStringHandler.java
#	app/src/main/java/info/nightscout/androidaps/receivers/KeepAliveReceiver.java
#	app/src/main/res/values/strings.xml
#	app/src/main/res/xml/pref_others.xml
#	app/src/main/res/xml/pref_wear.xml
#	gradle/wrapper/gradle-wrapper.properties
#	wear/build.gradle
2017-12-05 00:32:47 +01:00
app Merge remote-tracking branch 'origin/dev' into combo-scripter-v2 2017-12-05 00:32:47 +01:00
gradle/wrapper gradle update 2017-12-03 18:29:57 +01:00
ruffy-spi Move WarningOrErrorCode class to parent package. 2017-11-25 21:19:21 +01:00
ruffyscripter RuffyScripter.confirmAlert: wait till alarm isn't displayed anymore. 2017-11-26 12:52:24 +01:00
wear Merge remote-tracking branch 'origin/dev' into combo-scripter-v2 2017-12-05 00:32:47 +01:00
.gitignore fix gitignore 2017-02-11 01:50:25 +01:00
.travis.yml fix build tools for travis 2017-12-03 21:36:24 +01:00
build.gradle add google repo 2017-11-22 21:02:09 +01:00
gradle.properties Revert "NDK filters to work around j2v8 vs. libBleCommandUtil issue." 2017-10-16 21:48:08 +02: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-Combo.md Bug notes. 2017-11-27 11:46:17 +01:00
README.md Travis badge 2016-12-29 14:13:04 +01:00
settings.gradle Extract modules ruffy-spi, ruffyscripter. 2017-10-18 14:00:47 +02:00
Testing-Combo.md Retry reading/writing basal profile, cleanups, notes. 2017-11-24 21:11:55 +01:00
TODO-Combo.md More bug notes. 2017-11-27 20:45:17 +01:00

README.md

AndroidAPS

Gitter Build status