AndroidAPS/app/src/main/res/xml
Johannes Mockenhaupt 57944fb4b5
Merge remote-tracking branch 'origin/dev' into smb060
* origin/dev:
  Actions tab: show profile switch button for single profile too.
  Old NS-Version non-urgent
  Add SP to imports
  refactor cancelAlarm back to KeepAliveReceiver
  push next alert on read status
  G5 upload to xdrip
  fake Esel new file
  fake Esel
  Apply bolus constraint before applying.
  Rv2,RS: always load last 45 min
  remove wear-overview notifications as replaced by system notifications
  Remove missed reference to pref in NSProfilePlugin.
  Remove 'sync to profile' pref.

# Conflicts:
#	app/src/main/java/info/nightscout/androidaps/queue/CommandQueue.java
2017-12-20 17:28:08 +01:00
..
pref_absorption_aaps.xml sensitivity prefs cleanup 2017-06-30 11:56:36 +02:00
pref_absorption_oref0.xml sensitivity prefs cleanup 2017-06-30 11:56:36 +02:00
pref_advanced.xml OpenAPS 0.6.0 1st part 2017-12-11 18:45:04 +01:00
pref_age.xml age from product flavor to prefs 2017-02-22 20:29:41 +01:00
pref_careportal.xml careportal 2016-07-02 23:58:57 +02:00
pref_closedmode.xml DanaR preferences & preferences cleanup 2016-07-07 17:17:54 +02:00
pref_danar.xml Dana R & v2 speed selection 2017-10-10 19:14:43 +02:00
pref_danarkorean.xml Dana R & v2 speed selection 2017-10-10 19:14:43 +02:00
pref_danarprofile.xml DanaRv2 1st rev 2017-04-30 21:08:00 +02:00
pref_danars.xml partial bolus code, messages blocked by sleep :( 2017-09-14 22:53:11 +02:00
pref_danarv2.xml Dana R & v2 speed selection 2017-10-10 19:14:43 +02:00
pref_dexcomg5.xml G5 upload to xdrip 2017-12-14 21:49:11 +01:00
pref_insulinoreffreepeak.xml insulincurves - rename peak to peak time 2017-08-14 16:02:07 +02:00
pref_language.xml DanaR preferences & preferences cleanup 2016-07-07 17:17:54 +02:00
pref_nsclientinternal.xml local broadcasts better setting title 2017-07-18 22:18:10 +02:00
pref_openapsama.xml OpenAPS 0.6.0 1st part 2017-12-11 18:45:04 +01:00
pref_openapsma.xml Use target ranges from profile, rather than fixed values from prefs. 2017-07-18 13:04:15 +02:00
pref_openapssmb.xml OpenAPS 0.6.0 1st part 2017-12-11 18:45:04 +01:00
pref_others.xml Localalerts settings by adrian 2017-11-28 21:48:46 +01:00
pref_password.xml settings password protected 2017-02-14 19:16:34 +01:00
pref_quickwizard.xml QuickWizard 2016-10-20 23:50:31 +02:00
pref_safety.xml preferences update 2017-11-01 20:43:59 +01:00
pref_smscommunicator.xml fix sms pref key 2017-04-09 21:50:05 +02:00
pref_virtualpump.xml virtual pump status upload optional 2017-02-14 15:41:30 +01:00
pref_wear.xml delta granularity and NPE fix 2017-12-01 20:32:26 +01:00
pref_xdripstatus.xml bgi on watch status (optional) 2017-05-09 23:23:37 +02:00