Merge branch '31-change-timeline-date-format-to-12-hour' into 'master'

Resolve "Change timeline date format to 12-hour"

Closes #31

See merge request jankstudio/resq!30
This commit is contained in:
Ramon Gutierrez 2018-02-27 15:46:46 +00:00
commit d3f01a1303

View file

@ -1267,25 +1267,25 @@ class JobOrderController extends BaseController
$params['timeline'] = [
[
'date' => date("M j"),
'time' => date("H:i A"),
'time' => date("g:i A"),
'event' => "Event 4",
'color' => "#f4516c"
],
[
'date' => date("M j"),
'time' => date("H:i A"),
'time' => date("g:i A"),
'event' => "Event 3",
'color' => "#34bfa3"
],
[
'date' => date("M j"),
'time' => date("H:i A"),
'time' => date("g:i A"),
'event' => "Event 2",
'color' => "#716aca"
],
[
'date' => date("M j"),
'time' => date("H:i A"),
'time' => date("g:i A"),
'event' => "Event 1",
'color' => "#ffb822"
],