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
app/Handlers/Events/Incident/SendIncidentEmailNotificationHandler.php
+1 -1
View File
@@ -65,7 +65,7 @@ class SendIncidentEmailNotificationHandler
// Only send emails for public incidents.
if ($event->incident->visible === 1) {
foreach ($this->subscriber->verified()->get() as $subscriber) {
foreach ($this->subscriber->isVerified()->get() as $subscriber) {
$mail = [
'email' => $subscriber->email,
'subject' => 'New incident reported.',
app/Handlers/Events/Incident/SendMaintenanceEmailNotificationHandler.php
+1 -1
View File
@@ -62,7 +62,7 @@ class SendMaintenanceEmailNotificationHandler
$data = AutoPresenter::decorate($event->incident);
foreach ($this->subscriber->verified()->get() as $subscriber) {
foreach ($this->subscriber->isVerified()->get() as $subscriber) {
$mail = [
'email' => $subscriber->email,
'subject' => 'Scheduled maintenance.',
app/Models/Subscriber.php
+2 -2
View File
@@ -64,13 +64,13 @@ class Subscriber extends Model implements HasPresenter
}
/**
* Scope a query to only include verified subscribers.
* Scope verified subscribers.
*
* @param \Illuminate\Database\Eloquent\Builder $query
*
* @return \Illuminate\Database\Eloquent\Builder
*/
public function scopeVerified(Builder $query)
public function scopeIsVerified(Builder $query)
{
return $query->whereNotNull('verified_at');
}
composer.lock
Generated
+5 -6
View File
@@ -1726,16 +1726,16 @@
},
{
"name": "laravel/framework",
"version": "v5.1.26",
"version": "v5.1.27",
"source": {
"type": "git",
"url": "https://github.com/laravel/framework.git",
"reference": "be7fbb60376bd61f07e9c637473e5b2cf7eebe5c"
"reference": "b16f80878fd3603022d3c84593397cedd9af0bcf"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/laravel/framework/zipball/be7fbb60376bd61f07e9c637473e5b2cf7eebe5c",
"reference": "be7fbb60376bd61f07e9c637473e5b2cf7eebe5c",
"url": "https://api.github.com/repos/laravel/framework/zipball/b16f80878fd3603022d3c84593397cedd9af0bcf",
"reference": "b16f80878fd3603022d3c84593397cedd9af0bcf",
"shasum": ""
},
"require": {
@@ -1781,7 +1781,6 @@
"illuminate/events": "self.version",
"illuminate/exception": "self.version",
"illuminate/filesystem": "self.version",
"illuminate/foundation": "self.version",
"illuminate/hashing": "self.version",
"illuminate/http": "self.version",
"illuminate/log": "self.version",
@@ -1851,7 +1850,7 @@
"framework",
"laravel"
],
"time": "2015-12-02 21:59:57"
"time": "2015-12-17 20:35:38"
},
{
"name": "league/commonmark",
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,