Johannes Mockenhaupt 9459dfe321 Merge remote-tracking branch 'origin/dev' into combo-scripter-v2 ... * origin/dev: Remove dead code. Ctors Android-style. Fix NPE initialising MyPreferencesFragment. RS fix last bolus time RS remove duplicated message RS fix extended bolus result show timeshift if not zero CS translation removed unneeded code long click on name to open settings add link to advanced settings # Conflicts: # app/src/main/java/info/nightscout/androidaps/PreferencesActivity.java		2017-11-18 17:46:20 +01:00
..
BgReading.java	check for missing bg direction	2017-06-28 09:09:19 +02:00
CareportalEvent.java	Log exceptions in catch blocks rather than printing to console.	2017-09-09 16:41:06 +02:00
DanaRHistoryRecord.java	change database structures	2017-05-21 22:05:03 +02:00
DatabaseHelper.java	Lots of work around properly reading pump history.	2017-11-13 23:05:49 +01:00
DbRequest.java	Log exceptions in catch blocks rather than printing to console.	2017-09-09 16:41:06 +02:00
ExtendedBolus.java	Remove now unused dia, insulinInterfaceId from Treatment.	2017-08-22 13:47:02 +02:00
Food.java	food database support	2017-09-24 22:47:18 +02:00
FoodHelper.java	food plugin	2017-10-17 20:55:23 +02:00
ProfileSwitch.java	show timeshift if not zero	2017-11-07 13:24:08 +01:00
Source.java	treatments synchronization improvement	2017-06-07 00:11:33 +02:00
TemporaryBasal.java	Remove combo hacks outside of combo plugin.	2017-10-17 12:20:48 +02:00
TempTarget.java	string comparison	2017-07-20 01:05:05 +02:00
Treatment.java	Merge pull request #387 from MilosKozak/invalid-overview	2017-08-22 20:20:28 +02:00