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
..
data	Merge remote-tracking branch 'adrian/localalerts-settings' into combo-scripter-v2	2017-11-18 16:42:20 +01:00
db	Merge remote-tracking branch 'origin/dev' into combo-scripter-v2	2017-11-18 17:46:20 +01:00
events	Better log messages for events.	2017-10-26 16:54:46 +02:00
interfaces	wip	2017-11-08 10:43:11 +01:00
plugins	Merge remote-tracking branch 'origin/dev' into combo-scripter-v2	2017-11-18 17:46:20 +01:00
receivers	Revert more local alerts	2017-11-11 16:29:46 +01:00
Services	refactor notifications: subpackage	2017-11-06 14:26:06 +01:00
tabs	fix crash in instantiating fragment	2017-06-30 09:46:56 +02:00
AgreementActivity.java	age from product flavor to prefs	2017-02-22 20:29:41 +01:00
Config.java	Merge remote-tracking branch 'origin/dev2' into combo-v2	2017-11-01 21:39:45 +01:00
Constants.java	KeepAliveReceiver: clean up, categorize Android notification as alarm so it plays sound even in silent mode.	2017-10-30 16:20:08 +01:00
MainActivity.java	preferences update	2017-11-01 20:43:59 +01:00
MainApp.java	Merge remote-tracking branch 'origin/dev2' into combo-v2	2017-11-01 21:39:45 +01:00
PreferencesActivity.java	Merge remote-tracking branch 'origin/dev' into combo-scripter-v2	2017-11-18 17:46:20 +01:00