AndroidAPS/app/src/main/java/info/nightscout/androidaps
Johannes Mockenhaupt ead299442a
Merge remote-tracking branch 'origin/dev' into combo-scripter-v2
* origin/dev:
  allow old data on the wf
  request new data on preference change
  accept local NS data broadcast even when ns_upload_only is selected
  remove logging
2018-01-04 21:38:19 +01:00
..
data Merge remote-tracking branch 'origin/dev' into combo-scripter-v2 2018-01-04 21:38:19 +01:00
db Merge remote-tracking branch 'origin/dev' into csv2-staging 2017-12-25 20:29:32 +01:00
events illegalState crash fix 2017-12-31 16:44:13 +01:00
interfaces Merge remote-tracking branch 'origin/dev' into combo-scripter-v2 2018-01-01 13:25:36 +01:00
plugins Merge remote-tracking branch 'origin/dev' into combo-scripter-v2 2018-01-04 21:38:19 +01:00
queue Merge remote-tracking branch 'origin/dev' into combo-scripter-v2 2017-12-31 11:41:41 +01:00
receivers Merge pull request #505 from jotomo/sync-to-pump 2017-12-20 10:49:47 +01:00
Services accept local NS data broadcast even when ns_upload_only is selected 2018-01-04 09:45:17 +01:00
tabs missing file 2017-12-31 16:51:44 +01:00
AgreementActivity.java age from product flavor to prefs 2017-02-22 20:29:41 +01:00
Config.java Merge remote-tracking branch 'origin/dev' into combo-scripter-v2 2017-12-05 00:32:47 +01:00
Constants.java Merge remote-tracking branch 'origin/dev' into combo-scripter-v2 2017-12-05 00:32:47 +01:00
MainActivity.java illegalState crash fix 2017-12-31 16:44:13 +01:00
MainApp.java Merge remote-tracking branch 'origin/dev' into csv2-staging 2017-12-25 20:29:32 +01:00
PreferencesActivity.java Merge remote-tracking branch 'origin/dev' into combo-scripter-v2 2018-01-03 18:28:17 +01:00