Johannes Mockenhaupt bffcd3ceee Merge remote-tracking branch 'origin/dev' into develop ... * origin/dev: (35 commits) fix displaying target in mmol Profile.getValuesList: don't add trailing newline. Fix some warnings. Use OK/Cancel buttons for profile removal dialog. static variables -> object variables Avoid npe if no string is assigned to the profile switch isValid implementation Show profile on tap in Treatments->ProfileSwitch 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. ... # Conflicts: # app/src/main/java/info/nightscout/androidaps/PreferencesActivity.java		2017-08-19 22:38:58 +02:00
..
libs	Add prefernces.json validator lib	2017-01-29 13:00:21 +01:00
src	Merge remote-tracking branch 'origin/dev' into develop	2017-08-19 22:38:58 +02:00
.gitignore	Objectives design	2016-06-04 17:28:05 +02:00
build.gradle	Use 1.5g-combo-dev as version.	2017-08-12 15:22:55 +02:00
fabric.properties	add bg language	2016-07-05 20:28:23 +02:00
proguard-rules.pro	plugins refactoring	2016-08-05 23:54:03 +02:00