Find a file
Johannes Mockenhaupt 8cdd604b84
Merge remote-tracking branch 'origin/dev' into combo
* origin/dev:
  bulgarian removed non-translatable
  synchronize interval access
  nsclient remove debug data that puts stress on the broadcast system 3
  nsclient remove debug data that puts stress on the broadcast system 2
  nsclient remove debug data that puts stress on the broadcast system
  Align OpenAS(A)MA fragments with layout of other fragments.
  local broadcasts better setting title
  setting to disable local broadcasts in NSClient
  removed some "unneeded" translations
  wear tdd weighted
  wear TDD status
  wear menu simplification
  Translated latest additions strings.xml
  ns client quickfix now catch all
  NS client quickfix - catch even more
  catch TransactionTooLargeException
  TT new "old" logic for temp targets
  TT refactor OverlappingIntervals to two classes with an abstract superclass Intervals

# Conflicts:
#	app/src/main/res/values/strings.xml
2017-07-19 19:54:50 +02:00
app Merge remote-tracking branch 'origin/dev' into combo 2017-07-19 19:54:50 +02:00
gradle/wrapper Gradle update 2017-03-05 12:13:03 +01:00
wear wear TDD status 2017-07-17 22:39:48 +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
gradle.properties Objectives design 2016-06-04 17:28:05 +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.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