Johannes Mockenhaupt a19e49e5f8 Merge remote-tracking branch 'origin/dev' into develop ... * origin/dev: (27 commits) Check for tempbasal not RealTempbasla Overlapping interval - regard first element on cut AcceptTempButton visible show notification on toast alarm parse 12h format properly fix index Show profile switch button in profiles set pump time only if needed restrict DIA for expectedDelta Overlappinginterfals - find first element Extract method Profile.toTargetRangeString. Simplify. Overview: format target using unit specific format. Dutch language insulincurves - notification on short DIA insulincurves - forgotten string updated insulincurves - rename peak to peak time insulincurves - remove unused base fragment insulincurves - i18n insulincurves - ActivityGraph fix double plotting ... # Conflicts: # app/src/main/java/info/nightscout/androidaps/PreferencesActivity.java		2017-08-17 10:08:15 +02:00
..
arrays.xml	Dutch language	2017-08-14 21:57:49 +02:00
colors.xml	fix merge conflict	2017-06-30 09:35:20 +02:00
dimens.xml	Objectives design	2016-06-04 17:28:05 +02:00
layout.xml	gui tweaking	2017-06-03 22:43:35 +02:00
strings.xml	Merge remote-tracking branch 'origin/dev' into develop	2017-08-17 10:08:15 +02:00
styles.xml	ns alarm setting in xml	2017-06-15 21:33:45 +02:00