Johannes Mockenhaupt 612fc09e52 Merge remote-tracking branch 'origin/dev' into combo-dev-merge ... * origin/dev: Don't overlap time ticks with current time history browser chart selection Insulin button: allow negative presets, fix adding TT insulin. Overview: symetric spacing. Carbs button: send carbs to pump if pump supports carbs. Carbs button: fix visibility pref, input type, allow negative increments. Smallscreen fix chart menu 4 chart menu 3 chart menu 2 chart menu 1 # Conflicts: # app/src/main/res/values/strings.xml		2018-03-17 16:45:08 +01:00
..
data	Merge remote-tracking branch 'origin/dev' into combo-dev-merge	2018-03-17 13:51:40 +01:00
db	remove profile dependency from pump drivers, TRB optimalization	2018-03-16 16:53:38 +01:00
events	Merge branch 'foodrefactor' into dev	2018-03-12 10:56:14 +01:00
interfaces	Merge remote-tracking branch 'origin/dev' into combo-dev-merge	2018-03-17 13:51:40 +01:00
plugins	Merge remote-tracking branch 'origin/dev' into combo-dev-merge	2018-03-17 16:45:08 +01:00
queue	Merge remote-tracking branch 'origin/dev' into combo-dev-merge	2018-03-17 13:51:40 +01:00
receivers	Merge pull request #505 from jotomo/sync-to-pump	2017-12-20 10:49:47 +01:00
Services	remove profile dependency from pump drivers, TRB optimalization	2018-03-16 16:53:38 +01:00
tabs	missing file	2017-12-31 16:51:44 +01:00
AgreementActivity.java	age from product flavor to prefs	2017-02-22 20:29:41 +01:00
Config.java	Join pumps under Config.HWPUMPS switch.	2018-03-17 13:51:42 +01:00
Constants.java	Merge commit 'origin/dev^' into combo-dev-merge	2018-03-16 15:44:54 +01:00
HistoryBrowseActivity.java	history browser chart selection	2018-03-16 23:32:17 +01:00
MainActivity.java	Merge commit 'origin/dev^' into combo-dev-merge	2018-03-16 15:44:54 +01:00
MainApp.java	Join pumps under Config.HWPUMPS switch.	2018-03-17 13:51:42 +01:00
PreferencesActivity.java	Join pumps under Config.HWPUMPS switch.	2018-03-17 13:51:42 +01:00