Merge branch '2.4' into patch-1

app/Models/Schedule.php

@@ -176,7 +176,7 @@ class Schedule extends Model implements HasPresenter
      */
     public function scopeFutureSchedules($query)
     {
-        return $query->whereIn('status', [self::UPCOMING, self::IN_PROGRESS])->where('completed_at', '>=', Carbon::now());
+        return $query->whereIn('status', [self::UPCOMING, self::IN_PROGRESS])->where('scheduled_at', '>=', Carbon::now());
     }
 
     /**

app/Notifications/Component/ComponentStatusChangedNotification.php

@@ -84,12 +84,15 @@ class ComponentStatusChangedNotification extends Notification
         ]);
 
         return (new MailMessage())
-                    ->subject(trans('notifications.component.status_update.mail.subject'))
+            ->subject(trans('notifications.component.status_update.mail.subject'))
-                    ->greeting(trans('notifications.component.status_update.mail.subject'))
+            ->markdown('notifications.component.update', [
-                    ->line($content)
+                'componentName'          => $this->component->name,
-                    ->action(trans('notifications.component.status_update.mail.action'), cachet_route('status-page'))
+                'content'                => $content,
-                    ->line(trans('cachet.subscriber.unsubscribe', ['link' => cachet_route('subscribe.unsubscribe', $notifiable->verify_code)]))
+                'unsubscribeText'        => trans('cachet.subscriber.unsubscribe'),
-                    ->line(trans('cachet.subscriber.manage.manage_at_link', ['link' =>  cachet_route('subscribe.manage', $notifiable->verify_code)]));
+                'unsubscribeUrl'         => cachet_route('subscribe.unsubscribe', $notifiable->verify_code),
+                'manageSubscriptionText' => trans('cachet.subscriber.manage_subscription'),
+                'manageSubscriptionUrl'  => cachet_route('subscribe.manage', $notifiable->verify_code),
+        ]);
     }
 
     /**

app/Notifications/IncidentUpdate/IncidentUpdatedNotification.php

@@ -75,16 +75,19 @@ class IncidentUpdatedNotification extends Notification
         ]);
 
         return (new MailMessage())
-                    ->subject(trans('notifications.incident.update.mail.subject'))
+            ->subject(trans('notifications.incident.update.mail.subject'))
-                    ->greeting(trans('notifications.incident.update.mail.title', [
+            ->markdown('notifications.incident.update', [
-                        'name'       => $this->update->incident->name,
+                'incident'               => $this->update->incident,
-                        'new_status' => $this->update->human_status,
+                'content'                => $content,
-                    ]))
+                'actionText'             => trans('notifications.incident.new.mail.action'),
-                    ->line($content)
+                'actionUrl'              => cachet_route('incident', [$this->update->incident]),
-                    ->action(trans('notifications.incident.update.mail.action'), cachet_route('incident', [$this->update->incident]))
+                'incidentName'           => $this->update->incident->name,
-                    ->line($this->update->raw_message)
+                'newStatus'              => $this->update->human_status,
-                    ->line(trans('cachet.subscriber.unsubscribe', ['link' => cachet_route('subscribe.unsubscribe', $notifiable->verify_code)]))
+                'unsubscribeText'        => trans('cachet.subscriber.unsubscribe'),
-                    ->line(trans('cachet.subscriber.manage.manage_at_link', ['link' => cachet_route('subscribe.manage', $notifiable->verify_code)]));
+                'unsubscribeUrl'         => cachet_route('subscribe.unsubscribe', $notifiable->verify_code),
+                'manageSubscriptionText' => trans('cachet.subscriber.manage_subscription'),
+                'manageSubscriptionUrl'  => cachet_route('subscribe.manage', $notifiable->verify_code),
+        ]);
     }
 
     /**

app/Notifications/Schedule/NewScheduleNotification.php

@@ -74,11 +74,14 @@ class NewScheduleNotification extends Notification
         ]);
 
         return (new MailMessage())
-                    ->subject(trans('notifications.schedule.new.mail.subject'))
+            ->subject(trans('notifications.schedule.new.mail.subject'))
-                    ->greeting(trans('notifications.schedule.new.mail.title'))
+            ->markdown('notifications.schedule.new', [
-                    ->line($content)
+                'content'                => $content,
-                    ->action(trans('notifications.schedule.new.mail.action'), cachet_route('schedule', [$this->schedule]))
+                'unsubscribeText'        => trans('cachet.subscriber.unsubscribe'),
-                    ->line(trans('cachet.subscriber.unsubscribe', ['link' => cachet_route('subscribe.unsubscribe', $notifiable->verify_code)]));
+                'unsubscribeUrl'         => cachet_route('subscribe.unsubscribe', $notifiable->verify_code),
+                'manageSubscriptionText' => trans('cachet.subscriber.manage_subscription'),
+                'manageSubscriptionUrl'  => cachet_route('subscribe.manage', $notifiable->verify_code),
+        ]);
     }
 
     /**

resources/assets/sass/dashboard/partials/_sidebar.scss

@@ -132,7 +132,7 @@ body.dashboard {
             @extend .hidden-sm;
             position: fixed;
             bottom: 0;
-            width: 237px;
+            width: 235px;
             z-index: 999;
             ul > li {
                 float: left;

resources/lang/af-ZA/cachet.php

@@ -15,14 +15,16 @@ return [
         'last_updated' => 'Last updated :timestamp',
         'status'       => [
             0 => 'Unknown',
-            1 => 'Operational',
+            1 => 'Operasioneel',
-            2 => 'Performance Issues',
+            2 => 'Prestasieprobleme',
-            3 => 'Partial Outage',
+            3 => 'Gedeeltelike Onderbreking',
-            4 => 'Major Outage',
+            4 => 'Groot Onderbreking',
         ],
         'group' => [
             'other' => 'Other Components',
         ],
+        'select_all'   => 'Select All',
+        'deselect_all' => 'Deselect All',
     ],
 
     // Incidents
@@ -80,9 +82,12 @@ return [
         'button'              => 'Teken aan',
         'manage_subscription' => 'Manage subscription',
         'manage'              => [
-            'no_subscriptions' => 'You\'re currently subscribed to all updates.',
+            'notifications'       => 'Notifications',
-            'my_subscriptions' => 'You\'re currently subscribed to the following updates.',
+            'notifications_for'   => 'Manage notifications for',
-            'manage_at_link'   => 'Manage your subscriptions at :link',
+            'no_subscriptions'    => 'You\'re currently subscribed to all updates.',
+            'update_subscription' => 'Update Subscription',
+            'my_subscriptions'    => 'You\'re currently subscribed to the following updates.',
+            'manage_at_link'      => 'Manage your subscriptions at :link',
         ],
         'email' => [
             'subscribe'          => 'Subscribe to email updates.',
@@ -133,7 +138,7 @@ return [
     'home'            => 'Tuiste',
     'powered_by'      => 'Powered by <a href="https://cachethq.io" class="links">Cachet</a>.',
     'timezone'        => 'Times are shown in :timezone.',
-    'about_this_site' => 'About This Site',
+    'about_this_site' => 'Aangaande Hierdie Webwerf',
     'rss-feed'        => 'RSS',
     'atom-feed'       => 'Atom',
     'feed'            => 'Status Feed',

resources/lang/ar-SA/cachet.php

@@ -23,6 +23,8 @@ return [
         'group' => [
             'other' => 'Other Components',
         ],
+        'select_all'   => 'Select All',
+        'deselect_all' => 'Deselect All',
     ],
 
     // Incidents
@@ -80,9 +82,12 @@ return [
         'button'              => 'Subscribe',
         'manage_subscription' => 'Manage subscription',
         'manage'              => [
-            'no_subscriptions' => 'You\'re currently subscribed to all updates.',
+            'notifications'       => 'Notifications',
-            'my_subscriptions' => 'You\'re currently subscribed to the following updates.',
+            'notifications_for'   => 'Manage notifications for',
-            'manage_at_link'   => 'Manage your subscriptions at :link',
+            'no_subscriptions'    => 'You\'re currently subscribed to all updates.',
+            'update_subscription' => 'Update Subscription',
+            'my_subscriptions'    => 'You\'re currently subscribed to the following updates.',
+            'manage_at_link'      => 'Manage your subscriptions at :link',
         ],
         'email' => [
             'subscribe'          => 'Subscribe to email updates.',

resources/lang/ca-ES/cachet.php

@@ -23,6 +23,8 @@ return [
         'group' => [
             'other' => 'Other Components',
         ],
+        'select_all'   => 'Select All',
+        'deselect_all' => 'Deselect All',
     ],
 
     // Incidents
@@ -80,9 +82,12 @@ return [
         'button'              => 'Subscribe',
         'manage_subscription' => 'Manage subscription',
         'manage'              => [
-            'no_subscriptions' => 'You\'re currently subscribed to all updates.',
+            'notifications'       => 'Notifications',
-            'my_subscriptions' => 'You\'re currently subscribed to the following updates.',
+            'notifications_for'   => 'Manage notifications for',
-            'manage_at_link'   => 'Manage your subscriptions at :link',
+            'no_subscriptions'    => 'You\'re currently subscribed to all updates.',
+            'update_subscription' => 'Update Subscription',
+            'my_subscriptions'    => 'You\'re currently subscribed to the following updates.',
+            'manage_at_link'      => 'Manage your subscriptions at :link',
         ],
         'email' => [
             'subscribe'          => 'Subscribe to email updates.',

resources/lang/cs-CZ/cachet.php

@@ -23,6 +23,8 @@ return [
         'group' => [
             'other' => 'Other Components',
         ],
+        'select_all'   => 'Select All',
+        'deselect_all' => 'Deselect All',
     ],
 
     // Incidents
@@ -80,9 +82,12 @@ return [
         'button'              => 'Subscribe',
         'manage_subscription' => 'Manage subscription',
         'manage'              => [
-            'no_subscriptions' => 'Aktuálně jsi přihlášen(a) ke všem upozorněním.',
+            'notifications'       => 'Notifications',
-            'my_subscriptions' => 'Aktuálně jsi přihlášen(a) k následujícím upozorněním.',
+            'notifications_for'   => 'Manage notifications for',
-            'manage_at_link'   => 'Manage your subscriptions at :link',
+            'no_subscriptions'    => 'Aktuálně jsi přihlášen(a) ke všem upozorněním.',
+            'update_subscription' => 'Update Subscription',
+            'my_subscriptions'    => 'Aktuálně jsi přihlášen(a) k následujícím upozorněním.',
+            'manage_at_link'      => 'Manage your subscriptions at :link',
         ],
         'email' => [
             'subscribe'          => 'Subscribe to email updates.',

resources/lang/da-DK/cachet.php

@@ -23,6 +23,8 @@ return [
         'group' => [
             'other' => 'Andre komponenter',
         ],
+        'select_all'   => 'Select All',
+        'deselect_all' => 'Deselect All',
     ],
 
     // Incidents
@@ -80,9 +82,12 @@ return [
         'button'              => 'Abonner',
         'manage_subscription' => 'Manage subscription',
         'manage'              => [
-            'no_subscriptions' => 'Du abonner i øjeblikket på alle opdateringer.',
+            'notifications'       => 'Notifikationer',
-            'my_subscriptions' => 'Du abonnere i øjeblikket på følgende opdateringer.',
+            'notifications_for'   => 'Manage notifications for',
-            'manage_at_link'   => 'Manage your subscriptions at :link',
+            'no_subscriptions'    => 'Du abonner i øjeblikket på alle opdateringer.',
+            'update_subscription' => 'Update Subscription',
+            'my_subscriptions'    => 'Du abonnere i øjeblikket på følgende opdateringer.',
+            'manage_at_link'      => 'Manage your subscriptions at :link',
         ],
         'email' => [
             'subscribe'          => 'Abonner på email opdateringer.',

resources/lang/de-DE/cachet.php

@@ -23,6 +23,8 @@ return [
         'group' => [
             'other' => 'Andere Komponenten',
         ],
+        'select_all'   => 'Select All',
+        'deselect_all' => 'Deselect All',
     ],
 
     // Incidents
@@ -80,9 +82,12 @@ return [
         'button'              => 'Abonnieren',
         'manage_subscription' => 'Manage subscription',
         'manage'              => [
-            'no_subscriptions' => 'Du hast im Augenblick alle Updates abonniert.',
+            'notifications'       => 'Benachrichtigungen',
-            'my_subscriptions' => 'Du hast im Augenblick folgende Updates abonniert.',
+            'notifications_for'   => 'Manage notifications for',
-            'manage_at_link'   => 'Manage your subscriptions at :link',
+            'no_subscriptions'    => 'Du hast im Augenblick alle Updates abonniert.',
+            'update_subscription' => 'Update Subscription',
+            'my_subscriptions'    => 'Du hast im Augenblick folgende Updates abonniert.',
+            'manage_at_link'      => 'Manage your subscriptions at :link',
         ],
         'email' => [
             'subscribe'          => 'Aktualisierungen per E-Mail abonnieren.',

resources/lang/el-GR/cachet.php

@@ -23,6 +23,8 @@ return [
         'group' => [
             'other' => 'Other Components',
         ],
+        'select_all'   => 'Select All',
+        'deselect_all' => 'Deselect All',
     ],
 
     // Incidents
@@ -80,9 +82,12 @@ return [
         'button'              => 'Subscribe',
         'manage_subscription' => 'Manage subscription',
         'manage'              => [
-            'no_subscriptions' => 'You\'re currently subscribed to all updates.',
+            'notifications'       => 'Notifications',
-            'my_subscriptions' => 'You\'re currently subscribed to the following updates.',
+            'notifications_for'   => 'Manage notifications for',
-            'manage_at_link'   => 'Manage your subscriptions at :link',
+            'no_subscriptions'    => 'You\'re currently subscribed to all updates.',
+            'update_subscription' => 'Update Subscription',
+            'my_subscriptions'    => 'You\'re currently subscribed to the following updates.',
+            'manage_at_link'      => 'Manage your subscriptions at :link',
         ],
         'email' => [
             'subscribe'          => 'Subscribe to email updates.',

resources/lang/es-ES/cachet.php

@@ -23,6 +23,8 @@ return [
         'group' => [
             'other' => 'Otros componentes',
         ],
+        'select_all'   => 'Select All',
+        'deselect_all' => 'Deselect All',
     ],
 
     // Incidents
@@ -80,9 +82,12 @@ return [
         'button'              => 'Suscríbete',
         'manage_subscription' => 'Manage subscription',
         'manage'              => [
-            'no_subscriptions' => 'Actualmente estás suscrito a todas las actualizaciones.',
+            'notifications'       => 'Notificaciones',
-            'my_subscriptions' => 'Actualmente estás suscrito a las siguientes actualizaciones.',
+            'notifications_for'   => 'Manage notifications for',
-            'manage_at_link'   => 'Manage your subscriptions at :link',
+            'no_subscriptions'    => 'Actualmente estás suscrito a todas las actualizaciones.',
+            'update_subscription' => 'Update Subscription',
+            'my_subscriptions'    => 'Actualmente estás suscrito a las siguientes actualizaciones.',
+            'manage_at_link'      => 'Manage your subscriptions at :link',
         ],
         'email' => [
             'subscribe'          => 'Suscríbete para recibir actualizaciones por correo electrónico.',

resources/lang/fa-IR/cachet.php

@@ -23,6 +23,8 @@ return [
         'group' => [
             'other' => 'Other Components',
         ],
+        'select_all'   => 'Select All',
+        'deselect_all' => 'Deselect All',
     ],
 
     // Incidents
@@ -80,9 +82,12 @@ return [
         'button'              => 'Subscribe',
         'manage_subscription' => 'Manage subscription',
         'manage'              => [
-            'no_subscriptions' => 'You\'re currently subscribed to all updates.',
+            'notifications'       => 'Notifications',
-            'my_subscriptions' => 'You\'re currently subscribed to the following updates.',
+            'notifications_for'   => 'Manage notifications for',
-            'manage_at_link'   => 'Manage your subscriptions at :link',
+            'no_subscriptions'    => 'You\'re currently subscribed to all updates.',
+            'update_subscription' => 'Update Subscription',
+            'my_subscriptions'    => 'You\'re currently subscribed to the following updates.',
+            'manage_at_link'      => 'Manage your subscriptions at :link',
         ],
         'email' => [
             'subscribe'          => 'Subscribe to email updates.',

resources/lang/fi-FI/cachet.php

@@ -23,6 +23,8 @@ return [
         'group' => [
             'other' => 'Other Components',
         ],
+        'select_all'   => 'Select All',
+        'deselect_all' => 'Deselect All',
     ],
 
     // Incidents
@@ -80,9 +82,12 @@ return [
         'button'              => 'Subscribe',
         'manage_subscription' => 'Manage subscription',
         'manage'              => [
-            'no_subscriptions' => 'You\'re currently subscribed to all updates.',
+            'notifications'       => 'Notifications',
-            'my_subscriptions' => 'You\'re currently subscribed to the following updates.',
+            'notifications_for'   => 'Manage notifications for',
-            'manage_at_link'   => 'Manage your subscriptions at :link',
+            'no_subscriptions'    => 'You\'re currently subscribed to all updates.',
+            'update_subscription' => 'Update Subscription',
+            'my_subscriptions'    => 'You\'re currently subscribed to the following updates.',
+            'manage_at_link'      => 'Manage your subscriptions at :link',
         ],
         'email' => [
             'subscribe'          => 'Subscribe to email updates.',

resources/lang/fr-FR/cachet.php

@@ -23,6 +23,8 @@ return [
         'group' => [
             'other' => 'Autres composants',
         ],
+        'select_all'   => 'Select All',
+        'deselect_all' => 'Deselect All',
     ],
 
     // Incidents
@@ -80,9 +82,12 @@ return [
         'button'              => 'S\'abonner',
         'manage_subscription' => 'Manage subscription',
         'manage'              => [
-            'no_subscriptions' => 'Vous êtes actuellement abonné à toutes les mises à jour.',
+            'notifications'       => 'Notifications',
-            'my_subscriptions' => 'Vous êtes actuellement abonné aux mises à jour suivantes.',
+            'notifications_for'   => 'Manage notifications for',
-            'manage_at_link'   => 'Manage your subscriptions at :link',
+            'no_subscriptions'    => 'Vous êtes actuellement abonné à toutes les mises à jour.',
+            'update_subscription' => 'Update Subscription',
+            'my_subscriptions'    => 'Vous êtes actuellement abonné aux mises à jour suivantes.',
+            'manage_at_link'      => 'Manage your subscriptions at :link',
         ],
         'email' => [
             'subscribe'          => 'S\'abonner aux notifications par email.',

resources/lang/he-IL/cachet.php

@@ -23,6 +23,8 @@ return [
         'group' => [
             'other' => 'Other Components',
         ],
+        'select_all'   => 'Select All',
+        'deselect_all' => 'Deselect All',
     ],
 
     // Incidents
@@ -80,9 +82,12 @@ return [
         'button'              => 'Subscribe',
         'manage_subscription' => 'Manage subscription',
         'manage'              => [
-            'no_subscriptions' => 'You\'re currently subscribed to all updates.',
+            'notifications'       => 'Notifications',
-            'my_subscriptions' => 'You\'re currently subscribed to the following updates.',
+            'notifications_for'   => 'Manage notifications for',
-            'manage_at_link'   => 'Manage your subscriptions at :link',
+            'no_subscriptions'    => 'You\'re currently subscribed to all updates.',
+            'update_subscription' => 'Update Subscription',
+            'my_subscriptions'    => 'You\'re currently subscribed to the following updates.',
+            'manage_at_link'      => 'Manage your subscriptions at :link',
         ],
         'email' => [
             'subscribe'          => 'Subscribe to email updates.',

resources/lang/hu-HU/cachet.php

@@ -23,6 +23,8 @@ return [
         'group' => [
             'other' => 'Other Components',
         ],
+        'select_all'   => 'Select All',
+        'deselect_all' => 'Deselect All',
     ],
 
     // Incidents
@@ -80,9 +82,12 @@ return [
         'button'              => 'Subscribe',
         'manage_subscription' => 'Manage subscription',
         'manage'              => [
-            'no_subscriptions' => 'You\'re currently subscribed to all updates.',
+            'notifications'       => 'Notifications',
-            'my_subscriptions' => 'You\'re currently subscribed to the following updates.',
+            'notifications_for'   => 'Manage notifications for',
-            'manage_at_link'   => 'Manage your subscriptions at :link',
+            'no_subscriptions'    => 'You\'re currently subscribed to all updates.',
+            'update_subscription' => 'Update Subscription',
+            'my_subscriptions'    => 'You\'re currently subscribed to the following updates.',
+            'manage_at_link'      => 'Manage your subscriptions at :link',
         ],
         'email' => [
             'subscribe'          => 'Subscribe to email updates.',

resources/lang/id-ID/cachet.php

@@ -23,6 +23,8 @@ return [
         'group' => [
             'other' => 'Komponen Lain',
         ],
+        'select_all'   => 'Select All',
+        'deselect_all' => 'Deselect All',
     ],
 
     // Incidents
@@ -80,9 +82,12 @@ return [
         'button'              => 'Daftar',
         'manage_subscription' => 'Manage subscription',
         'manage'              => [
-            'no_subscriptions' => 'Anda saat ini terdaftar untuk semua update.',
+            'notifications'       => 'Notifikasi',
-            'my_subscriptions' => 'Anda saat ini berlangganan update berikut.',
+            'notifications_for'   => 'Manage notifications for',
-            'manage_at_link'   => 'Manage your subscriptions at :link',
+            'no_subscriptions'    => 'Anda saat ini terdaftar untuk semua update.',
+            'update_subscription' => 'Update Subscription',
+            'my_subscriptions'    => 'Anda saat ini berlangganan update berikut.',
+            'manage_at_link'      => 'Manage your subscriptions at :link',
         ],
         'email' => [
             'subscribe'          => 'Langganan update email.',

resources/lang/it-IT/cachet.php

@@ -23,6 +23,8 @@ return [
         'group' => [
             'other' => 'Altri componenti',
         ],
+        'select_all'   => 'Select All',
+        'deselect_all' => 'Deselect All',
     ],
 
     // Incidents
@@ -80,9 +82,12 @@ return [
         'button'              => 'Iscriviti',
         'manage_subscription' => 'Manage subscription',
         'manage'              => [
-            'no_subscriptions' => 'Sei attualmente iscritto a tutti gli aggiornamenti.',
+            'notifications'       => 'Notifiche',
-            'my_subscriptions' => 'Sei attualmente iscritto ai seguenti suggerimenti.',
+            'notifications_for'   => 'Manage notifications for',
-            'manage_at_link'   => 'Manage your subscriptions at :link',
+            'no_subscriptions'    => 'Sei attualmente iscritto a tutti gli aggiornamenti.',
+            'update_subscription' => 'Update Subscription',
+            'my_subscriptions'    => 'Sei attualmente iscritto ai seguenti suggerimenti.',
+            'manage_at_link'      => 'Manage your subscriptions at :link',
         ],
         'email' => [
             'subscribe'          => 'Iscriviti agli aggiornamenti via email.',

resources/lang/ja-JP/cachet.php

@@ -23,6 +23,8 @@ return [
         'group' => [
             'other' => 'その他のコンポーネント',
         ],
+        'select_all'   => 'Select All',
+        'deselect_all' => 'Deselect All',
     ],
 
     // Incidents
@@ -80,9 +82,12 @@ return [
         'button'              => '購読',
         'manage_subscription' => '購読の管理',
         'manage'              => [
-            'no_subscriptions' => '現在、すべてのアップデートを購読しています。',
+            'notifications'       => 'Notifications',
-            'my_subscriptions' => '現在、以下のアップデートを購読しています。',
+            'notifications_for'   => 'Manage notifications for',
-            'manage_at_link'   => '購読の管理',
+            'no_subscriptions'    => '現在、すべてのアップデートを購読しています。',
+            'update_subscription' => 'Update Subscription',
+            'my_subscriptions'    => '現在、以下のアップデートを購読しています。',
+            'manage_at_link'      => '購読の管理',
         ],
         'email' => [
             'subscribe'          => 'メールによるアップデート情報の購読',

resources/lang/ko-KR/cachet.php

@@ -23,6 +23,8 @@ return [
         'group' => [
             'other' => 'Other Components',
         ],
+        'select_all'   => 'Select All',
+        'deselect_all' => 'Deselect All',
     ],
 
     // Incidents
@@ -80,9 +82,12 @@ return [
         'button'              => '구독',
         'manage_subscription' => 'Manage subscription',
         'manage'              => [
-            'no_subscriptions' => 'You\'re currently subscribed to all updates.',
+            'notifications'       => 'Notifications',
-            'my_subscriptions' => 'You\'re currently subscribed to the following updates.',
+            'notifications_for'   => 'Manage notifications for',
-            'manage_at_link'   => 'Manage your subscriptions at :link',
+            'no_subscriptions'    => 'You\'re currently subscribed to all updates.',
+            'update_subscription' => 'Update Subscription',
+            'my_subscriptions'    => 'You\'re currently subscribed to the following updates.',
+            'manage_at_link'      => 'Manage your subscriptions at :link',
         ],
         'email' => [
             'subscribe'          => '이메일 구독 신청.',

resources/lang/nl-NL/cachet.php

@@ -23,6 +23,8 @@ return [
         'group' => [
             'other' => 'Andere componenten',
         ],
+        'select_all'   => 'Select All',
+        'deselect_all' => 'Deselect All',
     ],
 
     // Incidents
@@ -80,9 +82,12 @@ return [
         'button'              => 'Abonneren',
         'manage_subscription' => 'Manage subscription',
         'manage'              => [
-            'no_subscriptions' => 'Je bent momenteel geabonneerd op alle updates.',
+            'notifications'       => 'Notificaties',
-            'my_subscriptions' => 'Je bent momenteel geabonneerd op de volgende updates.',
+            'notifications_for'   => 'Manage notifications for',
-            'manage_at_link'   => 'Beheer uw abonnementen op: link',
+            'no_subscriptions'    => 'Je bent momenteel geabonneerd op alle updates.',
+            'update_subscription' => 'Update Subscription',
+            'my_subscriptions'    => 'Je bent momenteel geabonneerd op de volgende updates.',
+            'manage_at_link'      => 'Beheer uw abonnementen op: link',
         ],
         'email' => [
             'subscribe'          => 'Abonneren op e-mail updates.',

resources/lang/no-NO/cachet.php

@@ -23,6 +23,8 @@ return [
         'group' => [
             'other' => 'Andre komponenter',
         ],
+        'select_all'   => 'Select All',
+        'deselect_all' => 'Deselect All',
     ],
 
     // Incidents
@@ -80,9 +82,12 @@ return [
         'button'              => 'Abonner',
         'manage_subscription' => 'Manage subscription',
         'manage'              => [
-            'no_subscriptions' => 'Du abonnerer for øyeblikket på alle oppdateringer.',
+            'notifications'       => 'Notifications',
-            'my_subscriptions' => 'Du abonnerer for øyeblikket på følgende oppdateringer.',
+            'notifications_for'   => 'Manage notifications for',
-            'manage_at_link'   => 'Manage your subscriptions at :link',
+            'no_subscriptions'    => 'Du abonnerer for øyeblikket på alle oppdateringer.',
+            'update_subscription' => 'Update Subscription',
+            'my_subscriptions'    => 'Du abonnerer for øyeblikket på følgende oppdateringer.',
+            'manage_at_link'      => 'Manage your subscriptions at :link',
         ],
         'email' => [
             'subscribe'          => 'Abonner på e-postoppdateringer.',

resources/lang/pl-PL/cachet.php

@@ -23,6 +23,8 @@ return [
         'group' => [
             'other' => 'Pozostałe komponenty',
         ],
+        'select_all'   => 'Select All',
+        'deselect_all' => 'Deselect All',
     ],
 
     // Incidents
@@ -80,9 +82,12 @@ return [
         'button'              => 'Abonnieren',
         'manage_subscription' => 'Manage subscription',
         'manage'              => [
-            'no_subscriptions' => 'Jesteś obecnie zapisany na wszystkie aktualizacje.',
+            'notifications'       => 'Benachrichtigungen',
-            'my_subscriptions' => 'Jesteś obecnie zapisany na poniższe aktualizacje.',
+            'notifications_for'   => 'Manage notifications for',
-            'manage_at_link'   => 'Manage your subscriptions at :link',
+            'no_subscriptions'    => 'Jesteś obecnie zapisany na wszystkie aktualizacje.',
+            'update_subscription' => 'Update Subscription',
+            'my_subscriptions'    => 'Jesteś obecnie zapisany na poniższe aktualizacje.',
+            'manage_at_link'      => 'Manage your subscriptions at :link',
         ],
         'email' => [
             'subscribe'          => 'Aktualisierungen per E-Mail abonnieren.',

resources/lang/pt-BR/cachet.php

@@ -23,6 +23,8 @@ return [
         'group' => [
             'other' => 'Outros componentes',
         ],
+        'select_all'   => 'Select All',
+        'deselect_all' => 'Deselect All',
     ],
 
     // Incidents
@@ -80,9 +82,12 @@ return [
         'button'              => 'Inscreva-se',
         'manage_subscription' => 'Manage subscription',
         'manage'              => [
-            'no_subscriptions' => 'Você está atualmente inscrito a todas as atualizações.',
+            'notifications'       => 'Notificações',
-            'my_subscriptions' => 'Você está atualmente inscrito para as seguintes atualizações.',
+            'notifications_for'   => 'Manage notifications for',
-            'manage_at_link'   => 'Manage your subscriptions at :link',
+            'no_subscriptions'    => 'Você está atualmente inscrito a todas as atualizações.',
+            'update_subscription' => 'Update Subscription',
+            'my_subscriptions'    => 'Você está atualmente inscrito para as seguintes atualizações.',
+            'manage_at_link'      => 'Manage your subscriptions at :link',
         ],
         'email' => [
             'subscribe'          => 'Inscreva-se para atualizações via e-mail.',

resources/lang/pt-PT/cachet.php

@@ -23,6 +23,8 @@ return [
         'group' => [
             'other' => 'Other Components',
         ],
+        'select_all'   => 'Select All',
+        'deselect_all' => 'Deselect All',
     ],
 
     // Incidents
@@ -80,9 +82,12 @@ return [
         'button'              => 'Subscrever',
         'manage_subscription' => 'Manage subscription',
         'manage'              => [
-            'no_subscriptions' => 'You\'re currently subscribed to all updates.',
+            'notifications'       => 'Notificações',
-            'my_subscriptions' => 'You\'re currently subscribed to the following updates.',
+            'notifications_for'   => 'Manage notifications for',
-            'manage_at_link'   => 'Manage your subscriptions at :link',
+            'no_subscriptions'    => 'You\'re currently subscribed to all updates.',
+            'update_subscription' => 'Update Subscription',
+            'my_subscriptions'    => 'You\'re currently subscribed to the following updates.',
+            'manage_at_link'      => 'Manage your subscriptions at :link',
         ],
         'email' => [
             'subscribe'          => 'Subscrever actualizações via email.',

resources/lang/ro-RO/cachet.php

@@ -23,6 +23,8 @@ return [
         'group' => [
             'other' => 'Alte Componente',
         ],
+        'select_all'   => 'Select All',
+        'deselect_all' => 'Deselect All',
     ],
 
     // Incidents
@@ -80,9 +82,12 @@ return [
         'button'              => 'Abonează-te',
         'manage_subscription' => 'Manage subscription',
         'manage'              => [
-            'no_subscriptions' => 'Acum eşti abonat la toate actualizările.',
+            'notifications'       => 'Notificări',
-            'my_subscriptions' => 'Acum eşti abonat la următoarele actualizări.',
+            'notifications_for'   => 'Manage notifications for',
-            'manage_at_link'   => 'Manage your subscriptions at :link',
+            'no_subscriptions'    => 'Acum eşti abonat la toate actualizările.',
+            'update_subscription' => 'Update Subscription',
+            'my_subscriptions'    => 'Acum eşti abonat la următoarele actualizări.',
+            'manage_at_link'      => 'Manage your subscriptions at :link',
         ],
         'email' => [
             'subscribe'          => 'Abonează-te la actualizări prin email.',

resources/lang/ru-RU/cachet.php

@@ -23,6 +23,8 @@ return [
         'group' => [
             'other' => 'Другие компоненты',
         ],
+        'select_all'   => 'Select All',
+        'deselect_all' => 'Deselect All',
     ],
 
     // Incidents
@@ -80,9 +82,12 @@ return [
         'button'              => 'Подписаться',
         'manage_subscription' => 'Manage subscription',
         'manage'              => [
-            'no_subscriptions' => 'Вы подписаны на все изменения.',
+            'notifications'       => 'Уведомления',
-            'my_subscriptions' => 'Вы подписаны на следующие изменения.',
+            'notifications_for'   => 'Manage notifications for',
-            'manage_at_link'   => 'Manage your subscriptions at :link',
+            'no_subscriptions'    => 'Вы подписаны на все изменения.',
+            'update_subscription' => 'Update Subscription',
+            'my_subscriptions'    => 'Вы подписаны на следующие изменения.',
+            'manage_at_link'      => 'Manage your subscriptions at :link',
         ],
         'email' => [
             'subscribe'          => 'Подписка на рассылку об изменениях.',

resources/lang/sq-AL/cachet.php

@@ -23,6 +23,8 @@ return [
         'group' => [
             'other' => 'Other Components',
         ],
+        'select_all'   => 'Select All',
+        'deselect_all' => 'Deselect All',
     ],
 
     // Incidents
@@ -80,9 +82,12 @@ return [
         'button'              => 'Subscribe',
         'manage_subscription' => 'Manage subscription',
         'manage'              => [
-            'no_subscriptions' => 'You\'re currently subscribed to all updates.',
+            'notifications'       => 'Notifications',
-            'my_subscriptions' => 'You\'re currently subscribed to the following updates.',
+            'notifications_for'   => 'Manage notifications for',
-            'manage_at_link'   => 'Manage your subscriptions at :link',
+            'no_subscriptions'    => 'You\'re currently subscribed to all updates.',
+            'update_subscription' => 'Update Subscription',
+            'my_subscriptions'    => 'You\'re currently subscribed to the following updates.',
+            'manage_at_link'      => 'Manage your subscriptions at :link',
         ],
         'email' => [
             'subscribe'          => 'Subscribe to email updates.',

resources/lang/sv-SE/cachet.php

@@ -23,6 +23,8 @@ return [
         'group' => [
             'other' => 'Other Components',
         ],
+        'select_all'   => 'Select All',
+        'deselect_all' => 'Deselect All',
     ],
 
     // Incidents
@@ -80,9 +82,12 @@ return [
         'button'              => 'Prenumerera',
         'manage_subscription' => 'Manage subscription',
         'manage'              => [
-            'no_subscriptions' => 'You\'re currently subscribed to all updates.',
+            'notifications'       => 'Notifieringar',
-            'my_subscriptions' => 'You\'re currently subscribed to the following updates.',
+            'notifications_for'   => 'Manage notifications for',
-            'manage_at_link'   => 'Manage your subscriptions at :link',
+            'no_subscriptions'    => 'You\'re currently subscribed to all updates.',
+            'update_subscription' => 'Update Subscription',
+            'my_subscriptions'    => 'You\'re currently subscribed to the following updates.',
+            'manage_at_link'      => 'Manage your subscriptions at :link',
         ],
         'email' => [
             'subscribe'          => 'Prenumerera på epost-uppdateringar.',

resources/lang/th-TH/cachet.php

@@ -23,6 +23,8 @@ return [
         'group' => [
             'other' => 'Other Components',
         ],
+        'select_all'   => 'Select All',
+        'deselect_all' => 'Deselect All',
     ],
 
     // Incidents
@@ -80,9 +82,12 @@ return [
         'button'              => 'Subscribe',
         'manage_subscription' => 'Manage subscription',
         'manage'              => [
-            'no_subscriptions' => 'You\'re currently subscribed to all updates.',
+            'notifications'       => 'Notifications',
-            'my_subscriptions' => 'You\'re currently subscribed to the following updates.',
+            'notifications_for'   => 'Manage notifications for',
-            'manage_at_link'   => 'Manage your subscriptions at :link',
+            'no_subscriptions'    => 'You\'re currently subscribed to all updates.',
+            'update_subscription' => 'Update Subscription',
+            'my_subscriptions'    => 'You\'re currently subscribed to the following updates.',
+            'manage_at_link'      => 'Manage your subscriptions at :link',
         ],
         'email' => [
             'subscribe'          => 'Subscribe to email updates.',

resources/lang/tr-TR/cachet.php

@@ -23,6 +23,8 @@ return [
         'group' => [
             'other' => 'Other Components',
         ],
+        'select_all'   => 'Select All',
+        'deselect_all' => 'Deselect All',
     ],
 
     // Incidents
@@ -80,9 +82,12 @@ return [
         'button'              => 'Subscribe',
         'manage_subscription' => 'Manage subscription',
         'manage'              => [
-            'no_subscriptions' => 'You\'re currently subscribed to all updates.',
+            'notifications'       => 'Notifications',
-            'my_subscriptions' => 'You\'re currently subscribed to the following updates.',
+            'notifications_for'   => 'Manage notifications for',
-            'manage_at_link'   => 'Manage your subscriptions at :link',
+            'no_subscriptions'    => 'You\'re currently subscribed to all updates.',
+            'update_subscription' => 'Update Subscription',
+            'my_subscriptions'    => 'You\'re currently subscribed to the following updates.',
+            'manage_at_link'      => 'Manage your subscriptions at :link',
         ],
         'email' => [
             'subscribe'          => 'Subscribe to email updates.',

resources/lang/uk-UA/cachet.php

@@ -23,6 +23,8 @@ return [
         'group' => [
             'other' => 'Other Components',
         ],
+        'select_all'   => 'Select All',
+        'deselect_all' => 'Deselect All',
     ],
 
     // Incidents
@@ -80,9 +82,12 @@ return [
         'button'              => 'Subscribe',
         'manage_subscription' => 'Manage subscription',
         'manage'              => [
-            'no_subscriptions' => 'You\'re currently subscribed to all updates.',
+            'notifications'       => 'Notifications',
-            'my_subscriptions' => 'You\'re currently subscribed to the following updates.',
+            'notifications_for'   => 'Manage notifications for',
-            'manage_at_link'   => 'Manage your subscriptions at :link',
+            'no_subscriptions'    => 'You\'re currently subscribed to all updates.',
+            'update_subscription' => 'Update Subscription',
+            'my_subscriptions'    => 'You\'re currently subscribed to the following updates.',
+            'manage_at_link'      => 'Manage your subscriptions at :link',
         ],
         'email' => [
             'subscribe'          => 'Subscribe to email updates.',

resources/lang/vi-VN/cachet.php

@@ -23,6 +23,8 @@ return [
         'group' => [
             'other' => 'Other Components',
         ],
+        'select_all'   => 'Select All',
+        'deselect_all' => 'Deselect All',
     ],
 
     // Incidents
@@ -80,9 +82,12 @@ return [
         'button'              => 'Subscribe',
         'manage_subscription' => 'Manage subscription',
         'manage'              => [
-            'no_subscriptions' => 'You\'re currently subscribed to all updates.',
+            'notifications'       => 'Notifications',
-            'my_subscriptions' => 'You\'re currently subscribed to the following updates.',
+            'notifications_for'   => 'Manage notifications for',
-            'manage_at_link'   => 'Manage your subscriptions at :link',
+            'no_subscriptions'    => 'You\'re currently subscribed to all updates.',
+            'update_subscription' => 'Update Subscription',
+            'my_subscriptions'    => 'You\'re currently subscribed to the following updates.',
+            'manage_at_link'      => 'Manage your subscriptions at :link',
         ],
         'email' => [
             'subscribe'          => 'Subscribe to email updates.',

resources/lang/zh-CN/cachet.php

@@ -23,6 +23,8 @@ return [
         'group' => [
             'other' => '其他组件',
         ],
+        'select_all'   => 'Select All',
+        'deselect_all' => 'Deselect All',
     ],
 
     // Incidents
@@ -80,9 +82,12 @@ return [
         'button'              => '订阅',
         'manage_subscription' => 'Manage subscription',
         'manage'              => [
-            'no_subscriptions' => '您当前已订阅所有更新。',
+            'notifications'       => '通知',
-            'my_subscriptions' => '您当前已订阅下列更新',
+            'notifications_for'   => 'Manage notifications for',
-            'manage_at_link'   => '在 :link 管理你的订阅',
+            'no_subscriptions'    => '您当前已订阅所有更新。',
+            'update_subscription' => 'Update Subscription',
+            'my_subscriptions'    => '您当前已订阅下列更新',
+            'manage_at_link'      => '在 :link 管理你的订阅',
         ],
         'email' => [
             'subscribe'          => '订阅电子邮件更新。',

resources/lang/zh-TW/cachet.php

@@ -23,6 +23,8 @@ return [
         'group' => [
             'other' => 'Other Components',
         ],
+        'select_all'   => 'Select All',
+        'deselect_all' => 'Deselect All',
     ],
 
     // Incidents
@@ -80,9 +82,12 @@ return [
         'button'              => 'Subscribe',
         'manage_subscription' => 'Manage subscription',
         'manage'              => [
-            'no_subscriptions' => 'You\'re currently subscribed to all updates.',
+            'notifications'       => '通知',
-            'my_subscriptions' => 'You\'re currently subscribed to the following updates.',
+            'notifications_for'   => 'Manage notifications for',
-            'manage_at_link'   => 'Manage your subscriptions at :link',
+            'no_subscriptions'    => 'You\'re currently subscribed to all updates.',
+            'update_subscription' => 'Update Subscription',
+            'my_subscriptions'    => 'You\'re currently subscribed to the following updates.',
+            'manage_at_link'      => 'Manage your subscriptions at :link',
         ],
         'email' => [
             'subscribe'          => 'Subscribe to email updates.',

resources/lang/zu-ZA/cachet.php

@@ -23,6 +23,8 @@ return [
         'group' => [
             'other' => 'crwdns883:0crwdne883:0',
         ],
+        'select_all'   => 'crwdns1510:0crwdne1510:0',
+        'deselect_all' => 'crwdns1512:0crwdne1512:0',
     ],
 
     // Incidents
@@ -80,9 +82,12 @@ return [
         'button'              => 'crwdns909:0crwdne909:0',
         'manage_subscription' => 'crwdns1448:0crwdne1448:0',
         'manage'              => [
-            'no_subscriptions' => 'crwdns910:0crwdne910:0',
+            'notifications'       => 'crwdns1514:0crwdne1514:0',
-            'my_subscriptions' => 'crwdns911:0crwdne911:0',
+            'notifications_for'   => 'crwdns1516:0crwdne1516:0',
-            'manage_at_link'   => 'crwdns1432:0crwdne1432:0',
+            'no_subscriptions'    => 'crwdns910:0crwdne910:0',
+            'update_subscription' => 'crwdns1518:0crwdne1518:0',
+            'my_subscriptions'    => 'crwdns911:0crwdne911:0',
+            'manage_at_link'      => 'crwdns1432:0crwdne1432:0',
         ],
         'email' => [
             'subscribe'          => 'crwdns912:0crwdne912:0',

resources/views/index.blade.php

@@ -3,6 +3,7 @@
 @section('content')
 @include('partials.modules.messages')
 @include('partials.modules.status')
+@include('partials.about-app')
 @include('partials.modules.components')
 @include('partials.modules.metrics')
 @include('partials.modules.stickied')

resources/views/notifications/component/update.blade.php

@@ -0,0 +1,11 @@
+@component('mail::message')
+# {{ trans('notifications.component.status_update.mail.greeting') }}
+
+{{ $content }}
+
+Thanks,<br>
+{{ Config::get('setting.app_name') }}
+
+@include('notifications.partials.subscription')
+
+@endcomponent

resources/views/notifications/incident/update.blade.php

@@ -0,0 +1,11 @@
+@component('mail::message')
+# {{ trans('notifications.incident.update.mail.title', ['name' => $incidentName, 'new_status' => $newStatus])  }}
+
+{{ $content }}
+
+Thanks,<br>
+{{ Config::get('setting.app_name') }}
+
+@include('notifications.partials.subscription')
+
+@endcomponent

resources/views/notifications/schedule/new.blade.php

@@ -0,0 +1,11 @@
+@component('mail::message')
+# {{ trans('notifications.schedule.new.mail.title') }}
+
+{{ $content }}
+
+Thanks,<br>
+{{ Config::get('setting.app_name') }}
+
+@include('notifications.partials.subscription')
+
+@endcomponent