Johannes Mockenhaupt d92540a17c Merge remote-tracking branch 'adrian/localalerts-settings' into combo-scripter-v2 ... * adrian/localalerts-settings: remove already commented out code upper case literals use correct setting Don't alarm while disconnected disconnect state remove deprecated wear notification settings no-urgent notification title presnooze missed readings/pump on startup system notifications for non-urgent Notification bugfixes use ID as request code guard double clicks refactor notifications: subpackage initialized only when maxBasal >0 Dismiss notification service local alert thresholds as settings Extract local alerts for unreachable pump, missed BG readings. # Conflicts: # app/src/main/java/info/nightscout/androidaps/plugins/Overview/notifications/Notification.java # app/src/main/java/info/nightscout/androidaps/plugins/Overview/notifications/NotificationStore.java # app/src/main/res/values/strings.xml		2017-11-18 16:42:20 +01:00
..
DetailedBolusInfo.java	Better bolusing with different speeds (R & Rv2)	2017-10-21 18:55:56 +02:00
GlucoseStatus.java	use System.currentTimeMillis()	2017-06-15 23:12:12 +02:00
Intervals.java	synchronize interval access	2017-07-19 17:39:55 +02:00
Iob.java	OpenAPS MA initial work	2016-06-10 18:50:46 +02:00
IobTotal.java	Log exceptions in catch blocks rather than printing to console.	2017-09-09 16:41:06 +02:00
MealData.java	more work on autosens	2017-04-29 09:04:25 +02:00
NonOverlappingIntervals.java	synchronize interval access	2017-07-19 17:39:55 +02:00
OverlappingIntervals.java	Overlapping interval - regard first element on cut	2017-08-16 23:56:14 +02:00
Profile.java	Merge remote-tracking branch 'adrian/localalerts-settings' into combo-scripter-v2	2017-11-18 16:42:20 +01:00
ProfileIntervals.java	synchronize interval access	2017-07-19 17:39:55 +02:00
ProfileStore.java	Log exceptions in catch blocks rather than printing to console.	2017-09-09 16:41:06 +02:00
PumpEnactResult.java	Use PumpEnactResult's fluent interface in Combo plugin.	2017-11-03 14:40:01 +01:00