Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Notifications #2295

Merged
merged 27 commits into from
Jan 4, 2017
Merged
Changes from 1 commit
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
056b80a
Require Nexmo dependency
jbrooksuk Dec 29, 2016
b8a9f41
Integrate Mail, Nexmo and Slack notifications into Cachet
jbrooksuk Dec 30, 2016
4ab133c
Remove redundant email layout
jbrooksuk Jan 2, 2017
e8ce42b
Publish the notifications table
jbrooksuk Jan 3, 2017
ce577fb
Include unsubscribe link in Slack footer
jbrooksuk Jan 3, 2017
42f3350
Apply theme composer to emails too
jbrooksuk Jan 3, 2017
51864f3
Don't need to have notifications enabled for Slack etc...
jbrooksuk Jan 3, 2017
6dc56de
Add unsub links to all Slack notifications
jbrooksuk Jan 3, 2017
2da2ab8
Apply fixes from StyleCI
jbrooksuk Jan 3, 2017
f1ac112
Remove CSS inline
jbrooksuk Jan 4, 2017
f03d557
Be sure to make email nullable
jbrooksuk Jan 4, 2017
3ff497c
Re-enable Bootstrap close component
jbrooksuk Jan 4, 2017
1116262
Rebuild assets
jbrooksuk Jan 4, 2017
4334bab
Re-enable the Bootstrap labels components
jbrooksuk Jan 4, 2017
87ed6f0
Rebuilt assets
jbrooksuk Jan 4, 2017
a77c03d
Don't use status
jbrooksuk Jan 4, 2017
a7f06b5
Don't use status
jbrooksuk Jan 4, 2017
38773c8
Update all email notifications
jbrooksuk Jan 4, 2017
1b5ddc6
Update subscriber model
jbrooksuk Jan 4, 2017
c20a66e
Fix tests
jbrooksuk Jan 4, 2017
12b93e1
Use each instead of map
jbrooksuk Jan 4, 2017
a003fce
Expect events for auto-verifying subscribers
jbrooksuk Jan 4, 2017
4d89119
Use each and always fire the event
jbrooksuk Jan 4, 2017
49dac9b
Add rules to subscriber
jbrooksuk Jan 4, 2017
a38acf1
IncidentUpdateWasReportedEvent has handlers
jbrooksuk Jan 4, 2017
1e9161c
Fake notifications
jbrooksuk Jan 4, 2017
7269dd1
More test fixes
jbrooksuk Jan 4, 2017
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Apply fixes from StyleCI
[ci skip] [skip ci]
jbrooksuk committed Jan 4, 2017
commit 2da2ab80f9e9a2552b67bab3fc6343ae6ace1be5
1 change: 0 additions & 1 deletion app/Http/Controllers/Dashboard/SettingsController.php
Original file line number Diff line number Diff line change
@@ -12,7 +12,6 @@
namespace CachetHQ\Cachet\Http\Controllers\Dashboard;

use CachetHQ\Cachet\Bus\Commands\System\Config\UpdateConfigCommand;
use CachetHQ\Cachet\Bus\Commands\System\Mail\TestMailCommand;
use CachetHQ\Cachet\Integrations\Contracts\Credits;
use CachetHQ\Cachet\Models\User;
use CachetHQ\Cachet\Notifications\System\SystemTestNotification;
Original file line number Diff line number Diff line change
@@ -71,7 +71,7 @@ public function via($notifiable)
/**
* Get the mail representation of the notification.
*
* @param mixed $notifiable
* @param mixed $notifiable
*
* @return \Illuminate\Notifications\Messages\MailMessage
*/
4 changes: 2 additions & 2 deletions app/Notifications/Incident/NewIncidentNotification.php
Original file line number Diff line number Diff line change
@@ -63,7 +63,7 @@ public function via($notifiable)
/**
* Get the mail representation of the notification.
*
* @param mixed $notifiable
* @param mixed $notifiable
*
* @return \Illuminate\Notifications\Messages\MailMessage
*/
@@ -136,7 +136,7 @@ public function toSlack($notifiable)
'ID' => "#{$this->incident->id}",
'Link' => $this->incident->permalink,
]))
->footer(trans('cachet.subscriber.unsubscribe', ['link' => cachet_route('subscribe.unsubscribe', $notifiable->verify_code)]));;
->footer(trans('cachet.subscriber.unsubscribe', ['link' => cachet_route('subscribe.unsubscribe', $notifiable->verify_code)]));
});
}
}
Original file line number Diff line number Diff line change
@@ -18,7 +18,6 @@
use Illuminate\Notifications\Messages\NexmoMessage;
use Illuminate\Notifications\Messages\SlackMessage;
use Illuminate\Notifications\Notification;
use Illuminate\Support\Facades\Config;
use McCool\LaravelAutoPresenter\Facades\AutoPresenter;

/**
@@ -64,7 +63,7 @@ public function via($notifiable)
/**
* Get the mail representation of the notification.
*
* @param mixed $notifiable
* @param mixed $notifiable
*
* @return \Illuminate\Notifications\Messages\MailMessage
*/
@@ -144,7 +143,7 @@ public function toSlack($notifiable)
'ID' => "#{$this->update->id}",
'Link' => $this->update->permalink,
]))
->footer(trans('cachet.subscriber.unsubscribe', ['link' => cachet_route('subscribe.unsubscribe', $notifiable->verify_code)]));;
->footer(trans('cachet.subscriber.unsubscribe', ['link' => cachet_route('subscribe.unsubscribe', $notifiable->verify_code)]));
});
}
}
4 changes: 2 additions & 2 deletions app/Notifications/Schedule/NewScheduleNotification.php
Original file line number Diff line number Diff line change
@@ -62,7 +62,7 @@ public function via($notifiable)
/**
* Get the mail representation of the notification.
*
* @param mixed $notifiable
* @param mixed $notifiable
*
* @return \Illuminate\Notifications\Messages\MailMessage
*/
@@ -120,7 +120,7 @@ public function toSlack($notifiable)
'ID' => "#{$this->schedule->id}",
'Status' => $this->schedule->human_status,
]))
->footer(trans('cachet.subscriber.unsubscribe', ['link' => cachet_route('subscribe.unsubscribe', $notifiable->verify_code)]));;
->footer(trans('cachet.subscriber.unsubscribe', ['link' => cachet_route('subscribe.unsubscribe', $notifiable->verify_code)]));
});
}
}
Original file line number Diff line number Diff line change
@@ -40,7 +40,7 @@ public function via($notifiable)
/**
* Get the mail representation of the notification.
*
* @param mixed $notifiable
* @param mixed $notifiable
*
* @return \Illuminate\Notifications\Messages\MailMessage
*/
2 changes: 1 addition & 1 deletion app/Notifications/System/SystemTestNotification.php
Original file line number Diff line number Diff line change
@@ -39,7 +39,7 @@ public function via($notifiable)
/**
* Get the mail representation of the notification.
*
* @param mixed $notifiable
* @param mixed $notifiable
*
* @return \Illuminate\Notifications\Messages\MailMessage
*/
2 changes: 1 addition & 1 deletion app/Notifications/User/InviteUserNotification.php
Original file line number Diff line number Diff line change
@@ -40,7 +40,7 @@ public function via($notifiable)
/**
* Get the mail representation of the notification.
*
* @param mixed $notifiable
* @param mixed $notifiable
*
* @return \Illuminate\Notifications\Messages\MailMessage
*/