AndroidAPS/app/src/main/java/info/nightscout/androidaps
TebbeUbben f7597c93d7 Merge remote-tracking branch 'milos/AdrianLxM-patch-4' into dev
# Conflicts:
#	app/src/main/java/info/nightscout/androidaps/plugins/Careportal/CareportalPlugin.java
#	app/src/main/java/info/nightscout/androidaps/plugins/PumpVirtual/VirtualPumpPlugin.java
2018-06-08 23:30:39 +02:00
..
data MINIMUM_BASAL_VALUE_REPLACED -> MAXIMUM_BASAL_VALUE_REPLACED 2018-06-03 23:33:49 +02:00
db Merge pull request #1020 from MilosKozak/dia-refactor 2018-05-08 23:43:54 +02:00
events SWFragment 2018-05-09 18:49:42 +02:00
interfaces Use real plugin descriptions 2018-06-07 22:55:13 +02:00
plugins Merge remote-tracking branch 'milos/AdrianLxM-patch-4' into dev 2018-06-08 23:30:39 +02:00
queue On bolus cancel request, cancel all boluses. Partially addresses #646. 2018-05-13 23:57:40 +02:00
receivers Add isConnected, enable NSClient only, if really connected to internet 2018-05-07 20:43:13 +02:00
Services Remove some duplicate code lines 2018-05-29 20:57:55 +02:00
setupwizard nsclient setup wizard tweaking 2018-06-06 22:58:50 +02:00
tabs ConfigBuilder styling 2018-06-07 22:54:27 +02:00
AgreementActivity.java age from product flavor to prefs 2017-02-22 20:29:41 +01:00
Config.java allow to show dev slope in dev 2018-04-21 12:09:09 +02:00
Constants.java default DIA 2018-05-06 12:49:03 +02:00
HistoryBrowseActivity.java MainApp.sResources.getColor -> MainApp.gc. 2018-05-06 11:47:15 +02:00
MainActivity.java nsclient setup wizard tweaking 2018-06-06 22:58:50 +02:00
MainApp.java Ignore harmless errors (un)subscribing to the message bus. 2018-05-02 22:36:52 +02:00
PreferencesActivity.java preferences cleanup 2018-04-24 00:11:52 +02:00
SingleFragmentActivity.java Button for plugin preferences 2018-06-04 21:56:31 +02:00
TDDStatsActivity.java use MainApp.gs instead of getString from Activity/Dialog 2 2018-05-02 14:21:53 +02:00