lucas.mathieu/cachet-docker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch '2.0'

Browse Source 
# Conflicts:
#	VERSION
#	app/Handlers/Events/Incident/SendIncidentEmailNotificationHandler.php
#	app/Handlers/Events/Incident/SendMaintenanceEmailNotificationHandler.php
#	app/Models/Subscriber.php
This commit is contained in:
Graham Campbell
2015-12-18 12:55:47 +00:00
parent 0d9ec1c164 c1ab3a175c
commit 1607275d2d
6 changed files with 14 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
resources/views/dashboard/partials/errors.blade.php
+4 -4
View File
@@ -1,15 +1,15 @@
@if ($errors->any())
@include('dashboard.partials._error', ['level' => 'danger', 'title' => Session::get('title'), 'message' => $errors->all(':message')])
@include('dashboard.partials._error', ['level' => 'danger', 'title' => Session::get('title'), 'message' => $errors->all(':message')])
@endif
@if ($message = Session::get('success'))
@include('dashboard.partials._error', ['level' => 'success', 'title' => Session::get('title'), 'message' => $message])
@include('dashboard.partials._error', ['level' => 'success', 'title' => Session::get('title'), 'message' => $message])
@endif
@if ($message = Session::get('warning'))
@include('dashboard.partials._error', ['level' => 'warning', 'title' => Session::get('title'), 'message' => $message])
@include('dashboard.partials._error', ['level' => 'warning', 'title' => Session::get('title'), 'message' => $message])
@endif
@if ($message = Session::get('info'))
@include('dashboard.partials._error', ['level' => 'info', 'title' => Session::get('title'), 'message' => $message])
@include('dashboard.partials._error', ['level' => 'info', 'title' => Session::get('title'), 'message' => $message])
@endif
resources/views/partials/metrics.blade.php
+1 -1
View File
@@ -93,7 +93,7 @@
chartConfig.datasets[0].data = _.values(charter);
charts[metricId].chart = new Chart(charts[metricId].context).Line(chartConfig, {
tooltipTemplate: $el.data('metric-name') + ": <%= value %> " + $el.data('metric-suffix'),
tooltipTemplate: $el.data('metric-name') + ": <{{ '%' }}= value %> " + $el.data('metric-suffix'),
scaleShowVerticalLines: true,
scaleShowLabels: false,
responsive: true,