Merge branch 'master' into dev

This commit is contained in:
Mario Vavti
2016-06-20 21:46:33 +02:00
40 changed files with 74853 additions and 100092 deletions
+1 -1
View File
@@ -224,7 +224,7 @@ function datetimesel($format, $min, $max, $default, $label, $id = 'datetimepicke
$pickers = '';
if(!$pickdate) $pickers .= ',datepicker: false';
if(!$picktime) $pickers .= ',timepicker: false';
if(!$picktime) $pickers .= ',timepicker: false, closeOnDateSelect:true';
$extra_js = '';
if($minfrom != '')