Merge pull request #4203 from fiveai/fix-api-search-with-pagination

Fix API search with pagination when specifying page

.travis.yml

@@ -1,13 +1,17 @@
 language: php
 
+sudo: false
+
+dist: trusty
+
 php:
   - 5.5.9
   - 5.5
   - 5.6
   - 7.0
-  - hhvm
+  - 7.1
 
-sudo: false
+before_install: cp .env.example .env
 
 install: travis_retry composer install --no-interaction --no-scripts --prefer-source
 

README.md

@@ -1,18 +1,14 @@
 # Cachet
 
 [![StyleCI](https://styleci.io/repos/26730195/shield)](https://styleci.io/repos/26730195/)
-[![Build Status](https://img.shields.io/travis/CachetHQ/Cachet/master.svg?style=flat-square)](https://travis-ci.org/CachetHQ/Cachet)
+[![Build Status](https://img.shields.io/travis/CachetHQ/Cachet/2.3.svg?style=flat-square)](https://travis-ci.org/CachetHQ/Cachet)
 [![Software License](https://img.shields.io/badge/license-BSD3-brightgreen.svg?style=flat-square)](LICENSE)
 [![Crowdin](https://d322cqt584bo4o.cloudfront.net/cachet/localized.svg)](http://translate.cachethq.io/project/cachet)
 [![Packagist](https://img.shields.io/packagist/v/cachethq/cachet.svg?style=flat-square)](https://packagist.org/packages/cachethq/cachet)
 
 ![Screenshot](https://cachethq.io/img/main-interface.jpg)
 
-Cachet is a beautiful and powerful open source status page system, a free replacement to services such as StatusPage.io, Status.io and others.
-
-## Show your support
-
-Cachet is a BSD-3-licensed open source project. If you'd like to support future development, check out the [Patreon campaign](https://patreon.com/jbrooksuk).
+Cachet is a beautiful and powerful open source status page system.
 
 ## Features
 
@@ -25,21 +21,17 @@ Cachet is a BSD-3-licensed open source project. If you'd like to support future
 - Metrics
 - Cross-database support: MySQL, PostgreSQL and SQLite
 - Subscriber notifications via Email
-- Two factor authentication, with Google Authenticator
-
-## Usage in production
-
-Use of `master` in a production environment is not recommended as it may change at any time.
+- Two factor authentication using Google Authenticator
 
 ## Requirements
 
-- PHP 5.5.9+ or newer
+- PHP 5.5.9 - 7.1
 - Apache or Nginx server
 - [Composer](https://getcomposer.org)
 
-## How to contribute
+## I'm looking to contribute to this awesome project!
 
-We're always looking for contributions that improve Cachet. It's easy to get started and you don't even need to know how to write a single line of code!
+Sweet, we're always looking for contributions that improve Cachet! It's easy to get started and you don't even need to know how to write a single line of code!
 
 ### Contributing as a non-developer/non-designer
 
@@ -71,11 +63,13 @@ We use these extra dependencies to develop Cachet:
 - Gulp
 - Git
 
-Once cloned to your local machine, you'll need some demo data! Run `php artisan cachet:seed` to get the demo installation on the go.
+Once cloned to your local machine, you'll need some demo data! Run `php artisan cachet:seed` to get the demo installation ready for action.
 
 ## Installation, Upgrades and Documentation
 
-You can now find our documentation at [https://docs.cachethq.io](https://docs.cachethq.io).
+Documentation is found at [https://docs.cachethq.io](https://docs.cachethq.io).
+
+Here are some useful quick links:
 
 - [Installing Cachet](https://docs.cachethq.io/docs/installing-cachet)
 - [Getting started with Docker](https://docs.cachethq.io/docs/get-started-with-docker)
@@ -84,8 +78,8 @@ You can now find our documentation at [https://docs.cachethq.io](https://docs.ca
 
 To test out the demo, you may login to the [Dashboard](https://demo.cachethq.io/dashboard) with the following:
 
-- **Username:** test or test@test.com
-- **Password:** test123
+- **Username:** `test` or `test@test.com`
+- **Password:** `test123`
 
 The demo is reset every half hour.
 
@@ -95,14 +89,18 @@ We list releases on the [Releases page](https://github.com/CachetHQ/Cachet/relea
 
 ## Translations
 
-A special thank you to our [translators](https://crowdin.com/project/cachet/activity_stream), who have allowed us to share Cachet with the world. If you'd like to contribute translations, please check out our [CrowdIn project](https://crowdin.com/project/cachet).
+If you'd like to contribute translations, please check out our [CrowdIn project](https://crowdin.com/project/cachet).
+
+> Thank you to our [translators](https://crowdin.com/project/cachet/activity_stream), who have allowed us to share Cachet with the world!
+
+## Show your support
+
+Cachet is a BSD-3-licensed open source project.
+
+## Professional Installation Service
+
+We offer a professional installation service. To find out more, email us at [support@alt-three.com](mailto:support@alt-three.com?Cachet Installation)
 
 ## Security Vulnerabilities
 
 If you discover a security vulnerability within Cachet, please send an e-mail to us at support@alt-three.com. We handle all security vulnerabilities on a case-by-case basis.
-
-## Installations
-
-We offer a paid installation service, which starts at $99 but is subject to change, dependant on your setup and infrastructure.
-
-To find out more, email us at support@alt-three.com

VERSION

@@ -1 +1 @@
-2.5.0-dev
+2.3.19-dev

app/Bus/Commands/User/AddTeamMemberCommand.php

@@ -11,12 +11,7 @@
 
 namespace CachetHQ\Cachet\Bus\Commands\User;
 
-/**
- * This is the add user command.
- *
- * @author James Brooks <james@alt-three.com>
- */
-final class AddUserCommand
+final class AddTeamMemberCommand
 {
     /**
      * The user username.

app/Bus/Commands/User/InviteTeamMemberCommand.php

@@ -11,12 +11,7 @@
 
 namespace CachetHQ\Cachet\Bus\Commands\User;
 
-/**
- * This is the invite user command.
- *
- * @author James Brooks <james@alt-three.com>
- */
-final class InviteUserCommand
+final class InviteTeamMemberCommand
 {
     /**
      * The invite emails.
@@ -35,7 +30,7 @@ final class InviteUserCommand
     ];
 
     /**
-     * Create a new invite user command instance.
+     * Create a new invite team member command instance.
      *
      * @param string[] $emails
      *

app/Bus/Handlers/Commands/Incident/ReportIncidentCommandHandler.php

@@ -70,7 +70,7 @@ class ReportIncidentCommandHandler
             'visible' => $command->visible,
         ];
 
-        if ($command->template) {
+        if (IncidentTemplate::where('slug', '=', $command->template)->first()) {
             $data['message'] = $this->parseIncidentTemplate($command->template, $command->template_vars);
         } else {
             $data['message'] = $command->message;

app/Bus/Handlers/Commands/Subscriber/SubscribeSubscriberCommandHandler.php

@@ -44,17 +44,17 @@ class SubscribeSubscriberCommandHandler
 
         // Decide what to subscribe the subscriber to.
         if ($subscriptions = $command->subscriptions) {
-            $subscriptions = Component::whereIn('id', $subscriptions);
+            $components = Component::whereIn('id', $subscriptions)->get();
         } else {
-            $subscriptions = Component::all();
+            $components = Component::all();
         }
 
-        foreach ($subscriptions as $component) {
+        $components->map(function ($component) use ($subscriber) {
             Subscription::create([
                 'subscriber_id' => $subscriber->id,
                 'component_id'  => $component->id,
             ]);
-        }
+        });
 
         if ($command->verified) {
             dispatch(new VerifySubscriberCommand($subscriber));
@@ -62,6 +62,8 @@ class SubscribeSubscriberCommandHandler
             event(new SubscriberHasSubscribedEvent($subscriber));
         }
 
+        $subscriber->load('subscriptions');
+
         return $subscriber;
     }
 }

app/Bus/Handlers/Commands/Subscriber/UnsubscribeSubscriberCommandHandler.php

@@ -13,7 +13,6 @@ namespace CachetHQ\Cachet\Bus\Handlers\Commands\Subscriber;
 
 use CachetHQ\Cachet\Bus\Commands\Subscriber\UnsubscribeSubscriberCommand;
 use CachetHQ\Cachet\Bus\Events\Subscriber\SubscriberHasUnsubscribedEvent;
-use CachetHQ\Cachet\Models\Subscriber;
 
 class UnsubscribeSubscriberCommandHandler
 {

app/Bus/Handlers/Commands/User/AddTeamMemberCommandHandler.php

@@ -11,25 +11,20 @@
 
 namespace CachetHQ\Cachet\Bus\Handlers\Commands\User;
 
-use CachetHQ\Cachet\Bus\Commands\User\AddUserCommand;
+use CachetHQ\Cachet\Bus\Commands\User\AddTeamMemberCommand;
 use CachetHQ\Cachet\Bus\Events\User\UserWasAddedEvent;
 use CachetHQ\Cachet\Models\User;
 
-/**
- * This is the add user command handler.
- *
- * @author James Brooks <james@alt-three.com>
- */
-class AddUserCommandHandler
+class AddTeamMemberCommandHandler
 {
     /**
-     * Handle the add user command.
+     * Handle the add team member command.
      *
-     * @param \CachetHQ\Cachet\Bus\Commands\User\AddUserCommand $command
+     * @param \CachetHQ\Cachet\Bus\Commands\User\AddTeamMemberCommand $command
      *
      * @return \CachetHQ\Cachet\Models\User
      */
-    public function handle(AddUserCommand $command)
+    public function handle(AddTeamMemberCommand $command)
     {
         $user = User::create([
             'username' => $command->username,

app/Bus/Handlers/Commands/User/InviteTeamMemberCommandHandler.php

@@ -11,25 +11,20 @@
 
 namespace CachetHQ\Cachet\Bus\Handlers\Commands\User;
 
-use CachetHQ\Cachet\Bus\Commands\User\InviteUserCommand;
+use CachetHQ\Cachet\Bus\Commands\User\InviteTeamMemberCommand;
 use CachetHQ\Cachet\Bus\Events\User\UserWasInvitedEvent;
 use CachetHQ\Cachet\Models\Invite;
 
-/**
- * This is the invite user command handler.
- *
- * @author James Brooks <james@alt-three.com>
- */
-class InviteUserCommandHandler
+class InviteTeamMemberCommandHandler
 {
     /**
      * Handle the invite team member command.
      *
-     * @param \CachetHQ\Cachet\Bus\Commands\User\InviteUserCommand $command
+     * @param \CachetHQ\Cachet\Bus\Commands\User\InviteTeamMemberCommand $command
      *
      * @return void
      */
-    public function handle(InviteUserCommand $command)
+    public function handle(InviteTeamMemberCommand $command)
     {
         foreach ($command->emails as $email) {
             $invite = Invite::create([

app/Bus/Handlers/Events/Incident/SendIncidentEmailNotificationHandler.php

@@ -106,8 +106,8 @@ class SendIncidentEmailNotificationHandler
         $component = AutoPresenter::decorate($event->incident->component);
 
         $mail = [
-            'email'            => $subscriber->email,
-            'subject'          => trans('cachet.subscriber.email.incident.subject', [
+            'email'   => $subscriber->email,
+            'subject' => trans('cachet.subscriber.email.incident.subject', [
                 'status' => $incident->human_status,
                 'name'   => $incident->name,
             ]),

app/Bus/Handlers/Events/Incident/SendMaintenanceEmailNotificationHandler.php

@@ -106,9 +106,9 @@ class SendMaintenanceEmailNotificationHandler
         $component = AutoPresenter::decorate($event->incident->component);
 
         $mail = [
-            'email'            => $subscriber->email,
-            'subject'          => trans('cachet.subscriber.email.maintenance.subject', [
-                'name'   => $incident->name,
+            'email'   => $subscriber->email,
+            'subject' => trans('cachet.subscriber.email.maintenance.subject', [
+                'name' => $incident->name,
             ]),
             'has_component'    => ($event->incident->component) ? true : false,
             'component_name'   => $component ? $component->name : null,

app/Bus/Handlers/Events/User/SendInviteUserEmailHandler.php

@@ -46,9 +46,9 @@ class SendInviteUserEmailHandler
     public function handle(UserWasInvitedEvent $event)
     {
         $mail = [
-            'email'    => $event->invite->email,
-            'subject'  => 'You have been invited.',
-            'link'     => route('signup.invite', ['code' => $event->invite->code]),
+            'email'   => $event->invite->email,
+            'subject' => 'You have been invited.',
+            'link'    => route('signup.invite', ['code' => $event->invite->code]),
         ];
 
         $this->mailer->queue([

app/Composers/AppComposer.php

@@ -11,41 +11,12 @@
 
 namespace CachetHQ\Cachet\Composers;
 
-use CachetHQ\Cachet\Dates\DateFactory;
 use GrahamCampbell\Markdown\Facades\Markdown;
-use Illuminate\Contracts\Config\Repository;
 use Illuminate\Contracts\View\View;
+use Illuminate\Support\Facades\Config;
 
 class AppComposer
 {
-    /**
-     * The date factory instance.
-     *
-     * @var \CachetHQ\Cachet\Dates\DateFactory
-     */
-    protected $dates;
-
-    /**
-     * The illuminate config instance.
-     *
-     * @var \Illuminate\Contracts\Config\Repository
-     */
-    protected $config;
-
-    /**
-     * Create a new app composer instance.
-     *
-     * @param \CachetHQ\Cachet\Dates\DateFactory      $dates
-     * @param \Illuminate\Contracts\Config\Repository $config
-     *
-     * @return void
-     */
-    public function __construct(DateFactory $dates, Repository $config)
-    {
-        $this->dates = $dates;
-        $this->config = $config;
-    }
-
     /**
      * Index page view composer.
      *
@@ -55,28 +26,25 @@ class AppComposer
      */
     public function compose(View $view)
     {
-        $view->withAboutApp(Markdown::convertToHtml($this->config->get('setting.app_about')));
-        $view->withAppAnalytics($this->config->get('setting.app_analytics'));
-        $view->withAppAnalyticsGoSquared($this->config->get('setting.app_analytics_gs'));
-        $view->withAppAnalyticsPiwikUrl($this->config->get('setting.app_analytics_piwik_url'));
-        $view->withAppAnalyticsPiwikSiteId($this->config->get('setting.app_analytics_piwik_site_id'));
-        $view->withAppBanner($this->config->get('setting.app_banner'));
-        $view->withAppBannerStyleFullWidth($this->config->get('setting.style_fullwidth_header'));
-        $view->withAppBannerType($this->config->get('setting.app_banner_type'));
-        $view->withAppDomain($this->config->get('setting.app_domain'));
-        $view->withAppGraphs($this->config->get('setting.display_graphs'));
-        $view->withAppLocale($this->config->get('setting.app_locale'));
-        $view->withAppStylesheet($this->config->get('setting.stylesheet'));
-        $view->withAppUrl($this->config->get('app.url'));
-        $view->withAppHeader($this->config->get('setting.header'));
-        $view->withAppFooter($this->config->get('setting.footer'));
-        $view->withAppName($this->config->get('setting.app_name'));
-        $view->withShowSupport($this->config->get('setting.show_support'));
-        $view->withAutomaticLocalization($this->config->get('setting.automatic_localization'));
-        $view->withEnableExternalDependencies($this->config->get('setting.enable_external_dependencies'));
-        $view->withShowTimezone($this->config->get('setting.show_timezone'));
-        $view->withTimezone($this->dates->getTimezone());
-        $view->withSiteTitle($this->config->get('setting.app_name'));
-        $view->withFontSubset($this->config->get('langs.'.$this->config->get('app.locale').'.subset', 'latin'));
+        $view->withAboutApp(Markdown::convertToHtml(Config::get('setting.app_about')));
+        $view->withAppAnalytics(Config::get('setting.app_analytics'));
+        $view->withAppAnalyticsGoSquared(Config::get('setting.app_analytics_gs'));
+        $view->withAppAnalyticsPiwikUrl(Config::get('setting.app_analytics_piwik_url'));
+        $view->withAppAnalyticsPiwikSiteId(Config::get('setting.app_analytics_piwik_site_id'));
+        $view->withAppBanner(Config::get('setting.app_banner'));
+        $view->withAppBannerStyleFullWidth(Config::get('setting.style_fullwidth_header'));
+        $view->withAppBannerType(Config::get('setting.app_banner_type'));
+        $view->withAppDomain(Config::get('setting.app_domain'));
+        $view->withAppGraphs(Config::get('setting.display_graphs'));
+        $view->withAppLocale(Config::get('setting.app_locale'));
+        $view->withAppStylesheet(Config::get('setting.stylesheet'));
+        $view->withAppUrl(Config::get('app.url'));
+        $view->withAppHeader(Config::get('setting.header'));
+        $view->withAppFooter(Config::get('setting.footer'));
+        $view->withAppName(Config::get('setting.app_name'));
+        $view->withShowSupport($support = Config::get('setting.show_support'));
+        $view->withAutomaticLocalization(Config::get('setting.automatic_localization'));
+        $view->withSiteTitle(Config::get('setting.app_name'));
+        $view->withFontSubset(Config::get('langs.'.Config::get('app.locale').'.subset', 'latin'));
     }
 }

app/Composers/DashboardComposer.php

@@ -30,7 +30,7 @@ class DashboardComposer
     {
         $view->withIncidentCount(Incident::notScheduled()->count());
         $view->withIncidentTemplateCount(IncidentTemplate::count());
-        $view->withComponentCount(Component::all()->count());
+        $view->withComponentCount(Component::count());
         $view->withSubscriberCount(Subscriber::isVerified()->count());
     }
 }

app/Composers/MetricsComposer.php

@@ -12,30 +12,11 @@
 namespace CachetHQ\Cachet\Composers;
 
 use CachetHQ\Cachet\Models\Metric;
-use Illuminate\Contracts\Config\Repository;
 use Illuminate\Contracts\View\View;
+use Illuminate\Support\Facades\Config;
 
 class MetricsComposer
 {
-    /**
-     * The illuminate config instance.
-     *
-     * @var \Illuminate\Contracts\Config\Repository
-     */
-    protected $config;
-
-    /**
-     * Create a new metrics composer.
-     *
-     * @param \Illuminate\Contracts\Config\Repository $config
-     *
-     * @return void
-     */
-    public function __construct(Repository $config)
-    {
-        $this->config = $config;
-    }
-
     /**
      * Metrics view composer.
      *
@@ -46,7 +27,7 @@ class MetricsComposer
     public function compose(View $view)
     {
         $metrics = null;
-        if ($displayMetrics = $this->config->get('setting.display_graphs')) {
+        if ($displayMetrics = Config::get('setting.display_graphs')) {
             $metrics = Metric::displayable()->orderBy('order')->orderBy('id')->get();
         }
 

app/Composers/ThemeComposer.php

@@ -11,30 +11,11 @@
 
 namespace CachetHQ\Cachet\Composers;
 
-use Illuminate\Contracts\Config\Repository;
 use Illuminate\Contracts\View\View;
+use Illuminate\Support\Facades\Config;
 
 class ThemeComposer
 {
-    /**
-     * The illuminate config instance.
-     *
-     * @var \Illuminate\Contracts\Config\Repository
-     */
-    protected $config;
-
-    /**
-     * Create a new theme composer.
-     *
-     * @param \Illuminate\Contracts\Config\Repository $config
-     *
-     * @return void
-     */
-    public function __construct(Repository $config)
-    {
-        $this->config = $config;
-    }
-
     /**
      * Bind data to the view.
      *
@@ -45,17 +26,17 @@ class ThemeComposer
     public function compose(View $view)
     {
         // Theme colors.
-        $view->withThemeBackgroundColor($this->config->get('setting.style_background_color', '#F0F3F4'));
-        $view->withThemeBackgroundFills($this->config->get('setting.style_background_fills', '#FFFFFF'));
-        $view->withThemeBannerBackgroundColor($this->config->get('setting.style_banner_background_color', ''));
-        $view->withThemeBannerPadding($this->config->get('setting.style_banner_padding', '40px 0'));
-        $view->withThemeTextColor($this->config->get('setting.style_text_color', '#333333'));
-        $view->withThemeReds($this->config->get('setting.style_reds', '#ff6f6f'));
-        $view->withThemeBlues($this->config->get('setting.style_blues', '#3498db'));
-        $view->withThemeGreens($this->config->get('setting.style_greens', '#7ED321'));
-        $view->withThemeYellows($this->config->get('setting.style_yellows', '#F7CA18'));
-        $view->withThemeOranges($this->config->get('setting.style_oranges', '#FF8800'));
-        $view->withThemeMetrics($this->config->get('setting.style_metrics', '#0dccc0'));
-        $view->withThemeLinks($this->config->get('setting.style_links', '#7ED321'));
+        $view->withThemeBackgroundColor(Config::get('setting.style_background_color', '#F0F3F4'));
+        $view->withThemeBackgroundFills(Config::get('setting.style_background_fills', '#FFFFFF'));
+        $view->withThemeBannerBackgroundColor(Config::get('setting.style_banner_background_color', ''));
+        $view->withThemeBannerPadding(Config::get('setting.style_banner_padding', '40px 0'));
+        $view->withThemeTextColor(Config::get('setting.style_text_color', '#333333'));
+        $view->withThemeReds(Config::get('setting.style_reds', '#ff6f6f'));
+        $view->withThemeBlues(Config::get('setting.style_blues', '#3498db'));
+        $view->withThemeGreens(Config::get('setting.style_greens', '#7ED321'));
+        $view->withThemeYellows(Config::get('setting.style_yellows', '#F7CA18'));
+        $view->withThemeOranges(Config::get('setting.style_oranges', '#FF8800'));
+        $view->withThemeMetrics(Config::get('setting.style_metrics', '#0dccc0'));
+        $view->withThemeLinks(Config::get('setting.style_links', '#7ED321'));
     }
 }

app/Composers/TimezoneLocaleComposer.php

@@ -13,30 +13,12 @@ namespace CachetHQ\Cachet\Composers;
 
 use DateTime;
 use DateTimeZone;
-use Illuminate\Contracts\Config\Repository;
 use Illuminate\Contracts\View\View;
+use Illuminate\Support\Arr;
+use Illuminate\Support\Facades\Config;
 
 class TimezoneLocaleComposer
 {
-    /**
-     * The illuminate config instance.
-     *
-     * @var \Illuminate\Contracts\Config\Repository
-     */
-    protected $config;
-
-    /**
-     * Create a new timezone locale composer.
-     *
-     * @param \Illuminate\Contracts\Config\Repository $config
-     *
-     * @return void
-     */
-    public function __construct(Repository $config)
-    {
-        $this->config = $config;
-    }
-
     /**
      * Timezones and Locales composer.
      *
@@ -46,12 +28,12 @@ class TimezoneLocaleComposer
      */
     public function compose(View $view)
     {
-        $enabledLangs = $this->config->get('langs');
+        $enabledLangs = Config::get('langs');
 
         $langs = array_map(function ($lang) use ($enabledLangs) {
             $locale = basename($lang);
 
-            return [$locale => $enabledLangs[$locale]];
+            return [$locale => Arr::get($enabledLangs, $locale)];
         }, glob(base_path('resources/lang').'/*'));
 
         $langs = call_user_func_array('array_merge', $langs);

app/Console/Commands/DemoSeederCommand.php

@@ -163,13 +163,6 @@ class DemoSeederCommand extends Command
                 'order'       => 1,
                 'group_id'    => 2,
                 'link'        => 'https://styleci.io',
-            ], [
-                'name'        => 'Patreon Page',
-                'description' => 'Support future development of Cachet.',
-                'status'      => 1,
-                'order'       => 0,
-                'group_id'    => 0,
-                'link'        => 'https://patreon.com/jbrooksuk',
             ],
         ];
 

app/Dates/DateFactory.php

@@ -11,7 +11,6 @@
 
 namespace CachetHQ\Cachet\Dates;
 
-use DateTimeZone;
 use Jenssegers\Date\Date;
 
 class DateFactory
@@ -89,17 +88,4 @@ class DateFactory
     {
         return (new Date($time))->setTimezone($this->cachetTimezone);
     }
-
-    /**
-     * Return the abbreviated timezone.
-     *
-     * @return string
-     */
-    public function getTimezone()
-    {
-        $dateTime = new Date();
-        $dateTime->setTimeZone(new DateTimeZone($this->cachetTimezone));
-
-        return $dateTime->format('T');
-    }
 }

app/Foundation/Providers/AppServiceProvider.php

@@ -14,6 +14,9 @@ namespace CachetHQ\Cachet\Foundation\Providers;
 use AltThree\Bus\Dispatcher;
 use CachetHQ\Cachet\Bus\Middleware\UseDatabaseTransactions;
 use CachetHQ\Cachet\Dates\DateFactory;
+use CachetHQ\Cachet\Integrations\Credits;
+use CachetHQ\Cachet\Integrations\Feed;
+use CachetHQ\Cachet\Integrations\Releases;
 use Illuminate\Support\ServiceProvider;
 use Illuminate\Support\Str;
 
@@ -52,6 +55,9 @@ class AppServiceProvider extends ServiceProvider
     public function register()
     {
         $this->registerDateFactory();
+        $this->registerCredits();
+        $this->registerFeed();
+        $this->registerReleases();
     }
 
     /**
@@ -68,4 +74,47 @@ class AppServiceProvider extends ServiceProvider
             return new DateFactory($appTimezone, $cacheTimezone);
         });
     }
+
+    /**
+     * Register the credits class.
+     *
+     * @return void
+     */
+    protected function registerCredits()
+    {
+        $this->app->singleton(Credits::class, function ($app) {
+            $cache = $app['cache.store'];
+
+            return new Credits($cache);
+        });
+    }
+
+    /**
+     * Register the feed class.
+     *
+     * @return void
+     */
+    protected function registerFeed()
+    {
+        $this->app->singleton(Feed::class, function ($app) {
+            $cache = $app['cache.store'];
+
+            return new Feed($cache);
+        });
+    }
+
+    /**
+     * Register the releases class.
+     *
+     * @return void
+     */
+    protected function registerReleases()
+    {
+        $this->app->singleton(Releases::class, function ($app) {
+            $cache = $app['cache.store'];
+            $token = $app['config']->get('services.github.token');
+
+            return new Releases($cache, $token);
+        });
+    }
 }

app/Foundation/Providers/EventServiceProvider.php

@@ -48,9 +48,6 @@ class EventServiceProvider extends ServiceProvider
         'CachetHQ\Cachet\Bus\Events\Incident\IncidentWasUpdatedEvent' => [
             //
         ],
-        'CachetHQ\Cachet\Bus\Events\Incident\IncidentWasRemovedEvent' => [
-            //
-        ],
         'CachetHQ\Cachet\Bus\Events\Incident\MaintenanceWasScheduledEvent' => [
             'CachetHQ\Cachet\Bus\Handlers\Events\Incident\SendMaintenanceEmailNotificationHandler',
         ],
@@ -93,8 +90,5 @@ class EventServiceProvider extends ServiceProvider
         'CachetHQ\Cachet\Bus\Events\User\UserWasInvitedEvent' => [
             'CachetHQ\Cachet\Bus\Handlers\Events\User\SendInviteUserEmailHandler',
         ],
-        'CachetHQ\Cachet\Bus\Events\User\UserWasRemovedEvent' => [
-            //
-        ],
     ];
 }

app/Foundation/Providers/IntegrationServiceProvider.php

@@ -11,14 +11,8 @@
 
 namespace CachetHQ\Cachet\Foundation\Providers;
 
-use CachetHQ\Cachet\Integrations\Contracts\Credits as CreditsContract;
-use CachetHQ\Cachet\Integrations\Contracts\Feed as FeedContract;
-use CachetHQ\Cachet\Integrations\Contracts\Releases as ReleasesContract;
 use CachetHQ\Cachet\Integrations\Contracts\System as SystemContract;
-use CachetHQ\Cachet\Integrations\Core\Credits;
-use CachetHQ\Cachet\Integrations\Core\Feed;
 use CachetHQ\Cachet\Integrations\Core\System;
-use CachetHQ\Cachet\Integrations\GitHub\Releases;
 use Illuminate\Contracts\Container\Container;
 use Illuminate\Support\ServiceProvider;
 
@@ -36,39 +30,7 @@ class IntegrationServiceProvider extends ServiceProvider
      */
     public function register()
     {
-        $this->registerCredits();
-        $this->registerFeed();
         $this->registerSystem();
-
-        $this->registerReleases();
-    }
-
-    /**
-     * Register the credits class.
-     *
-     * @return void
-     */
-    protected function registerCredits()
-    {
-        $this->app->singleton(CreditsContract::class, function ($app) {
-            $cache = $app['cache.store'];
-
-            return new Credits($cache);
-        });
-    }
-
-    /**
-     * Register the feed class.
-     *
-     * @return void
-     */
-    protected function registerFeed()
-    {
-        $this->app->singleton(FeedContract::class, function ($app) {
-            $cache = $app['cache.store'];
-
-            return new Feed($cache);
-        });
     }
 
     /**
@@ -82,19 +44,4 @@ class IntegrationServiceProvider extends ServiceProvider
             return new System();
         });
     }
-
-    /**
-     * Register the releases class.
-     *
-     * @return void
-     */
-    protected function registerReleases()
-    {
-        $this->app->singleton(ReleasesContract::class, function ($app) {
-            $cache = $app['cache.store'];
-            $token = $app['config']->get('services.github.token');
-
-            return new Releases($cache, $token);
-        });
-    }
 }

app/Http/Controllers/Api/ComponentController.php

@@ -88,7 +88,7 @@ class ComponentController extends AbstractApiController
             $tags = preg_split('/ ?, ?/', Binput::get('tags'));
 
             // For every tag, do we need to create it?
-            $componentTags = array_map(function ($taggable) use ($component) {
+            $componentTags = array_map(function ($taggable) {
                 return Tag::firstOrCreate([
                     'name' => $taggable,
                 ])->id;
@@ -128,7 +128,7 @@ class ComponentController extends AbstractApiController
             $tags = preg_split('/ ?, ?/', Binput::get('tags'));
 
             // For every tag, do we need to create it?
-            $componentTags = array_map(function ($taggable) use ($component) {
+            $componentTags = array_map(function ($taggable) {
                 return Tag::firstOrCreate(['name' => $taggable])->id;
             }, $tags);
 

app/Http/Controllers/Api/GeneralController.php

@@ -11,8 +11,8 @@
 
 namespace CachetHQ\Cachet\Http\Controllers\Api;
 
-use CachetHQ\Cachet\Integrations\Contracts\Releases;
 use CachetHQ\Cachet\Integrations\Contracts\System;
+use CachetHQ\Cachet\Integrations\Releases;
 
 /**
  * This is the general api controller.
@@ -38,7 +38,7 @@ class GeneralController extends AbstractApiController
      */
     public function version()
     {
-        $latest = app()->make(Releases::class)->latest();
+        $latest = app(Releases::class)->latest();
 
         return $this->setMetaData([
             'on_latest' => version_compare(CACHET_VERSION, $latest['tag_name']) === 1,
@@ -55,6 +55,9 @@ class GeneralController extends AbstractApiController
     {
         $system = app()->make(System::class)->getStatus();
 
-        return $this->item($system['system_message']);
+        return $this->item([
+            'status'  => $system['system_status'],
+            'message' => $system['system_message'],
+        ]);
     }
 }

app/Http/Controllers/Api/SubscriberController.php

@@ -17,7 +17,6 @@ use CachetHQ\Cachet\Bus\Commands\Subscriber\UnsubscribeSubscriptionCommand;
 use CachetHQ\Cachet\Models\Subscriber;
 use CachetHQ\Cachet\Models\Subscription;
 use GrahamCampbell\Binput\Facades\Binput;
-use Illuminate\Contracts\Config\Repository;
 use Illuminate\Database\QueryException;
 use Illuminate\Support\Facades\Request;
 use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
@@ -49,10 +48,12 @@ class SubscriberController extends AbstractApiController
      */
     public function postSubscribers()
     {
-        $verified = Binput::get('verify', app(Repository::class)->get('setting.skip_subscriber_verification'));
-
         try {
-            $subscriber = dispatch(new SubscribeSubscriberCommand(Binput::get('email'), $verified, Binput::get('components')));
+            $subscriber = dispatch(new SubscribeSubscriberCommand(
+                Binput::get('email'),
+                Binput::get('verify', false),
+                Binput::get('components', null)
+            ));
         } catch (QueryException $e) {
             throw new BadRequestHttpException();
         }

app/Http/Controllers/Dashboard/ComponentController.php

@@ -148,7 +148,7 @@ class ComponentController extends Controller
         $tags = preg_split('/ ?, ?/', $tags);
 
         // For every tag, do we need to create it?
-        $componentTags = array_map(function ($taggable) use ($component) {
+        $componentTags = array_map(function ($taggable) {
             return Tag::firstOrCreate(['name' => $taggable])->id;
         }, $tags);
 
@@ -201,7 +201,7 @@ class ComponentController extends Controller
         $tags = preg_split('/ ?, ?/', $tags);
 
         // For every tag, do we need to create it?
-        $componentTags = array_map(function ($taggable) use ($component) {
+        $componentTags = array_map(function ($taggable) {
             return Tag::firstOrCreate(['name' => $taggable])->id;
         }, $tags);
 

app/Http/Controllers/Dashboard/DashboardController.php

@@ -11,7 +11,7 @@
 
 namespace CachetHQ\Cachet\Http\Controllers\Dashboard;
 
-use CachetHQ\Cachet\Integrations\Contracts\Feed;
+use CachetHQ\Cachet\Integrations\Feed;
 use CachetHQ\Cachet\Models\Component;
 use CachetHQ\Cachet\Models\ComponentGroup;
 use CachetHQ\Cachet\Models\Incident;
@@ -85,7 +85,9 @@ class DashboardController extends Controller
 
         $entries = null;
         if ($feed = $this->feed->latest()) {
-            $entries = array_slice($feed->channel->item, 0, 5);
+            if (is_object($feed)) {
+                $entries = array_slice($feed->channel->item, 0, 5);
+            }
         }
 
         return View::make('dashboard.index')

app/Http/Controllers/Dashboard/SettingsController.php

@@ -11,7 +11,7 @@
 
 namespace CachetHQ\Cachet\Http\Controllers\Dashboard;
 
-use CachetHQ\Cachet\Integrations\Contracts\Credits;
+use CachetHQ\Cachet\Integrations\Credits;
 use CachetHQ\Cachet\Models\User;
 use CachetHQ\Cachet\Settings\Repository;
 use Exception;
@@ -274,6 +274,14 @@ class SettingsController extends Controller
             }
         }
 
+        if (isset($parameters['stylesheet'])) {
+            if ($stylesheet = Binput::get('stylesheet', null, false, false)) {
+                $setting->set('stylesheet', $stylesheet);
+            } else {
+                $setting->delete('stylesheet');
+            }
+        }
+
         if (Binput::hasFile('app_banner')) {
             $this->handleUpdateBanner($setting);
         }
@@ -284,6 +292,7 @@ class SettingsController extends Controller
             'remove_banner',
             'header',
             'footer',
+            'stylesheet',
         ];
 
         try {

app/Http/Controllers/Dashboard/SubscriberController.php

@@ -16,7 +16,6 @@ use CachetHQ\Cachet\Bus\Commands\Subscriber\SubscribeSubscriberCommand;
 use CachetHQ\Cachet\Bus\Commands\Subscriber\UnsubscribeSubscriberCommand;
 use CachetHQ\Cachet\Models\Subscriber;
 use GrahamCampbell\Binput\Facades\Binput;
-use Illuminate\Contracts\Config\Repository;
 use Illuminate\Routing\Controller;
 use Illuminate\Support\Facades\Redirect;
 use Illuminate\Support\Facades\View;
@@ -53,13 +52,11 @@ class SubscriberController extends Controller
      */
     public function createSubscriberAction()
     {
-        $verified = app(Repository::class)->get('setting.skip_subscriber_verification');
-
         try {
             $subscribers = preg_split("/\r\n|\n|\r/", Binput::get('email'));
 
             foreach ($subscribers as $subscriber) {
-                dispatch(new SubscribeSubscriberCommand($subscriber, $verified));
+                dispatch(new SubscribeSubscriberCommand($subscriber));
             }
         } catch (ValidationException $e) {
             return Redirect::route('dashboard.subscribers.add')

app/Http/Controllers/Dashboard/TeamController.php

@@ -12,8 +12,8 @@
 namespace CachetHQ\Cachet\Http\Controllers\Dashboard;
 
 use AltThree\Validator\ValidationException;
-use CachetHQ\Cachet\Bus\Commands\User\AddUserCommand;
-use CachetHQ\Cachet\Bus\Commands\User\InviteUserCommand;
+use CachetHQ\Cachet\Bus\Commands\User\AddTeamMemberCommand;
+use CachetHQ\Cachet\Bus\Commands\User\InviteTeamMemberCommand;
 use CachetHQ\Cachet\Bus\Commands\User\RemoveUserCommand;
 use CachetHQ\Cachet\Models\User;
 use GrahamCampbell\Binput\Facades\Binput;
@@ -81,7 +81,7 @@ class TeamController extends Controller
     public function postAddUser()
     {
         try {
-            dispatch(new AddUserCommand(
+            dispatch(new AddTeamMemberCommand(
                 Binput::get('username'),
                 Binput::get('password'),
                 Binput::get('email'),
@@ -130,7 +130,7 @@ class TeamController extends Controller
     public function postInviteUser()
     {
         try {
-            dispatch(new InviteUserCommand(
+            dispatch(new InviteTeamMemberCommand(
                 array_unique(array_filter((array) Binput::get('emails')))
             ));
         } catch (ValidationException $e) {

app/Http/Controllers/SetupController.php

@@ -48,11 +48,11 @@ class SetupController extends Controller
      * @var string[]
      */
     protected $mailDrivers = [
-        'smtp'      => 'SMTP',
-        'mail'      => 'Mail',
-        'sendmail'  => 'Sendmail',
-        'mailgun'   => 'Mailgun',
-        'mandrill'  => 'Mandrill',
+        'smtp'     => 'SMTP',
+        'mail'     => 'Mail',
+        'sendmail' => 'Sendmail',
+        'mailgun'  => 'Mailgun',
+        'mandrill' => 'Mandrill',
         // 'ses'       => 'Amazon SES', this will be available only if aws/aws-sdk-php is installed
         'sparkpost' => 'SparkPost',
         'log'       => 'Log (Testing)',
@@ -149,7 +149,7 @@ class SetupController extends Controller
             return $input->mail_driver === 'smtp';
         });
 
-        $v->sometimes(['env.mail_address', 'env.mail_username', 'env.mail_password'], 'required', function ($input) {
+        $v->sometimes(['env.mail_address', 'env.mail_username'], 'required', function ($input) {
             return $input->mail_driver !== 'log';
         });
 
@@ -254,7 +254,9 @@ class SetupController extends Controller
             $envValue = env($envKey) ?: 'null';
 
             file_put_contents($path, str_replace(
-                $envKey.'='.$envValue, $envKey.'='.$value, file_get_contents($path)
+                $envKey.'='.$envValue,
+                $envKey.'='.$value,
+                file_get_contents($path)
             ));
         } catch (InvalidPathException $e) {
             //

app/Http/Controllers/SubscribeController.php

@@ -18,12 +18,10 @@ use CachetHQ\Cachet\Bus\Commands\Subscriber\UnsubscribeSubscriptionCommand;
 use CachetHQ\Cachet\Bus\Commands\Subscriber\UpdateSubscriberSubscriptionCommand;
 use CachetHQ\Cachet\Bus\Commands\Subscriber\VerifySubscriberCommand;
 use CachetHQ\Cachet\Models\Component;
-use CachetHQ\Cachet\Models\ComponentGroup;
 use CachetHQ\Cachet\Models\Subscriber;
 use CachetHQ\Cachet\Models\Subscription;
 use GrahamCampbell\Binput\Facades\Binput;
 use GrahamCampbell\Markdown\Facades\Markdown;
-use Illuminate\Contracts\Config\Repository;
 use Illuminate\Routing\Controller;
 use Illuminate\Support\Facades\Config;
 use Illuminate\Support\Facades\Redirect;
@@ -58,9 +56,10 @@ class SubscribeController extends Controller
     {
         $email = Binput::get('email');
         $subscriptions = Binput::get('subscriptions');
-        $verified = app(Repository::class)->get('setting.skip_subscriber_verification');
 
         try {
+            $verified = false;
+
             $subscription = dispatch(new SubscribeSubscriberCommand($email, $verified));
         } catch (ValidationException $e) {
             return Redirect::route('status-page')
@@ -148,19 +147,15 @@ class SubscribeController extends Controller
         }
 
         $subscriber = Subscriber::where('verify_code', '=', $code)->first();
-        $usedComponentGroups = Component::enabled()->where('group_id', '>', 0)->groupBy('group_id')->pluck('group_id');
-        $componentGroups = ComponentGroup::whereIn('id', $usedComponentGroups)->orderBy('order')->get();
-        $ungroupedComponents = Component::enabled()->where('group_id', 0)->orderBy('order')->orderBy('created_at')->get();
 
         if (!$subscriber) {
             throw new BadRequestHttpException();
         }
 
         return View::make('subscribe.manage')
-            ->withUngroupedComponents($ungroupedComponents)
+            ->withComponents(Component::all())
             ->withSubscriber($subscriber)
-            ->withSubscriptions($subscriber->subscriptions->pluck('component_id')->all())
-            ->withComponentGroups($componentGroups);
+            ->withSubscriptions($subscriber->subscriptions->pluck('component_id')->all());
     }
 
     /**
@@ -185,8 +180,6 @@ class SubscribeController extends Controller
         try {
             dispatch(new UpdateSubscriberSubscriptionCommand($subscriber, Binput::get('subscriptions')));
         } catch (ValidationException $e) {
-            dd($e->getMessageBag());
-
             return Redirect::route('subscribe.manage', $subscriber->verify_code)
                 ->withInput(Binput::all())
                 ->withTitle(sprintf('%s %s', trans('dashboard.notifications.whoops'), trans('cachet.subscriber.email.failure')))

app/Http/Routes/DashboardRoutes.php

@@ -131,7 +131,7 @@ class DashboardRoutes
                     $router->delete('{incident_template}/delete', 'IncidentController@deleteTemplateAction');
                 });
 
-                $router->group(['as'     => 'subscribers.', 'prefix' => 'subscribers'], function (Registrar $router) {
+                $router->group(['as' => 'subscribers.', 'prefix' => 'subscribers'], function (Registrar $router) {
                     $router->get('/', [
                         'as'   => 'index',
                         'uses' => 'SubscriberController@showSubscribers',
@@ -144,7 +144,7 @@ class DashboardRoutes
                     $router->delete('{subscriber}/delete', 'SubscriberController@deleteSubscriberAction');
                 });
 
-                $router->group(['as'  => 'metrics.', 'prefix' => 'metrics'], function (Registrar $router) {
+                $router->group(['as' => 'metrics.', 'prefix' => 'metrics'], function (Registrar $router) {
                     $router->get('/', [
                         'as'   => 'index',
                         'uses' => 'MetricController@showMetrics',

app/Integrations/Contracts/Credits.php

@@ -1,27 +0,0 @@
-<?php
-
-/*
- * This file is part of Cachet.
- *
- * (c) Alt Three Services Limited
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace CachetHQ\Cachet\Integrations\Contracts;
-
-/**
- * This is the credits interface.
- *
- * @author James Brooks <james@alt-three.com>
- */
-interface Credits
-{
-    /**
-     * Returns the latest credits.
-     *
-     * @return array|null
-     */
-    public function latest();
-}

app/Integrations/Contracts/Feed.php

@@ -1,27 +0,0 @@
-<?php
-
-/*
- * This file is part of Cachet.
- *
- * (c) Alt Three Services Limited
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace CachetHQ\Cachet\Integrations\Contracts;
-
-/**
- * This is the feed interface.
- *
- * @author James Brooks <james@alt-three.com>
- */
-interface Feed
-{
-    /**
-     * Returns the latest entries.
-     *
-     * @return array|null
-     */
-    public function latest();
-}

app/Integrations/Contracts/Releases.php

@@ -1,27 +0,0 @@
-<?php
-
-/*
- * This file is part of Cachet.
- *
- * (c) Alt Three Services Limited
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace CachetHQ\Cachet\Integrations\Contracts;
-
-/**
- * This is the releases interface.
- *
- * @author James Brooks <james@alt-three.com>
- */
-interface Releases
-{
-    /**
-     * Returns the latest release.
-     *
-     * @return string
-     */
-    public function latest();
-}

app/Integrations/Credits.php

@@ -9,14 +9,13 @@
  * file that was distributed with this source code.
  */
 
-namespace CachetHQ\Cachet\Integrations\Core;
+namespace CachetHQ\Cachet\Integrations;
 
-use CachetHQ\Cachet\Integrations\Contracts\Credits as CreditsContract;
 use Exception;
 use GuzzleHttp\Client;
 use Illuminate\Contracts\Cache\Repository;
 
-class Credits implements CreditsContract
+class Credits
 {
     /**
      * The default url.

app/Integrations/Feed.php

@@ -9,9 +9,8 @@
  * file that was distributed with this source code.
  */
 
-namespace CachetHQ\Cachet\Integrations\Core;
+namespace CachetHQ\Cachet\Integrations;
 
-use CachetHQ\Cachet\Integrations\Contracts\Feed as FeedContract;
 use Exception;
 use GuzzleHttp\Client;
 use Illuminate\Contracts\Cache\Repository;
@@ -21,7 +20,7 @@ use Illuminate\Contracts\Cache\Repository;
  *
  * @author James Brooks <james@alt-three.com>
  */
-class Feed implements FeedContract
+class Feed
 {
     /**
      * The default url.

app/Integrations/Releases.php

@@ -9,13 +9,12 @@
  * file that was distributed with this source code.
  */
 
-namespace CachetHQ\Cachet\Integrations\GitHub;
+namespace CachetHQ\Cachet\Integrations;
 
-use CachetHQ\Cachet\Integrations\Contracts\Releases as ReleasesContract;
 use GuzzleHttp\Client;
 use Illuminate\Contracts\Cache\Repository;
 
-class Releases implements ReleasesContract
+class Releases
 {
     /**
      * The default url.

app/Models/Component.php

@@ -22,7 +22,10 @@ use McCool\LaravelAutoPresenter\HasPresenter;
 
 class Component extends Model implements HasPresenter
 {
-    use SearchableTrait, SoftDeletes, SortableTrait, ValidatingTrait;
+    use SearchableTrait;
+    use SoftDeletes;
+    use SortableTrait;
+    use ValidatingTrait;
 
     /**
      * List of attributes that have default values.

app/Models/ComponentGroup.php

@@ -20,7 +20,9 @@ use McCool\LaravelAutoPresenter\HasPresenter;
 
 class ComponentGroup extends Model implements HasPresenter
 {
-    use SearchableTrait, SortableTrait, ValidatingTrait;
+    use SearchableTrait;
+    use SortableTrait;
+    use ValidatingTrait;
 
     /**
      * The model's attributes.
@@ -99,7 +101,7 @@ class ComponentGroup extends Model implements HasPresenter
      */
     public function components()
     {
-        return $this->hasMany(Component::class, 'group_id', 'id')->orderBy('order');
+        return $this->hasMany(Component::class, 'group_id', 'id');
     }
 
     /**
@@ -119,7 +121,7 @@ class ComponentGroup extends Model implements HasPresenter
      */
     public function enabled_components()
     {
-        return $this->components()->enabled();
+        return $this->components()->enabled()->orderBy('order');
     }
 
     /**

app/Models/Incident.php

@@ -23,7 +23,10 @@ use McCool\LaravelAutoPresenter\HasPresenter;
 
 class Incident extends Model implements HasPresenter
 {
-    use SearchableTrait, SoftDeletes, SortableTrait, ValidatingTrait;
+    use SearchableTrait;
+    use SoftDeletes;
+    use SortableTrait;
+    use ValidatingTrait;
 
     /**
      * The attributes that should be casted to native types.

app/Models/IncidentTemplate.php

@@ -12,7 +12,6 @@
 namespace CachetHQ\Cachet\Models;
 
 use AltThree\Validator\ValidatingTrait;
-use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Support\Str;
 
@@ -67,7 +66,7 @@ class IncidentTemplate extends Model
      *
      * @return \Illuminate\Database\Query\Builder
      */
-    public function scopeForSlug(Builder $query, $slug)
+    public function scopeForSlug($query, $slug)
     {
         return $query->where('slug', $slug);
     }

app/Models/Metric.php

@@ -20,7 +20,8 @@ use McCool\LaravelAutoPresenter\HasPresenter;
 
 class Metric extends Model implements HasPresenter
 {
-    use SortableTrait, ValidatingTrait;
+    use SortableTrait;
+    use ValidatingTrait;
 
     /**
      * The calculation type of sum.

app/Models/Traits/SearchableTrait.php

@@ -34,10 +34,11 @@ trait SearchableTrait
             return $query;
         }
 
-        if (!array_intersect(array_keys($search), $this->searchable)) {
+        $allowed_search = array_intersect_key($search, array_flip($this->searchable));
+        if (!$allowed_search) {
             return $query;
         }
 
-        return $query->where($search);
+        return $query->where($allowed_search);
     }
 }

app/Models/User.php

@@ -22,7 +22,9 @@ use Illuminate\Support\Facades\Hash;
 
 class User extends Model implements AuthenticatableContract, CanResetPasswordContract
 {
-    use Authenticatable, CanResetPassword, ValidatingTrait;
+    use Authenticatable;
+    use CanResetPassword;
+    use ValidatingTrait;
 
     /**
      * The admin level of user.
@@ -116,7 +118,7 @@ class User extends Model implements AuthenticatableContract, CanResetPasswordCon
      */
     public function getGravatarAttribute($size = 200)
     {
-        return sprintf('https://www.gravatar.com/avatar/%s?size=%d', md5($this->email), $size);
+        return sprintf('https://www.gravatar.com/avatar/%s?size=%d', md5(strtolower($this->email)), $size);
     }
 
     /**

app/Presenters/ComponentGroupPresenter.php

@@ -97,27 +97,4 @@ class ComponentGroupPresenter extends BasePresenter implements Arrayable
             'lowest_human_status' => $this->lowest_human_status(),
         ]);
     }
-
-    /**
-     * Determine if any of the contained components have active subscriptions.
-     *
-     * @return bool
-     */
-    public function has_subscriber($subscriptions)
-    {
-        $enabled_components = $this->wrappedObject->enabled_components()->orderBy('order')->pluck('id')->toArray();
-        $intersected = array_intersect($enabled_components, $subscriptions);
-
-        return count($intersected) != 0;
-    }
-
-    /**
-     * Determine the class for collapsed/uncollapsed groups on the subscription form.
-     *
-     * @return string
-     */
-    public function collapse_class_with_subscriptions($subscriptions)
-    {
-        return $this->has_subscriber($subscriptions) ? 'ion-ios-minus-outline' : 'ion-ios-plus-outline';
-    }
 }

app/Repositories/Metric/AbstractMetricRepository.php

@@ -47,6 +47,20 @@ abstract class AbstractMetricRepository
         $this->config = $config;
     }
 
+    /**
+     * Get the table names prefix.
+     *
+     * @return string
+     */
+    protected function getPrefix()
+    {
+        $driver = $this->config->get('database.default');
+        $connection = $this->config->get('database.connections.'.$driver);
+        $prefix = $connection['prefix'];
+
+        return $prefix;
+    }
+
     /**
      * Get the metrics table name.
      *
@@ -54,10 +68,20 @@ abstract class AbstractMetricRepository
      */
     protected function getTableName()
     {
-        $driver = $this->config->get('database.default');
-        $connection = $this->config->get('database.connections.'.$driver);
-        $prefix = $connection['prefix'];
+        $prefix = $this->getPrefix();
 
         return $prefix.'metrics';
     }
+
+    /**
+     * Get the metric points table name.
+     *
+     * @return string
+     */
+    protected function getMetricPointsTableName()
+    {
+        $prefix = $this->getPrefix();
+
+        return $prefix.'metric_points';
+    }
 }

app/Repositories/Metric/MySqlRepository.php

@@ -36,6 +36,7 @@ class MySqlRepository extends AbstractMetricRepository implements MetricInterfac
     {
         $dateTime = (new Date())->sub(new DateInterval('PT'.$hour.'H'))->sub(new DateInterval('PT'.$minute.'M'));
         $timeInterval = $dateTime->format('YmdHi');
+        $metricPointsTableName = $this->getMetricPointsTableName();
 
         if (!isset($metric->calc_type) || $metric->calc_type == Metric::CALC_SUM) {
             $queryType = 'SUM(mp.`value` * mp.`counter`) AS `value`';
@@ -45,7 +46,7 @@ class MySqlRepository extends AbstractMetricRepository implements MetricInterfac
 
         $value = 0;
 
-        $points = DB::select("SELECT {$queryType} FROM {$this->getTableName()} m INNER JOIN metric_points mp ON m.id = mp.metric_id WHERE m.id = :metricId AND DATE_FORMAT(mp.`created_at`, '%Y%m%d%H%i') = :timeInterval GROUP BY HOUR(mp.`created_at`), MINUTE(mp.`created_at`)", [
+        $points = DB::select("SELECT {$queryType} FROM {$this->getTableName()} m INNER JOIN $metricPointsTableName mp ON m.id = mp.metric_id WHERE m.id = :metricId AND DATE_FORMAT(mp.`created_at`, '%Y%m%d%H%i') = :timeInterval GROUP BY HOUR(mp.`created_at`), MINUTE(mp.`created_at`)", [
             'metricId'     => $metric->id,
             'timeInterval' => $timeInterval,
         ]);
@@ -73,6 +74,7 @@ class MySqlRepository extends AbstractMetricRepository implements MetricInterfac
     {
         $dateTime = (new Date())->sub(new DateInterval('PT'.$hour.'H'));
         $hourInterval = $dateTime->format('YmdH');
+        $metricPointsTableName = $this->getMetricPointsTableName();
 
         if (!isset($metric->calc_type) || $metric->calc_type == Metric::CALC_SUM) {
             $queryType = 'SUM(mp.`value` * mp.`counter`) AS `value`';
@@ -82,7 +84,7 @@ class MySqlRepository extends AbstractMetricRepository implements MetricInterfac
 
         $value = 0;
 
-        $points = DB::select("SELECT {$queryType} FROM {$this->getTableName()} m INNER JOIN metric_points mp ON m.id = mp.metric_id WHERE m.id = :metricId AND DATE_FORMAT(mp.`created_at`, '%Y%m%d%H') = :hourInterval GROUP BY HOUR(mp.`created_at`)", [
+        $points = DB::select("SELECT {$queryType} FROM {$this->getTableName()} m INNER JOIN $metricPointsTableName mp ON m.id = mp.metric_id WHERE m.id = :metricId AND DATE_FORMAT(mp.`created_at`, '%Y%m%d%H') = :hourInterval GROUP BY HOUR(mp.`created_at`)", [
             'metricId'     => $metric->id,
             'hourInterval' => $hourInterval,
         ]);
@@ -108,6 +110,7 @@ class MySqlRepository extends AbstractMetricRepository implements MetricInterfac
     public function getPointsForDayInWeek(Metric $metric, $day)
     {
         $dateTime = (new Date())->sub(new DateInterval('P'.$day.'D'));
+        $metricPointsTableName = $this->getMetricPointsTableName();
 
         if (!isset($metric->calc_type) || $metric->calc_type == Metric::CALC_SUM) {
             $queryType = 'SUM(mp.`value` * mp.`counter`) AS `value`';
@@ -117,7 +120,7 @@ class MySqlRepository extends AbstractMetricRepository implements MetricInterfac
 
         $value = 0;
 
-        $points = DB::select("SELECT {$queryType} FROM {$this->getTableName()} m INNER JOIN metric_points mp ON m.id = mp.metric_id WHERE m.id = :metricId AND mp.`created_at` BETWEEN DATE_SUB(mp.`created_at`, INTERVAL 1 WEEK) AND DATE_ADD(NOW(), INTERVAL 1 DAY) AND DATE_FORMAT(mp.`created_at`, '%Y%m%d') = :timeInterval GROUP BY DATE_FORMAT(mp.`created_at`, '%Y%m%d')", [
+        $points = DB::select("SELECT {$queryType} FROM {$this->getTableName()} m INNER JOIN $metricPointsTableName mp ON m.id = mp.metric_id WHERE m.id = :metricId AND mp.`created_at` BETWEEN DATE_SUB(mp.`created_at`, INTERVAL 1 WEEK) AND DATE_ADD(NOW(), INTERVAL 1 DAY) AND DATE_FORMAT(mp.`created_at`, '%Y%m%d') = :timeInterval GROUP BY DATE_FORMAT(mp.`created_at`, '%Y%m%d')", [
             'metricId'     => $metric->id,
             'timeInterval' => $dateTime->format('Ymd'),
         ]);

app/Repositories/Metric/PgSqlRepository.php

@@ -34,19 +34,20 @@ class PgSqlRepository extends AbstractMetricRepository implements MetricInterfac
      */
     public function getPointsLastHour(Metric $metric, $hour, $minute)
     {
+        $metricPointsTableName = $this->getMetricPointsTableName();
         $dateTime = (new Date())->sub(new DateInterval('PT'.$hour.'H'))->sub(new DateInterval('PT'.$minute.'M'));
 
         // Default metrics calculations.
         if (!isset($metric->calc_type) || $metric->calc_type == Metric::CALC_SUM) {
-            $queryType = 'sum(metric_points.value * metric_points.counter)';
+            $queryType = "sum($metricPointsTableName.value * $metricPointsTableName.counter)";
         } elseif ($metric->calc_type == Metric::CALC_AVG) {
-            $queryType = 'avg(metric_points.value * metric_points.counter)';
+            $queryType = "avg($metricPointsTableName.value * $metricPointsTableName.counter)";
         } else {
-            $queryType = 'sum(metric_points.value * metric_points.counter)';
+            $queryType = "sum($metricPointsTableName.value * $metricPointsTableName.counter)";
         }
 
         $value = 0;
-        $query = DB::select("select {$queryType} as value FROM {$this->getTableName()} m JOIN metric_points ON metric_points.metric_id = m.id WHERE m.id = :metricId AND to_char(metric_points.created_at, 'YYYYMMDDHH24MI') = :timeInterval GROUP BY to_char(metric_points.created_at, 'HHMI')", [
+        $query = DB::select("select {$queryType} as value FROM {$this->getTableName()} m JOIN $metricPointsTableName ON $metricPointsTableName.metric_id = m.id WHERE m.id = :metricId AND to_char($metricPointsTableName.created_at, 'YYYYMMDDHH24MI') = :timeInterval GROUP BY to_char($metricPointsTableName.created_at, 'HHMI')", [
             'metricId'     => $metric->id,
             'timeInterval' => $dateTime->format('YmdHi'),
         ]);
@@ -73,18 +74,19 @@ class PgSqlRepository extends AbstractMetricRepository implements MetricInterfac
     public function getPointsByHour(Metric $metric, $hour)
     {
         $dateTime = (new Date())->sub(new DateInterval('PT'.$hour.'H'));
+        $metricPointsTableName = $this->getMetricPointsTableName();
 
         // Default metrics calculations.
         if (!isset($metric->calc_type) || $metric->calc_type == Metric::CALC_SUM) {
-            $queryType = 'sum(metric_points.value * metric_points.counter)';
+            $queryType = "sum($metricPointsTableName.value * $metricPointsTableName.counter)";
         } elseif ($metric->calc_type == Metric::CALC_AVG) {
-            $queryType = 'avg(metric_points.value * metric_points.counter)';
+            $queryType = "avg($metricPointsTableName.value * $metricPointsTableName.counter)";
         } else {
-            $queryType = 'sum(metric_points.value * metric_points.counter)';
+            $queryType = "sum($metricPointsTableName.value * $metricPointsTableName.counter)";
         }
 
         $value = 0;
-        $query = DB::select("select {$queryType} as value FROM {$this->getTableName()} m JOIN metric_points ON metric_points.metric_id = m.id WHERE metric_points.metric_id = :metricId AND to_char(metric_points.created_at, 'YYYYMMDDHH24') = :timeInterval GROUP BY to_char(metric_points.created_at, 'H')", [
+        $query = DB::select("select {$queryType} as value FROM {$this->getTableName()} m JOIN $metricPointsTableName ON $metricPointsTableName.metric_id = m.id WHERE $metricPointsTableName.metric_id = :metricId AND to_char($metricPointsTableName.created_at, 'YYYYMMDDHH24') = :timeInterval GROUP BY to_char($metricPointsTableName.created_at, 'H')", [
             'metricId'     => $metric->id,
             'timeInterval' => $dateTime->format('YmdH'),
         ]);
@@ -110,6 +112,7 @@ class PgSqlRepository extends AbstractMetricRepository implements MetricInterfac
     public function getPointsForDayInWeek(Metric $metric, $day)
     {
         $dateTime = (new Date())->sub(new DateInterval('P'.$day.'D'));
+        $metricPointsTableName = $this->getMetricPointsTableName();
 
         if (!isset($metric->calc_type) || $metric->calc_type == Metric::CALC_SUM) {
             $queryType = 'sum(mp.value * mp.counter) AS value';
@@ -118,7 +121,7 @@ class PgSqlRepository extends AbstractMetricRepository implements MetricInterfac
         }
 
         $value = 0;
-        $points = DB::select("SELECT {$queryType} FROM {$this->getTableName()} m INNER JOIN metric_points mp ON m.id = mp.metric_id WHERE m.id = :metricId AND mp.created_at BETWEEN (mp.created_at - interval '1 week') AND (now() + interval '1 day') AND to_char(mp.created_at, 'YYYYMMDD') = :timeInterval GROUP BY to_char(mp.created_at, 'YYYYMMDD')", [
+        $points = DB::select("SELECT {$queryType} FROM {$this->getTableName()} m INNER JOIN $metricPointsTableName mp ON m.id = mp.metric_id WHERE m.id = :metricId AND mp.created_at BETWEEN (mp.created_at - interval '1 week') AND (now() + interval '1 day') AND to_char(mp.created_at, 'YYYYMMDD') = :timeInterval GROUP BY to_char(mp.created_at, 'YYYYMMDD')", [
             'metricId'     => $metric->id,
             'timeInterval' => $dateTime->format('Ymd'),
         ]);

app/Repositories/Metric/SqliteRepository.php

@@ -30,18 +30,19 @@ class SqliteRepository extends AbstractMetricRepository implements MetricInterfa
     public function getPointsLastHour(Metric $metric, $hour, $minute)
     {
         $dateTime = (new Date())->sub(new DateInterval('PT'.$hour.'H'))->sub(new DateInterval('PT'.$minute.'M'));
+        $metricPointsTableName = $this->getMetricPointsTableName();
 
         // Default metrics calculations.
         if (!isset($metric->calc_type) || $metric->calc_type == Metric::CALC_SUM) {
-            $queryType = 'sum(metric_points.value * metric_points.counter)';
+            $queryType = "sum($metricPointsTableName.value * $metricPointsTableName.counter)";
         } elseif ($metric->calc_type == Metric::CALC_AVG) {
-            $queryType = 'avg(metric_points.value * metric_points.counter)';
+            $queryType = "avg($metricPointsTableName.value * $metricPointsTableName.counter)";
         } else {
-            $queryType = 'sum(metric_points.value * metric_points.counter)';
+            $queryType = "sum($metricPointsTableName.value * $metricPointsTableName.counter)";
         }
 
         $value = 0;
-        $query = DB::select("select {$queryType} as value FROM {$this->getTableName()} m JOIN metric_points ON metric_points.metric_id = m.id WHERE m.id = :metricId AND strftime('%Y%m%d%H%M', metric_points.created_at) = :timeInterval GROUP BY strftime('%H%M', metric_points.created_at)", [
+        $query = DB::select("select {$queryType} as value FROM {$this->getTableName()} m JOIN $metricPointsTableName ON $metricPointsTableName.metric_id = m.id WHERE m.id = :metricId AND strftime('%Y%m%d%H%M', $metricPointsTableName.created_at) = :timeInterval GROUP BY strftime('%H%M', $metricPointsTableName.created_at)", [
             'metricId'     => $metric->id,
             'timeInterval' => $dateTime->format('YmdHi'),
         ]);
@@ -68,18 +69,19 @@ class SqliteRepository extends AbstractMetricRepository implements MetricInterfa
     public function getPointsByHour(Metric $metric, $hour)
     {
         $dateTime = (new Date())->sub(new DateInterval('PT'.$hour.'H'));
+        $metricPointsTableName = $this->getMetricPointsTableName();
 
         // Default metrics calculations.
         if (!isset($metric->calc_type) || $metric->calc_type == Metric::CALC_SUM) {
-            $queryType = 'sum(metric_points.value * metric_points.counter)';
+            $queryType = "sum($metricPointsTableName.value * $metricPointsTableName.counter)";
         } elseif ($metric->calc_type == Metric::CALC_AVG) {
-            $queryType = 'avg(metric_points.value * metric_points.counter)';
+            $queryType = "avg($metricPointsTableName.value * $metricPointsTableName.counter)";
         } else {
-            $queryType = 'sum(metric_points.value * metric_points.counter)';
+            $queryType = "sum($metricPointsTableName.value * $metricPointsTableName.counter)";
         }
 
         $value = 0;
-        $query = DB::select("select {$queryType} as value FROM {$this->getTableName()} m JOIN metric_points ON metric_points.metric_id = m.id WHERE m.id = :metricId AND strftime('%Y%m%d%H', metric_points.created_at) = :timeInterval GROUP BY strftime('%H', metric_points.created_at)", [
+        $query = DB::select("select {$queryType} as value FROM {$this->getTableName()} m JOIN $metricPointsTableName ON $metricPointsTableName.metric_id = m.id WHERE m.id = :metricId AND strftime('%Y%m%d%H', $metricPointsTableName.created_at) = :timeInterval GROUP BY strftime('%H', $metricPointsTableName.created_at)", [
             'metricId'     => $metric->id,
             'timeInterval' => $dateTime->format('YmdH'),
         ]);
@@ -105,18 +107,19 @@ class SqliteRepository extends AbstractMetricRepository implements MetricInterfa
     public function getPointsForDayInWeek(Metric $metric, $day)
     {
         $dateTime = (new Date())->sub(new DateInterval('P'.$day.'D'));
+        $metricPointsTableName = $this->getMetricPointsTableName();
 
         // Default metrics calculations.
         if (!isset($metric->calc_type) || $metric->calc_type == Metric::CALC_SUM) {
-            $queryType = 'sum(metric_points.value * metric_points.counter)';
+            $queryType = "sum($metricPointsTableName.value * $metricPointsTableName.counter)";
         } elseif ($metric->calc_type == Metric::CALC_AVG) {
-            $queryType = 'avg(metric_points.value * metric_points.counter)';
+            $queryType = "avg($metricPointsTableName.value * $metricPointsTableName.counter)";
         } else {
-            $queryType = 'sum(metric_points.value * metric_points.counter)';
+            $queryType = "sum($metricPointsTableName.value * $metricPointsTableName.counter)";
         }
 
         $value = 0;
-        $query = DB::select("select {$queryType} as value FROM {$this->getTableName()} m JOIN metric_points ON metric_points.metric_id = m.id WHERE m.id = :metricId AND metric_points.created_at > date('now', '-7 day') AND strftime('%Y%m%d', metric_points.created_at) = :timeInterval GROUP BY strftime('%Y%m%d', metric_points.created_at)", [
+        $query = DB::select("select {$queryType} as value FROM {$this->getTableName()} m JOIN $metricPointsTableName ON $metricPointsTableName.metric_id = m.id WHERE m.id = :metricId AND $metricPointsTableName.created_at > date('now', '-7 day') AND strftime('%Y%m%d', $metricPointsTableName.created_at) = :timeInterval GROUP BY strftime('%Y%m%d', $metricPointsTableName.created_at)", [
             'metricId'     => $metric->id,
             'timeInterval' => $dateTime->format('Ymd'),
         ]);

app/Subscribers/CommandSubscriber.php

@@ -83,6 +83,13 @@ class CommandSubscriber
 
         $command->line('Settings cache cleared!');
 
+        // SQLite does not backup.
+        if ($this->config->get('database.default') === 'sqlite') {
+            $command->line('Backup skipped: SQLite is not supported.');
+
+            return;
+        }
+
         $command->line('Backing up database...');
 
         try {

app/helpers.php

@@ -14,7 +14,6 @@ use Illuminate\Support\Facades\Request;
 use Jenssegers\Date\Date;
 
 if (!function_exists('set_active')) {
-
     /**
      * Set active class if request is in path.
      *

composer.json

@@ -20,26 +20,29 @@
     ],
     "require": {
         "php": ">=5.5.9",
-        "laravel/framework": "5.2.39",
+        "ext-xml": "*",
         "alt-three/badger": "^3.1",
         "alt-three/bus": "^1.1",
         "alt-three/emoji": "^3.1",
         "alt-three/throttle": "^1.0",
         "alt-three/validator": "^1.5",
         "aws/aws-sdk-php": "^3.7",
-        "backup-manager/laravel": "^1.1",
+        "backup-manager/laravel": "dev-master#df53f9c9d8c6be5d7a2638f45d54b8fb7bc51e2b",
         "barryvdh/laravel-cors": "^0.8",
         "doctrine/dbal": "^2.5",
         "fedeisas/laravel-mail-css-inliner": "^1.5",
         "fideloper/proxy": "^3.1",
         "graham-campbell/binput": "^3.4",
         "graham-campbell/core": "^5.1",
-        "graham-campbell/exceptions": "^8.6",
+        "graham-campbell/exceptions": "^9.4",
         "graham-campbell/markdown": "^6.1",
-        "guzzlehttp/guzzle": "^6.2.1",
+        "guzzlehttp/guzzle": "6.3.3",
+        "guzzlehttp/psr7": "1.4.2",
         "jenssegers/date": "^3.2",
+        "laravel/framework": "5.2.39",
         "mccool/laravel-auto-presenter": "^4.3",
         "pragmarx/google2fa": "^0.7.1",
+        "predis/predis": "^1.1",
         "rcrowe/twigbridge": "^0.9.2",
         "roumen/feed": "^2.10.4"
     },
@@ -48,7 +51,7 @@
         "filp/whoops": "^2.1",
         "fzaninotto/faker": "^1.6",
         "graham-campbell/testbench-core": "^1.1",
-        "mockery/mockery": "0.9.5",
+        "mockery/mockery": "0.9.9",
         "phpunit/phpunit": "4.8.21",
         "symfony/css-selector": "^3.0",
         "symfony/dom-crawler": "^3.0"
@@ -98,7 +101,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "2.5-dev"
+            "dev-master": "2.3-dev"
         }
     },
     "minimum-stability": "dev",

config/app.php

@@ -234,8 +234,8 @@ return [
         'Validator' => 'Illuminate\Support\Facades\Validator',
         'View'      => 'Illuminate\Support\Facades\View',
 
-        'Binput'    => 'GrahamCampbell\Binput\Facades\Binput',
-        'Str'       => 'Illuminate\Support\Str',
+        'Binput' => 'GrahamCampbell\Binput\Facades\Binput',
+        'Str'    => 'Illuminate\Support\Str',
 
     ],
 

config/database.php

@@ -76,25 +76,25 @@ return [
         ],
 
         'pgsql' => [
-            'driver'    => 'pgsql',
-            'host'      => env('DB_HOST', null),
-            'database'  => env('DB_DATABASE', null),
-            'username'  => env('DB_USERNAME', null),
-            'password'  => env('DB_PASSWORD', null),
-            'port'      => env('DB_PORT', '5432'),
-            'charset'   => 'utf8',
-            'prefix'    => env('DB_PREFIX', null),
-            'schema'    => env('DB_SCHEMA', 'public'),
+            'driver'   => 'pgsql',
+            'host'     => env('DB_HOST', null),
+            'database' => env('DB_DATABASE', null),
+            'username' => env('DB_USERNAME', null),
+            'password' => env('DB_PASSWORD', null),
+            'port'     => env('DB_PORT', '5432'),
+            'charset'  => 'utf8',
+            'prefix'   => env('DB_PREFIX', null),
+            'schema'   => env('DB_SCHEMA', 'public'),
         ],
 
         'sqlsrv' => [
-            'driver'    => 'sqlsrv',
-            'host'      => env('DB_HOST', null),
-            'database'  => env('DB_DATABASE', null),
-            'username'  => env('DB_USERNAME', null),
-            'password'  => env('DB_PASSWORD', null),
-            'port'      => env('DB_PORT', null),
-            'prefix'    => env('DB_PREFIX', null),
+            'driver'   => 'sqlsrv',
+            'host'     => env('DB_HOST', null),
+            'database' => env('DB_DATABASE', null),
+            'username' => env('DB_USERNAME', null),
+            'password' => env('DB_PASSWORD', null),
+            'port'     => env('DB_PORT', null),
+            'prefix'   => env('DB_PREFIX', null),
         ],
 
     ],

config/langs.php

@@ -11,35 +11,35 @@
 
 return [
     // Enabled langs
-    'af'    => [
+    'af' => [
         'name'   => 'Afrikaans',
         'subset' => 'latin',
     ],
-    'ar'    => [
+    'ar' => [
         'name'   => 'Arabic',
         'subset' => 'latin',
     ],
-    'ca'    => [
+    'ca' => [
         'name'   => 'Catalan',
         'subset' => 'latin',
     ],
-    'cs'    => [
+    'cs' => [
         'name'   => 'Czech',
         'subset' => 'latin,latin-ext',
     ],
-    'da'    => [
+    'da' => [
         'name'   => 'Danish',
         'subset' => 'latin,latin-ext',
     ],
-    'de'    => [
+    'de' => [
         'name'   => 'Deutsch',
         'subset' => 'latin,latin-ext',
     ],
-    'el'    => [
+    'el' => [
         'name'   => 'Greek',
         'subset' => 'greek,greek-ext',
     ],
-    'en'    => [
+    'en' => [
         'name'   => 'English',
         'subset' => 'latin',
     ],
@@ -47,55 +47,55 @@ return [
         'name'   => 'CrowdIn - InContext Localization',
         'subset' => 'latin',
     ],
-    'es'    => [
+    'es' => [
         'name'   => 'Español',
         'subset' => 'latin,latin-ext',
     ],
-    'fa'    => [
+    'fa' => [
         'name'   => 'Persian',
         'subset' => 'latin',
     ],
-    'fi'    => [
+    'fi' => [
         'name'   => 'Finnish',
         'subset' => 'latin,latin-ext',
     ],
-    'fr'    => [
+    'fr' => [
         'name'   => 'Français',
         'subset' => 'latin,latin-ext',
     ],
-    'he'    => [
+    'he' => [
         'name'   => 'Hebrew',
         'subset' => 'latin',
     ],
-    'hu'    => [
+    'hu' => [
         'name'   => 'Hungarian',
         'subset' => 'latin,latin-ext',
     ],
-    'id'    => [
+    'id' => [
         'name'   => 'Indonesian',
         'subset' => 'latin',
     ],
-    'it'    => [
+    'it' => [
         'name'   => 'Italiano',
         'subset' => 'latin,latin-ext',
     ],
-    'ja'    => [
+    'ja' => [
         'name'   => 'Japanese',
         'subset' => 'latin',
     ],
-    'ko'    => [
+    'ko' => [
         'name'   => '한글',
         'subset' => 'latin',
     ],
-    'nl'    => [
+    'nl' => [
         'name'   => 'Nederlands',
         'subset' => 'latin,latin-ext',
     ],
-    'no'    => [
+    'no' => [
         'name'   => 'Norwegian',
         'subset' => 'latin,latin-ext',
     ],
-    'pl'    => [
+    'pl' => [
         'name'   => 'Polski',
         'subset' => 'latin,latin-ext',
     ],
@@ -107,19 +107,19 @@ return [
         'name'   => 'Portuguese, Portugal',
         'subset' => 'latin,latin-ext',
     ],
-    'ro'    => [
+    'ro' => [
         'name'   => 'Romanian',
         'subset' => 'latin,latin-ext',
     ],
-    'ru'    => [
+    'ru' => [
         'name'   => 'Русский',
         'subset' => 'latin,cyrillic',
     ],
-    'sq'    => [
+    'sq' => [
         'name'   => 'Albanian',
         'subset' => 'latin,latin-ext',
     ],
-    'sr'    => [
+    'sr' => [
         'name'   => 'Sebrian (Cyrillic)',
         'subset' => 'latin,cyrillic,cyrillic-ext',
     ],
@@ -127,15 +127,15 @@ return [
         'name'   => 'Swedish',
         'subset' => 'latin,latin-ext',
     ],
-    'tr'    => [
+    'tr' => [
         'name'   => 'Turkish',
         'subset' => 'latin,latin-ext',
     ],
-    'uk'    => [
+    'uk' => [
         'name'   => 'Ukranian',
         'subset' => 'latin,cyrillic-ext',
     ],
-    'vi'    => [
+    'vi' => [
         'name'   => 'Vietnamese',
         'subset' => 'latin,vietnamese',
     ],

config/services.php

@@ -23,27 +23,27 @@ return [
     |
     */
 
-   'github' => [
+    'github' => [
         'token' => env('GITHUB_TOKEN'),
     ],
 
-    'mailgun' => [
-        'domain' => env('MAIL_USERNAME'),
-        'secret' => env('MAIL_PASSWORD'),
-    ],
+     'mailgun' => [
+         'domain' => env('MAIL_USERNAME'),
+         'secret' => env('MAIL_PASSWORD'),
+     ],
 
-    'mandrill' => [
-        'secret' => env('MAIL_PASSWORD'),
-    ],
+     'mandrill' => [
+         'secret' => env('MAIL_PASSWORD'),
+     ],
 
-    'ses' => [
-        'key'    => env('MAIL_USERNAME'),
-        'secret' => env('MAIL_PASSWORD'),
-        'region' => 'us-east-1',
-    ],
+     'ses' => [
+         'key'    => env('MAIL_USERNAME'),
+         'secret' => env('MAIL_PASSWORD'),
+         'region' => 'us-east-1',
+     ],
 
-    'sparkpost' => [
-        'secret' => env('MAIL_PASSWORD'),
-    ],
+     'sparkpost' => [
+         'secret' => env('MAIL_PASSWORD'),
+     ],
 
 ];

config/setting.php

@@ -43,7 +43,7 @@ return [
     |
     */
 
-   'automatic_localization' => false,
+    'automatic_localization' => false,
 
     /*
     |--------------------------------------------------------------------------
@@ -56,36 +56,4 @@ return [
 
     'show_support' => true,
 
-    /*
-     |--------------------------------------------------------------------------
-     | Enable External Dependencies
-     |--------------------------------------------------------------------------
-     |
-     | Whether to disable third-party dependencies.
-     |
-     */
-
-    'enable_external_dependencies' => true,
-
-   /*
-    |--------------------------------------------------------------------------
-    | Show the timezone
-    |--------------------------------------------------------------------------
-    |
-    | Whether to show the status page timezone in the footer.
-    |
-    */
-
-    'show_timezone' => false,
-
-   /*
-    |--------------------------------------------------------------------------
-    | Skip subscriber verifications
-    |--------------------------------------------------------------------------
-    |
-    | Whether to allow skipping of subscriber verifications.
-    |
-    */
-
-    'skip_subscriber_verification' => false,
 ];

config/trustedproxy.php

@@ -28,26 +28,27 @@ return [
     */
 
     'proxies' => [
+        '173.245.48.0/20',
         '103.21.244.0/22',
         '103.22.200.0/22',
         '103.31.4.0/22',
-        '104.16.0.0/12',
-        '108.162.192.0/18',
-        '131.0.72.0/22',
         '141.101.64.0/18',
-        '162.158.0.0/15',
-        '172.64.0.0/13',
-        '173.245.48.0/20',
-        '188.114.96.0/20',
+        '108.162.192.0/18',
         '190.93.240.0/20',
+        '188.114.96.0/20',
         '197.234.240.0/22',
         '198.41.128.0/17',
-        '199.27.128.0/21',
+        '162.158.0.0/15',
+        '104.16.0.0/12',
+        '172.64.0.0/13',
+        '131.0.72.0/22',
         '2400:cb00::/32',
-        '2405:8100::/32',
-        '2405:b500::/32',
         '2606:4700::/32',
         '2803:f800::/32',
+        '2405:b500::/32',
+        '2405:8100::/32',
+        '2a06:98c0::/29',
+        '2c0f:f248::/32',
     ],
 
     /*

crowdin.yml

@@ -0,0 +1,10 @@
+files:
+  -
+    source: '/resources/lang/en/*.php'
+    translation: '/resources/lang/%locale%/%original_file_name%'
+    languages_mapping:
+      locale:
+        'en-ES': 'es'
+        'fa-IR': 'fa'
+        'ko-KR': 'kr'
+        'de-DE': 'de'

gulpfile.js

@@ -1,5 +1,8 @@
 var elixir = require('laravel-elixir');
 
+elixir.config.production = true;
+elixir.config.sourcemaps = false;
+
 elixir(function (mix) {
     mix
         .sass('app.scss', 'public/dist/css/app.css')

phpunit.xml.dist

@@ -27,7 +27,6 @@
     </filter>
     <php>
         <env name="APP_ENV" value="testing"/>
-        <env name="APP_DEBUG" value="true"/>
         <env name="APP_URL" value="http://localhost"/>
         <env name="APP_KEY" value="GCvcgDKMRIN498g52zfVEd9CxDs6PR7q"/>
         <env name="DB_DRIVER" value="sqlite"/>

public/build/rev-manifest.json

@@ -1,4 +1,4 @@
 {
   "dist/css/all.css": "dist/css/all-2812406e36.css",
-  "dist/js/all.js": "dist/js/all-b2c62d4294.js"
-}
+  "dist/js/all.js": "dist/js/all-83303e6904.js"
+}

resources/assets/js/app.js

@@ -277,24 +277,6 @@ $(function() {
         $this.next('.group-items').toggleClass('hide');
     });
 
-    $('.select-group').on('click', function () {
-        var $parentGroup = $(this).closest('ul.list-group');
-        $parentGroup.find('input[type=checkbox]').prop('checked', true);
-        $parentGroup.find('.group-items').removeClass('hide')
-        $parentGroup.find('.group-toggle').addClass('ion-ios-minus-outline').removeClass('ion-ios-plus-outline');
-        event.stopPropagation();
-        return false;
-    });
-
-    $('.deselect-group').on('click', function () {
-        var $parentGroup = $(this).closest('ul.list-group');
-        $parentGroup.find('input[type=checkbox]').prop('checked', false);
-        $parentGroup.find('.group-items').addClass('hide');
-        $parentGroup.find('.group-toggle').removeClass('ion-ios-minus-outline').addClass('ion-ios-plus-outline');
-        event.stopPropagation();
-        return false;
-    });
-
     // Setup wizard
     $('.wizard-next').on('click', function () {
         var $form   = $('#setup-form'),
@@ -307,6 +289,8 @@ $(function() {
         // Only validate going forward. If current group is invalid, do not go further
         if (next > current) {
             var url = '/setup/step' + current;
+            var currentUrl = window.location.href.replace(/step\d/, '');
+            var url = currentUrl + '/step' + current;
             $.post(url, $form.serializeObject())
                 .done(function(response) {
                     goToStep(current, next);

resources/assets/sass/modules/_variables.scss

@@ -15,7 +15,7 @@ $tooltip-bg:                #333 !default;
 $tooltip-opacity:           .9 !default;
 $base-background-color:     #f1f1f1;
 
-$base-font-family:          -apple-system, BlinkMacSystemFont, "Open Sans", "Helvetica Neue", "Helvetica", "Arial", sans-serif;
+$base-font-family:          "Open Sans", "Helvetica Neue", "Helvetica", "Arial", sans-serif;
 $base-font-weight:          400;
 $base-letter-spacing:       0.08em;
 $base-font-size:            15px;

resources/lang/af-ZA/cachet.php

@@ -0,0 +1,144 @@
+<?php
+
+/*
+ * This file is part of Cachet.
+ *
+ * (c) Alt Three Services Limited
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+return [
+    // Components
+    'components' => [
+        'last_updated' => 'Last updated :timestamp',
+        'status'       => [
+            1 => 'Operasioneel',
+            2 => 'Prestasieprobleme',
+            3 => 'Gedeeltelike Onderbreking',
+            4 => 'Groot Onderbreking',
+        ],
+        'group' => [
+            'other' => 'Other Components',
+        ],
+    ],
+
+    // Incidents
+    'incidents' => [
+        'none'          => 'No incidents reported',
+        'past'          => 'Past Incidents',
+        'previous_week' => 'Vorige Week',
+        'next_week'     => 'Volgende Week',
+        'scheduled'     => 'Scheduled Maintenance',
+        'scheduled_at'  => ', scheduled :timestamp',
+        'status'        => [
+            0 => 'Geskeduleerd', // TODO: Hopefully remove this.
+            1 => 'Investigating',
+            2 => 'Identified',
+            3 => 'Hou Dop',
+            4 => 'Opgelos',
+        ],
+    ],
+
+    // Service Status
+    'service' => [
+        'good'  => '[0,1] System operational|[2,Inf] All systems are operational',
+        'bad'   => '[0,1] The system is currently experiencing issues|[2,Inf] Some systems are experiencing issues',
+        'major' => '[0,1] The service experiencing a major outage|[2,Inf] Some systems are experiencing a major outage',
+    ],
+
+    'api' => [
+        'regenerate' => 'Regenerate API Key',
+        'revoke'     => 'Revoke API Key',
+    ],
+
+    // Metrics
+    'metrics' => [
+        'filter' => [
+            'last_hour' => 'Last Hour',
+            'hourly'    => 'Afgelope 12 Uur',
+            'weekly'    => 'Weekliks',
+            'monthly'   => 'Maandeliks',
+        ],
+    ],
+
+    // Subscriber
+    'subscriber' => [
+        'subscribe' => 'Subscribe to get the most recent updates',
+        'button'    => 'Teken aan',
+        'manage'    => [
+            'no_subscriptions' => 'You\'re currently subscribed to all updates.',
+            'my_subscriptions' => 'You\'re currently subscribed to the following updates.',
+        ],
+        'email' => [
+            'subscribe'          => 'Subscribe to email updates.',
+            'subscribed'         => 'You\'ve been subscribed to email notifications, please check your email to confirm your subscription.',
+            'verified'           => 'Your email subscription has been confirmed. Thank you!',
+            'manage'             => 'Bestuur Subskripsies',
+            'unsubscribe'        => 'Unsubscribe from email updates.',
+            'unsubscribed'       => 'Your email subscription has been cancelled.',
+            'failure'            => 'Something went wrong with the subscription.',
+            'already-subscribed' => 'Cannot subscribe :email because they\'re already subscribed.',
+            'verify'             => [
+                'text'   => "Please confirm your email subscription to :app_name status updates.\n:link",
+                'html'   => '<p>Please confirm your email subscription to :app_name status updates.</p>',
+                'button' => 'Confirm Subscription',
+            ],
+            'maintenance' => [
+                'subject' => '[Maintenance Scheduled] :name',
+            ],
+            'incident' => [
+                'subject' => '[New Incident] :status: :name',
+            ],
+            'component' => [
+                'subject'       => 'Component Status Update',
+                'text'          => 'The component :component_name has seen a status change. The component is now at :component_human_status.\nThank you, :app_name',
+                'html'          => '<p>The component :component_name has seen a status change. The component is now at :component_human_status.</p><p>Thank you, :app_name</p>',
+                'tooltip-title' => 'Subscribe to notifications for :component_name.',
+            ],
+        ],
+    ],
+
+    'users' => [
+        'email' => [
+            'invite' => [
+                'text' => "You have been invited to the team :app_name status page, to sign up follow the next link.\n:link\nThank you, :app_name",
+                'html' => '<p>You have been invited to the team :app_name status page, to sign up follow the next link.</p><p><a href=":link">:link</a></p><p>Thank you, :app_name</p>',
+            ],
+        ],
+    ],
+
+    'signup' => [
+        'title'    => 'Teken Aan',
+        'username' => 'Username',
+        'email'    => 'EPos',
+        'password' => 'Wagwoord',
+        'success'  => 'U rekening is geskep.',
+        'failure'  => 'Something went wrong with the signup.',
+    ],
+
+    'system' => [
+        'update' => 'There is a newer version of Cachet available. You can learn how to update <a href="https://docs.cachethq.io/docs/updating-cachet">here</a>!',
+    ],
+
+    // Modal
+    'modal' => [
+        'close'     => 'Maak toe',
+        'subscribe' => [
+            'title'  => 'Subscribe to component updates',
+            'body'   => 'Enter your email address to subscribe to updates for this component. If you\'re already subscribed, you\'ll already receive emails for this component.',
+            'button' => 'Teken aan',
+        ],
+    ],
+
+    // Other
+    'home'            => 'Tuiste',
+    'description'     => 'Stay up to date with the latest service updates from :app.',
+    'powered_by'      => 'Powered by <a href="https://cachethq.io" class="links">Cachet</a>.',
+    'about_this_site' => 'Aangaande Hierdie Webwerf',
+    'rss-feed'        => 'RSS',
+    'atom-feed'       => 'Atom',
+    'feed'            => 'Status Feed',
+
+];

resources/lang/af-ZA/dashboard.php

@@ -0,0 +1,273 @@
+<?php
+
+/*
+ * This file is part of Cachet.
+ *
+ * (c) Alt Three Services Limited
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+return [
+
+    'dashboard' => 'Dashboard',
+
+    // Incidents
+    'incidents' => [
+        'title'                    => 'Incidents &amp; Schedule',
+        'incidents'                => 'Incidents',
+        'logged'                   => '{0} There are no incidents, good work.|You have logged one incident.|You have reported <strong>:count</strong> incidents.',
+        'incident-create-template' => 'Create Template',
+        'incident-templates'       => 'Incident Templates',
+        'add'                      => [
+            'title'   => 'Report an incident',
+            'success' => 'Incident added.',
+            'failure' => 'There was an error adding the incident, please try again.',
+        ],
+        'edit' => [
+            'title'   => 'Edit an incident',
+            'success' => 'Incident updated.',
+            'failure' => 'There was an error editing the incident, please try again.',
+        ],
+        'delete' => [
+            'success' => 'The incident has been deleted and will not show on your status page.',
+            'failure' => 'The incident could not be deleted, please try again.',
+        ],
+
+        // Incident templates
+        'templates' => [
+            'title' => 'Incident Templates',
+            'add'   => [
+                'title'   => 'Create an incident template',
+                'message' => 'You should add an incident template.',
+                'success' => 'Your new incident template has been created.',
+                'failure' => 'Something went wrong with the incident template.',
+            ],
+            'edit' => [
+                'title'   => 'Edit Template',
+                'success' => 'The incident template has been updated.',
+                'failure' => 'Something went wrong updating the incident template',
+            ],
+            'delete' => [
+                'success' => 'The incident template has been deleted.',
+                'failure' => 'The incident template could not be deleted, please try again.',
+            ],
+        ],
+    ],
+
+    // Incident Maintenance
+    'schedule' => [
+        'schedule'     => 'Scheduled Maintenance',
+        'logged'       => '{0} There are no schedules, good work.|You have logged one schedule.|You have reported <strong>:count</strong> schedules.',
+        'scheduled_at' => 'Scheduled at :timestamp',
+        'add'          => [
+            'title'   => 'Add Scheduled Maintenance',
+            'success' => 'Schedule added.',
+            'failure' => 'Something went wrong adding the schedule, please try again.',
+        ],
+        'edit' => [
+            'title'   => 'Edit Scheduled Maintenance',
+            'success' => 'Schedule has been updated!',
+            'failure' => 'Something went wrong editing the schedule, please try again.',
+        ],
+        'delete' => [
+            'success' => 'The scheduled maintenance has been deleted and will not show on your status page.',
+            'failure' => 'The scheduled maintenance could not be deleted, please try again.',
+        ],
+    ],
+
+    // Components
+    'components' => [
+        'components'         => 'Components',
+        'component_statuses' => 'Component Statuses',
+        'listed_group'       => 'Grouped under :name',
+        'add'                => [
+            'title'   => 'Add a component',
+            'message' => 'You should add a component.',
+            'success' => 'Component created.',
+            'failure' => 'Something went wrong with the component group, please try again.',
+        ],
+        'edit' => [
+            'title'   => 'Edit a component',
+            'success' => 'Component updated.',
+            'failure' => 'Something went wrong with the component group, please try again.',
+        ],
+        'delete' => [
+            'success' => 'The component has been deleted!',
+            'failure' => 'The component could not be deleted, please try again.',
+        ],
+
+        // Component groups
+        'groups' => [
+            'groups'        => 'Component group|Component groups',
+            'no_components' => 'You should add a component group.',
+            'add'           => [
+                'title'   => 'Add a component group',
+                'success' => 'Component group added.',
+                'failure' => 'Something went wrong with the component group, please try again.',
+            ],
+            'edit' => [
+                'title'   => 'Edit a component group',
+                'success' => 'Component group updated.',
+                'failure' => 'Something went wrong with the component group, please try again.',
+            ],
+            'delete' => [
+                'success' => 'Component group has been deleted!',
+                'failure' => 'The component group could not be deleted, please try again.',
+            ],
+        ],
+    ],
+
+    // Metrics
+    'metrics' => [
+        'metrics' => 'Metrics',
+        'add'     => [
+            'title'   => 'Create a metric',
+            'message' => 'You should add a metric.',
+            'success' => 'Metric created.',
+            'failure' => 'Something went wrong with the metric, please try again.',
+        ],
+        'edit' => [
+            'title'   => 'Edit a metric',
+            'success' => 'Metric updated.',
+            'failure' => 'Something went wrong with the metric, please try again.',
+        ],
+        'delete' => [
+            'success' => 'The metric has been deleted and will no longer display on your status page.',
+            'failure' => 'The metric could not be deleted, please try again.',
+        ],
+    ],
+    // Subscribers
+    'subscribers' => [
+        'subscribers'      => 'Subscribers',
+        'description'      => 'Subscribers will receive email updates when incidents are created or components are updated.',
+        'verified'         => 'Verified',
+        'not_verified'     => 'Not verified',
+        'subscriber'       => ':email, subscribed :date',
+        'no_subscriptions' => 'Subscribed to all updates',
+        'add'              => [
+            'title'   => 'Add a new subscriber',
+            'success' => 'Subscriber has been added!',
+            'failure' => 'Something went wrong adding the subscriber, please try again.',
+            'help'    => 'Enter each subscriber on a new line.',
+        ],
+        'edit' => [
+            'title'   => 'Update subscriber',
+            'success' => 'Subscriber has been updated!',
+            'failure' => 'Something went wrong editing the subscriber, please try again.',
+        ],
+    ],
+
+    // Team
+    'team' => [
+        'team'        => 'Span',
+        'member'      => 'Lid',
+        'profile'     => 'Profiel',
+        'description' => 'Team Members will be able to add, modify &amp; edit components and incidents.',
+        'add'         => [
+            'title'   => 'Add a new team member',
+            'success' => 'Spanlid bygevoeg.',
+            'failure' => 'The team member could not be added, please try again.',
+        ],
+        'edit' => [
+            'title'   => 'Update profile',
+            'success' => 'Profile updated.',
+            'failure' => 'Something went wrong updating the profile, please try again.',
+        ],
+        'delete' => [
+            'success' => 'Team member has been deleted and will no longer have access to the dashboard!',
+            'failure' => 'The team member could not be added, please try again.',
+        ],
+        'invite' => [
+            'title'   => 'Invite a new team member',
+            'success' => 'An invite has been sent',
+            'failure' => 'The invite could not be sent, please try again.',
+        ],
+    ],
+
+    // Settings
+    'settings' => [
+        'settings'  => 'Instellings',
+        'app-setup' => [
+            'app-setup'   => 'Application Setup',
+            'images-only' => 'Only images may be uploaded.',
+            'too-big'     => 'The file you uploaded is too big. Upload an image smaller than :size',
+        ],
+        'analytics' => [
+            'analytics' => 'Analytics',
+        ],
+        'localization' => [
+            'localization' => 'Localization',
+        ],
+        'customization' => [
+            'customization' => 'Customization',
+            'header'        => 'Custom Header HTML',
+            'footer'        => 'Custom Footer HTML',
+        ],
+        'security' => [
+            'security'   => 'Security',
+            'two-factor' => 'Users without two-factor authentication',
+        ],
+        'stylesheet' => [
+            'stylesheet' => 'Stylesheet',
+        ],
+        'theme' => [
+            'theme' => 'Tema',
+        ],
+        'edit' => [
+            'success' => 'Settings saved.',
+            'failure' => 'Settings could not be saved.',
+        ],
+        'credits' => [
+            'credits'       => 'Credits',
+            'contributors'  => 'Contributors',
+            'license'       => 'Cachet is a BSD-3-licensed open source project, released by <a href="https://alt-three.com/?utm_source=cachet&utm_medium=credits&utm_campaign=Cachet%20Credit%20Dashboard" target="_blank">Alt Three Services Limited</a>.',
+            'backers-title' => 'Backers & Sponsors',
+            'backers'       => 'If you\'d like to support future development, check out the CrowdIn and GitHub.',
+            'thank-you'     => 'Thank you to each and every one of the :count contributors.',
+        ],
+    ],
+
+    // Login
+    'login' => [
+        'login'      => 'Teken In',
+        'logged_in'  => 'You\'re logged in.',
+        'welcome'    => 'Welcome Back!',
+        'two-factor' => 'Please enter your token.',
+    ],
+
+    // Sidebar footer
+    'help'        => 'Help',
+    'status_page' => 'Status Page',
+    'logout'      => 'Teken Uit',
+
+    // Notifications
+    'notifications' => [
+        'notifications' => 'Notifications',
+        'awesome'       => 'Awesome.',
+        'whoops'        => 'Whoops.',
+    ],
+
+    // Widgets
+    'widgets' => [
+        'news'             => 'Latest News',
+        'news_subtitle'    => 'Get the latest update',
+    ],
+
+    // Welcome modal
+    'welcome' => [
+        'welcome' => 'Welcome to your new Status page!',
+        'message' => 'Your status page is almost ready! You might want to configure these extra settings',
+        'close'   => 'Take me straight to my dashboard',
+        'steps'   => [
+            'component'  => 'Create components',
+            'incident'   => 'Create incidents',
+            'customize'  => 'Customize',
+            'team'       => 'Voeg gebruikers by',
+            'api'        => 'Generate API token',
+            'two-factor' => 'Two Factor Authentication',
+        ],
+    ],
+
+];

resources/lang/af-ZA/forms.php

@@ -0,0 +1,192 @@
+<?php
+
+/*
+ * This file is part of Cachet.
+ *
+ * (c) Alt Three Services Limited
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+return [
+
+    // Setup form fields
+    'setup' => [
+        'email'            => 'EPos',
+        'username'         => 'Gebruikersnaam',
+        'password'         => 'Wagwoord',
+        'site_name'        => 'Site Name',
+        'site_domain'      => 'Site Domain',
+        'site_timezone'    => 'Select your timezone',
+        'site_locale'      => 'Kies taal',
+        'enable_google2fa' => 'Enable Google Two Factor Authentication',
+        'cache_driver'     => 'Cache Driver',
+        'session_driver'   => 'Session Driver',
+        'mail_driver'      => 'Mail Driver',
+        'mail_host'        => 'Mail Host',
+        'mail_address'     => 'Mail From Address',
+        'mail_username'    => 'Mail Username',
+        'mail_password'    => 'Mail Password',
+    ],
+
+    // Login form fields
+    'login' => [
+        'login'         => 'Username or Email',
+        'email'         => 'EPos',
+        'password'      => 'Wagwoord',
+        '2fauth'        => 'Authentication Code',
+        'invalid'       => 'Ongeldige gebruikernaam of wagwoord',
+        'invalid-token' => 'Invalid token',
+        'cookies'       => 'You must enable cookies to login.',
+        'rate-limit'    => 'Rate limit exceeded.',
+    ],
+
+    // Incidents form fields
+    'incidents' => [
+        'name'               => 'Name',
+        'status'             => 'Status',
+        'component'          => 'Komponente',
+        'message'            => 'Boodskap',
+        'message-help'       => 'You may also use Markdown.',
+        'scheduled_at'       => 'When to schedule the maintenance for?',
+        'incident_time'      => 'When did this incident occur?',
+        'notify_subscribers' => 'Notify subscribers?',
+        'visibility'         => 'Incident Visibility',
+        'public'             => 'Viewable by public',
+        'logged_in_only'     => 'Only visible to logged in users',
+        'templates'          => [
+            'name'     => 'Name',
+            'template' => 'Templaat',
+            'twig'     => 'Incident Templates can make use of the <a href="http://twig.sensiolabs.org/" target="_blank">Twig</a> templating language.',
+        ],
+    ],
+
+    // Components form fields
+    'components' => [
+        'name'        => 'Name',
+        'status'      => 'Status',
+        'group'       => 'Group',
+        'description' => 'Beskrywing',
+        'link'        => 'Link',
+        'tags'        => 'Tags',
+        'tags-help'   => 'Comma separated.',
+        'enabled'     => 'Component enabled?',
+
+        'groups' => [
+            'name'               => 'Name',
+            'collapsing'         => 'Choose visibility of the group',
+            'visible'            => 'Always expanded',
+            'collapsed'          => 'Collapse the group by default',
+            'collapsed_incident' => 'Collapse the group, but expand if there are issues',
+        ],
+    ],
+
+    // Metric form fields
+    'metrics' => [
+        'name'             => 'Name',
+        'suffix'           => 'Suffix',
+        'description'      => 'Beskrywing',
+        'description-help' => 'You may also use Markdown.',
+        'display-chart'    => 'Display chart on status page?',
+        'default-value'    => 'Default value',
+        'calc_type'        => 'Calculation of metrics',
+        'type_sum'         => 'Sum',
+        'type_avg'         => 'Average',
+        'places'           => 'Decimal places',
+        'default_view'     => 'Default view',
+        'threshold'        => 'How many minutes of threshold between metric points?',
+
+        'points' => [
+            'value' => 'Value',
+        ],
+    ],
+
+    // Settings
+    'settings' => [
+        /// Application setup
+        'app-setup' => [
+            'site-name'              => 'Site Name',
+            'site-url'               => 'Site URL',
+            'display-graphs'         => 'Display graphs on status page?',
+            'about-this-page'        => 'About this page',
+            'days-of-incidents'      => 'How many days of incidents to show?',
+            'banner'                 => 'Banner Image',
+            'banner-help'            => "It's recommended that you upload files no bigger than 930px wide .",
+            'subscribers'            => 'Allow people to signup to email notifications?',
+            'automatic_localization' => 'Automatically localise your status page to your visitor\'s language?',
+        ],
+        'analytics' => [
+            'analytics_google'       => 'Google Analytics code',
+            'analytics_gosquared'    => 'GoSquared Analytics code',
+            'analytics_piwik_url'    => 'URL of your Piwik instance (without http(s)://)',
+            'analytics_piwik_siteid' => 'Piwik\'s site id',
+        ],
+        'localization' => [
+            'site-timezone'        => 'Site timezone',
+            'site-locale'          => 'Site language',
+            'date-format'          => 'Date format',
+            'incident-date-format' => 'Incident timestamp format',
+        ],
+        'security' => [
+            'allowed-domains'      => 'Allowed domains',
+            'allowed-domains-help' => 'Comma separated. The domain set above is automatically allowed by default.',
+        ],
+        'stylesheet' => [
+            'custom-css' => 'Custom Stylesheet',
+        ],
+        'theme' => [
+            'background-color'        => 'Background Color',
+            'background-fills'        => 'Background fills (components, incidents, footer)',
+            'banner-background-color' => 'Banner background color',
+            'banner-padding'          => 'Banner padding',
+            'fullwidth-banner'        => 'Enable fullwidth banner?',
+            'text-color'              => 'Text Color',
+            'dashboard-login'         => 'Show dashboard button in the footer?',
+            'reds'                    => 'Red (used for errors)',
+            'blues'                   => 'Blue (used for information)',
+            'greens'                  => 'Green (used for success)',
+            'yellows'                 => 'Yellow (used for alerts)',
+            'oranges'                 => 'Orange (used for notices)',
+            'metrics'                 => 'Metrics fill',
+            'links'                   => 'Links',
+        ],
+    ],
+
+    'user' => [
+        'username'       => 'Username',
+        'email'          => 'EPos',
+        'password'       => 'Wagwoord',
+        'api-token'      => 'API Token',
+        'api-token-help' => 'Regenerating your API token will prevent existing applications from accessing Cachet.',
+        'gravatar'       => 'Change your profile picture at Gravatar.',
+        'user_level'     => 'User Level',
+        'levels'         => [
+            'admin' => 'Admin',
+            'user'  => 'User',
+        ],
+        '2fa' => [
+            'help' => 'Enabling two factor authentication increases security of your account. You will need to download <a href="https://support.google.com/accounts/answer/1066447?hl=en">Google Authenticator</a> or a similar app on to your mobile device. When you login you will be asked to provide a token generated by the app.',
+        ],
+        'team' => [
+            'description' => 'Invite your team members by entering their email addresses here.',
+            'email'       => 'Email #:id',
+        ],
+    ],
+
+    // Buttons
+    'add'    => 'Add',
+    'save'   => 'Save',
+    'update' => 'Update',
+    'create' => 'Create',
+    'edit'   => 'Edit',
+    'delete' => 'Delete',
+    'submit' => 'Submit',
+    'cancel' => 'Cancel',
+    'remove' => 'Remove',
+    'invite' => 'Invite',
+    'signup' => 'Teken Aan',
+
+    // Other
+    'optional' => '* Optional',
+];

resources/lang/af-ZA/pagination.php

@@ -0,0 +1,28 @@
+<?php
+
+/*
+ * This file is part of Cachet.
+ *
+ * (c) Alt Three Services Limited
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+return [
+
+    /*
+    |--------------------------------------------------------------------------
+    | Pagination Language Lines
+    |--------------------------------------------------------------------------
+    |
+    | The following language lines are used by the paginator library to build
+    | the simple pagination links. You are free to change them to anything
+    | you want to customize your views to better match your application.
+    |
+    */
+
+    'previous' => '&laquo; Vorige',
+    'next'     => 'Volgende &raquo;',
+
+];

resources/lang/af-ZA/setup.php

@@ -0,0 +1,23 @@
+<?php
+
+/*
+ * This file is part of Cachet.
+ *
+ * (c) Alt Three Services Limited
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+return [
+    'setup'             => 'Setup',
+    'title'             => 'Setup Cachet',
+    'service_details'   => 'Service Details',
+    'env_setup'         => 'Environment Setup',
+    'status_page_setup' => 'Status Page Setup',
+    'show_support'      => 'Show support for Cachet?',
+    'admin_account'     => 'Administrator Account',
+    'complete_setup'    => 'Complete Setup',
+    'completed'         => 'Cachet has been configured successfully!',
+    'finish_setup'      => 'Go to dashboard',
+];

resources/lang/af-ZA/validation.php

@@ -0,0 +1,122 @@
+<?php
+
+/*
+ * This file is part of Cachet.
+ *
+ * (c) Alt Three Services Limited
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+return [
+
+    /*
+    |--------------------------------------------------------------------------
+    | Validation Language Lines
+    |--------------------------------------------------------------------------
+    |
+    | The following language lines contain the default error messages used by
+    | the validator class. Some of these rules have multiple versions such
+    | as the size rules. Feel free to tweak each of these messages here.
+    |
+    */
+
+    'accepted'   => 'The :attribute must be accepted.',
+    'active_url' => 'The :attribute is not a valid URL.',
+    'after'      => 'The :attribute must be a date after :date.',
+    'alpha'      => 'The :attribute may only contain letters.',
+    'alpha_dash' => 'The :attribute may only contain letters, numbers, and dashes.',
+    'alpha_num'  => 'The :attribute may only contain letters and numbers.',
+    'array'      => 'The :attribute must be an array.',
+    'before'     => 'The :attribute must be a date before :date.',
+    'between'    => [
+        'numeric' => 'The :attribute must be a date before :date.',
+        'file'    => 'The :attribute must be between :min and :max.',
+        'string'  => 'The :attribute must be between :min and :max kilobytes.',
+        'array'   => 'The :attribute must have between :min and :max items.',
+    ],
+    'boolean'        => 'The :attribute must have between :min and :max items.',
+    'confirmed'      => 'The :attribute field must be true or false.',
+    'date'           => 'The :attribute confirmation does not match.',
+    'date_format'    => 'The :attribute is not a valid date.',
+    'different'      => 'The :attribute does not match the format :format.',
+    'digits'         => 'The :attribute and :other must be different.',
+    'digits_between' => 'The :attribute must be :digits digits.',
+    'email'          => 'The :attribute must be between :min and :max digits.',
+    'exists'         => 'The :attribute must be a valid email address.',
+    'distinct'       => 'The :attribute field has a duplicate value.',
+    'filled'         => 'The :attribute format is invalid.',
+    'image'          => 'The :attribute must be an image.',
+    'in'             => 'The :attribute must be an image.',
+    'in_array'       => 'The :attribute field does not exist in :other.',
+    'integer'        => 'The selected :attribute is invalid.',
+    'ip'             => 'The :attribute must be an integer.',
+    'json'           => 'The :attribute must be a valid JSON string.',
+    'max'            => [
+        'numeric' => 'The :attribute must be a valid IP address.',
+        'file'    => 'The :attribute may not be greater than :max.',
+        'string'  => 'The :attribute may not be greater than :max kilobytes.',
+        'array'   => 'The :attribute may not have more than :max items.',
+    ],
+    'mimes' => 'The :attribute may not have more than :max items.',
+    'min'   => [
+        'numeric' => 'The :attribute must be a file of type: :values.',
+        'file'    => 'The :attribute must be at least :min kilobytes.',
+        'string'  => 'The :attribute must be at least :min kilobytes.',
+        'array'   => 'The :attribute must be at least :min characters.',
+    ],
+    'not_in'               => 'The :attribute must have at least :min items.',
+    'numeric'              => 'The selected :attribute is invalid.',
+    'present'              => 'The :attribute field must be present.',
+    'regex'                => 'The :attribute must be a number.',
+    'required'             => 'The :attribute format is invalid.',
+    'required_if'          => 'The :attribute field is required.',
+    'required_unless'      => 'The :attribute field is required unless :other is in :values.',
+    'required_with'        => 'The :attribute field is required when :other is :value.',
+    'required_with_all'    => 'The :attribute field is required when :values is present.',
+    'required_without'     => 'The :attribute field is required when :values is present.',
+    'required_without_all' => 'The :attribute field is required when :values is not present.',
+    'same'                 => 'The :attribute field is required when none of :values are present.',
+    'size'                 => [
+        'numeric' => 'The :attribute and :other must match.',
+        'file'    => 'The :attribute must be :size kilobytes.',
+        'string'  => 'The :attribute must be :size characters.',
+        'array'   => 'The :attribute must be :size characters.',
+    ],
+    'string'   => 'The :attribute must contain :size items.',
+    'timezone' => 'The :attribute must be a valid zone.',
+    'unique'   => 'The :attribute has already been taken.',
+    'url'      => 'The :attribute format is invalid.',
+
+    /*
+    |--------------------------------------------------------------------------
+    | Custom Validation Language Lines
+    |--------------------------------------------------------------------------
+    |
+    | Here you may specify custom validation messages for attributes using the
+    | convention "attribute.rule" to name the lines. This makes it quick to
+    | specify a specific custom language line for a given attribute rule.
+    |
+    */
+
+    'custom' => [
+        'attribute-name' => [
+            'rule-name' => 'custom-message',
+        ],
+    ],
+
+    /*
+    |--------------------------------------------------------------------------
+    | Custom Validation Attributes
+    |--------------------------------------------------------------------------
+    |
+    | The following language lines are used to swap attribute place-holders
+    | with something more reader friendly such as E-Mail Address instead
+    | of "email". This simply helps us make messages a little cleaner.
+    |
+    */
+
+    'attributes' => [],
+
+];

resources/lang/af/cachet.php

@@ -103,8 +103,8 @@ return [
     'users' => [
         'email' => [
             'invite' => [
-                'text'           => "You have been invited to the team :app_name status page, to sign up follow the next link.\n:link\nThank you, :app_name",
-                'html'           => '<p>You have been invited to the team :app_name status page, to sign up follow the next link.</p><p><a href=":link">:link</a></p><p>Thank you, :app_name</p>',
+                'text' => "You have been invited to the team :app_name status page, to sign up follow the next link.\n:link\nThank you, :app_name",
+                'html' => '<p>You have been invited to the team :app_name status page, to sign up follow the next link.</p><p><a href=":link">:link</a></p><p>Thank you, :app_name</p>',
             ],
         ],
     ],

resources/lang/af/dashboard.php

@@ -224,7 +224,7 @@ return [
             'contributors'  => 'Contributors',
             'license'       => 'Cachet is a BSD-3-licensed open source project, released by <a href="https://alt-three.com/?utm_source=cachet&utm_medium=credits&utm_campaign=Cachet%20Credit%20Dashboard" target="_blank">Alt Three Services Limited</a>.',
             'backers-title' => 'Backers & Sponsors',
-            'backers'       => 'If you\'d like to support future development, check out the <a href="https://patreon.com/jbrooksuk" target="_blank">Cachet Patreon</a> campaign.',
+            'backers'       => 'If you\'d like to support future development, check out the CrowdIn and GitHub.',
             'thank-you'     => 'Thank you to each and every one of the :count contributors.',
         ],
     ],
@@ -251,8 +251,6 @@ return [
 
     // Widgets
     'widgets' => [
-        'support'          => 'Support Cachet',
-        'support_subtitle' => 'Check out our <strong><a href="https://patreon.com/jbrooksuk" target="_blank">Patreon</a></strong> page!',
         'news'             => 'Latest News',
         'news_subtitle'    => 'Get the latest updates',
     ],

resources/lang/af/forms.php

@@ -118,10 +118,10 @@ return [
             'analytics_piwik_siteid' => 'Piwik\'s site id',
         ],
         'localization' => [
-            'site-timezone'          => 'Site timezone',
-            'site-locale'            => 'Site language',
-            'date-format'            => 'Date format',
-            'incident-date-format'   => 'Incident timestamp format',
+            'site-timezone'        => 'Site timezone',
+            'site-locale'          => 'Site language',
+            'date-format'          => 'Date format',
+            'incident-date-format' => 'Incident timestamp format',
         ],
         'security' => [
             'allowed-domains'      => 'Allowed domains',

resources/lang/ar-SA/cachet.php

@@ -0,0 +1,144 @@
+<?php
+
+/*
+ * This file is part of Cachet.
+ *
+ * (c) Alt Three Services Limited
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+return [
+    // Components
+    'components' => [
+        'last_updated' => 'Last updated :timestamp',
+        'status'       => [
+            1 => 'Operational',
+            2 => 'Performance Issues',
+            3 => 'Partial Outage',
+            4 => 'Major Outage',
+        ],
+        'group' => [
+            'other' => 'Other Components',
+        ],
+    ],
+
+    // Incidents
+    'incidents' => [
+        'none'          => 'No incidents reported',
+        'past'          => 'Past Incidents',
+        'previous_week' => 'Previous Week',
+        'next_week'     => 'Next Week',
+        'scheduled'     => 'Scheduled Maintenance',
+        'scheduled_at'  => ', scheduled :timestamp',
+        'status'        => [
+            0 => 'Scheduled', // TODO: Hopefully remove this.
+            1 => 'Investigating',
+            2 => 'Identified',
+            3 => 'Watching',
+            4 => 'Fixed',
+        ],
+    ],
+
+    // Service Status
+    'service' => [
+        'good'  => '[0,1] System operational|[2,Inf] All systems are operational',
+        'bad'   => '[0,1] The system is currently experiencing issues|[2,Inf] Some systems are experiencing issues',
+        'major' => '[0,1] The service experiencing a major outage|[2,Inf] Some systems are experiencing a major outage',
+    ],
+
+    'api' => [
+        'regenerate' => 'Regenerate API Key',
+        'revoke'     => 'Revoke API Key',
+    ],
+
+    // Metrics
+    'metrics' => [
+        'filter' => [
+            'last_hour' => 'Last Hour',
+            'hourly'    => 'Last 12 Hours',
+            'weekly'    => 'Week',
+            'monthly'   => 'Month',
+        ],
+    ],
+
+    // Subscriber
+    'subscriber' => [
+        'subscribe' => 'Subscribe to get the most recent updates',
+        'button'    => 'Subscribe',
+        'manage'    => [
+            'no_subscriptions' => 'You\'re currently subscribed to all updates.',
+            'my_subscriptions' => 'You\'re currently subscribed to the following updates.',
+        ],
+        'email' => [
+            'subscribe'          => 'Subscribe to email updates.',
+            'subscribed'         => 'You\'ve been subscribed to email notifications, please check your email to confirm your subscription.',
+            'verified'           => 'Your email subscription has been confirmed. Thank you!',
+            'manage'             => 'Manage your subscription',
+            'unsubscribe'        => 'Unsubscribe from email updates.',
+            'unsubscribed'       => 'Your email subscription has been cancelled.',
+            'failure'            => 'Something went wrong with the subscription.',
+            'already-subscribed' => 'Cannot subscribe :email because they\'re already subscribed.',
+            'verify'             => [
+                'text'   => "Please confirm your email subscription to :app_name status updates.\n:link",
+                'html'   => '<p>Please confirm your email subscription to :app_name status updates.</p>',
+                'button' => 'Confirm Subscription',
+            ],
+            'maintenance' => [
+                'subject' => '[Maintenance Scheduled] :name',
+            ],
+            'incident' => [
+                'subject' => '[New Incident] :status: :name',
+            ],
+            'component' => [
+                'subject'       => 'Component Status Update',
+                'text'          => 'The component :component_name has seen a status change. The component is now at :component_human_status.\nThank you, :app_name',
+                'html'          => '<p>The component :component_name has seen a status change. The component is now at :component_human_status.</p><p>Thank you, :app_name</p>',
+                'tooltip-title' => 'Subscribe to notifications for :component_name.',
+            ],
+        ],
+    ],
+
+    'users' => [
+        'email' => [
+            'invite' => [
+                'text' => "You have been invited to the team :app_name status page, to sign up follow the next link.\n:link\nThank you, :app_name",
+                'html' => '<p>You have been invited to the team :app_name status page, to sign up follow the next link.</p><p><a href=":link">:link</a></p><p>Thank you, :app_name</p>',
+            ],
+        ],
+    ],
+
+    'signup' => [
+        'title'    => 'Sign Up',
+        'username' => 'Username',
+        'email'    => 'Email',
+        'password' => 'Password',
+        'success'  => 'Your account has been created.',
+        'failure'  => 'Something went wrong with the signup.',
+    ],
+
+    'system' => [
+        'update' => 'There is a newer version of Cachet available. You can learn how to update <a href="https://docs.cachethq.io/docs/updating-cachet">here</a>!',
+    ],
+
+    // Modal
+    'modal' => [
+        'close'     => 'Close',
+        'subscribe' => [
+            'title'  => 'Subscribe to component updates',
+            'body'   => 'Enter your email address to subscribe to updates for this component. If you\'re already subscribed, you\'ll already receive emails for this component.',
+            'button' => 'Subscribe',
+        ],
+    ],
+
+    // Other
+    'home'            => 'Home',
+    'description'     => 'Stay up to date with the latest service updates from :app.',
+    'powered_by'      => 'Powered by <a href="https://cachethq.io" class="links">Cachet</a>.',
+    'about_this_site' => 'About This Site',
+    'rss-feed'        => 'RSS',
+    'atom-feed'       => 'Atom',
+    'feed'            => 'Status Feed',
+
+];

resources/lang/ar-SA/dashboard.php

@@ -0,0 +1,273 @@
+<?php
+
+/*
+ * This file is part of Cachet.
+ *
+ * (c) Alt Three Services Limited
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+return [
+
+    'dashboard' => 'Dashboard',
+
+    // Incidents
+    'incidents' => [
+        'title'                    => 'Incidents &amp; Schedule',
+        'incidents'                => 'Incidents',
+        'logged'                   => '{0} There are no incidents, good work.|You have logged one incident.|You have reported <strong>:count</strong> incidents.',
+        'incident-create-template' => 'Create Template',
+        'incident-templates'       => 'Incident Templates',
+        'add'                      => [
+            'title'   => 'Report an incident',
+            'success' => 'Incident added.',
+            'failure' => 'There was an error adding the incident, please try again.',
+        ],
+        'edit' => [
+            'title'   => 'Edit an incident',
+            'success' => 'Incident updated.',
+            'failure' => 'There was an error editing the incident, please try again.',
+        ],
+        'delete' => [
+            'success' => 'The incident has been deleted and will not show on your status page.',
+            'failure' => 'The incident could not be deleted, please try again.',
+        ],
+
+        // Incident templates
+        'templates' => [
+            'title' => 'Incident Templates',
+            'add'   => [
+                'title'   => 'Create an incident template',
+                'message' => 'You should add an incident template.',
+                'success' => 'Your new incident template has been created.',
+                'failure' => 'Something went wrong with the incident template.',
+            ],
+            'edit' => [
+                'title'   => 'Edit Template',
+                'success' => 'The incident template has been updated.',
+                'failure' => 'Something went wrong updating the incident template',
+            ],
+            'delete' => [
+                'success' => 'The incident template has been deleted.',
+                'failure' => 'The incident template could not be deleted, please try again.',
+            ],
+        ],
+    ],
+
+    // Incident Maintenance
+    'schedule' => [
+        'schedule'     => 'Scheduled Maintenance',
+        'logged'       => '{0} There are no schedules, good work.|You have logged one schedule.|You have reported <strong>:count</strong> schedules.',
+        'scheduled_at' => 'Scheduled at :timestamp',
+        'add'          => [
+            'title'   => 'Add Scheduled Maintenance',
+            'success' => 'Schedule added.',
+            'failure' => 'Something went wrong adding the schedule, please try again.',
+        ],
+        'edit' => [
+            'title'   => 'Edit Scheduled Maintenance',
+            'success' => 'Schedule has been updated!',
+            'failure' => 'Something went wrong editing the schedule, please try again.',
+        ],
+        'delete' => [
+            'success' => 'The scheduled maintenance has been deleted and will not show on your status page.',
+            'failure' => 'The scheduled maintenance could not be deleted, please try again.',
+        ],
+    ],
+
+    // Components
+    'components' => [
+        'components'         => 'Components',
+        'component_statuses' => 'Component Statuses',
+        'listed_group'       => 'Grouped under :name',
+        'add'                => [
+            'title'   => 'Add a component',
+            'message' => 'You should add a component.',
+            'success' => 'Component created.',
+            'failure' => 'Something went wrong with the component group, please try again.',
+        ],
+        'edit' => [
+            'title'   => 'Edit a component',
+            'success' => 'Component updated.',
+            'failure' => 'Something went wrong with the component group, please try again.',
+        ],
+        'delete' => [
+            'success' => 'The component has been deleted!',
+            'failure' => 'The component could not be deleted, please try again.',
+        ],
+
+        // Component groups
+        'groups' => [
+            'groups'        => 'Component group|Component groups',
+            'no_components' => 'You should add a component group.',
+            'add'           => [
+                'title'   => 'Add a component group',
+                'success' => 'Component group added.',
+                'failure' => 'Something went wrong with the component group, please try again.',
+            ],
+            'edit' => [
+                'title'   => 'Edit a component group',
+                'success' => 'Component group updated.',
+                'failure' => 'Something went wrong with the component group, please try again.',
+            ],
+            'delete' => [
+                'success' => 'Component group has been deleted!',
+                'failure' => 'The component group could not be deleted, please try again.',
+            ],
+        ],
+    ],
+
+    // Metrics
+    'metrics' => [
+        'metrics' => 'Metrics',
+        'add'     => [
+            'title'   => 'Create a metric',
+            'message' => 'You should add a metric.',
+            'success' => 'Metric created.',
+            'failure' => 'Something went wrong with the metric, please try again.',
+        ],
+        'edit' => [
+            'title'   => 'Edit a metric',
+            'success' => 'Metric updated.',
+            'failure' => 'Something went wrong with the metric, please try again.',
+        ],
+        'delete' => [
+            'success' => 'The metric has been deleted and will no longer display on your status page.',
+            'failure' => 'The metric could not be deleted, please try again.',
+        ],
+    ],
+    // Subscribers
+    'subscribers' => [
+        'subscribers'      => 'Subscribers',
+        'description'      => 'Subscribers will receive email updates when incidents are created or components are updated.',
+        'verified'         => 'Verified',
+        'not_verified'     => 'Not verified',
+        'subscriber'       => ':email, subscribed :date',
+        'no_subscriptions' => 'Subscribed to all updates',
+        'add'              => [
+            'title'   => 'Add a new subscriber',
+            'success' => 'Subscriber has been added!',
+            'failure' => 'Something went wrong adding the subscriber, please try again.',
+            'help'    => 'Enter each subscriber on a new line.',
+        ],
+        'edit' => [
+            'title'   => 'Update subscriber',
+            'success' => 'Subscriber has been updated!',
+            'failure' => 'Something went wrong editing the subscriber, please try again.',
+        ],
+    ],
+
+    // Team
+    'team' => [
+        'team'        => 'Team',
+        'member'      => 'Member',
+        'profile'     => 'Profile',
+        'description' => 'Team Members will be able to add, modify &amp; edit components and incidents.',
+        'add'         => [
+            'title'   => 'Add a new team member',
+            'success' => 'Team member added.',
+            'failure' => 'The team member could not be added, please try again.',
+        ],
+        'edit' => [
+            'title'   => 'Update profile',
+            'success' => 'Profile updated.',
+            'failure' => 'Something went wrong updating the profile, please try again.',
+        ],
+        'delete' => [
+            'success' => 'Team member has been deleted and will no longer have access to the dashboard!',
+            'failure' => 'The team member could not be added, please try again.',
+        ],
+        'invite' => [
+            'title'   => 'Invite a new team member',
+            'success' => 'An invite has been sent',
+            'failure' => 'The invite could not be sent, please try again.',
+        ],
+    ],
+
+    // Settings
+    'settings' => [
+        'settings'  => 'Settings',
+        'app-setup' => [
+            'app-setup'   => 'Application Setup',
+            'images-only' => 'Only images may be uploaded.',
+            'too-big'     => 'The file you uploaded is too big. Upload an image smaller than :size',
+        ],
+        'analytics' => [
+            'analytics' => 'Analytics',
+        ],
+        'localization' => [
+            'localization' => 'Localization',
+        ],
+        'customization' => [
+            'customization' => 'Customization',
+            'header'        => 'Custom Header HTML',
+            'footer'        => 'Custom Footer HTML',
+        ],
+        'security' => [
+            'security'   => 'Security',
+            'two-factor' => 'Users without two-factor authentication',
+        ],
+        'stylesheet' => [
+            'stylesheet' => 'Stylesheet',
+        ],
+        'theme' => [
+            'theme' => 'Theme',
+        ],
+        'edit' => [
+            'success' => 'Settings saved.',
+            'failure' => 'Settings could not be saved.',
+        ],
+        'credits' => [
+            'credits'       => 'Credits',
+            'contributors'  => 'Contributors',
+            'license'       => 'Cachet is a BSD-3-licensed open source project, released by <a href="https://alt-three.com/?utm_source=cachet&utm_medium=credits&utm_campaign=Cachet%20Credit%20Dashboard" target="_blank">Alt Three Services Limited</a>.',
+            'backers-title' => 'Backers & Sponsors',
+            'backers'       => 'If you\'d like to support future development, check out the CrowdIn and GitHub.',
+            'thank-you'     => 'Thank you to each and every one of the :count contributors.',
+        ],
+    ],
+
+    // Login
+    'login' => [
+        'login'      => 'Login',
+        'logged_in'  => 'You\'re logged in.',
+        'welcome'    => 'Welcome Back!',
+        'two-factor' => 'Please enter your token.',
+    ],
+
+    // Sidebar footer
+    'help'        => 'Help',
+    'status_page' => 'Status Page',
+    'logout'      => 'Logout',
+
+    // Notifications
+    'notifications' => [
+        'notifications' => 'Notifications',
+        'awesome'       => 'Awesome.',
+        'whoops'        => 'Whoops.',
+    ],
+
+    // Widgets
+    'widgets' => [
+        'news'             => 'Latest News',
+        'news_subtitle'    => 'Get the latest update',
+    ],
+
+    // Welcome modal
+    'welcome' => [
+        'welcome' => 'Welcome to your new Status page!',
+        'message' => 'Your status page is almost ready! You might want to configure these extra settings',
+        'close'   => 'Take me straight to my dashboard',
+        'steps'   => [
+            'component'  => 'Create components',
+            'incident'   => 'Create incidents',
+            'customize'  => 'Customize',
+            'team'       => 'Add users',
+            'api'        => 'Generate API token',
+            'two-factor' => 'Two Factor Authentication',
+        ],
+    ],
+
+];

resources/lang/ar-SA/forms.php

@@ -0,0 +1,192 @@
+<?php
+
+/*
+ * This file is part of Cachet.
+ *
+ * (c) Alt Three Services Limited
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+return [
+
+    // Setup form fields
+    'setup' => [
+        'email'            => 'Email',
+        'username'         => 'Username',
+        'password'         => 'Password',
+        'site_name'        => 'Site Name',
+        'site_domain'      => 'Site Domain',
+        'site_timezone'    => 'Select your timezone',
+        'site_locale'      => 'Select your language',
+        'enable_google2fa' => 'Enable Google Two Factor Authentication',
+        'cache_driver'     => 'Cache Driver',
+        'session_driver'   => 'Session Driver',
+        'mail_driver'      => 'Mail Driver',
+        'mail_host'        => 'Mail Host',
+        'mail_address'     => 'Mail From Address',
+        'mail_username'    => 'Mail Username',
+        'mail_password'    => 'Mail Password',
+    ],
+
+    // Login form fields
+    'login' => [
+        'login'         => 'Username or Email',
+        'email'         => 'Email',
+        'password'      => 'Password',
+        '2fauth'        => 'Authentication Code',
+        'invalid'       => 'Invalid username or password',
+        'invalid-token' => 'Invalid token',
+        'cookies'       => 'You must enable cookies to login.',
+        'rate-limit'    => 'Rate limit exceeded.',
+    ],
+
+    // Incidents form fields
+    'incidents' => [
+        'name'               => 'Name',
+        'status'             => 'Status',
+        'component'          => 'Component',
+        'message'            => 'Message',
+        'message-help'       => 'You may also use Markdown.',
+        'scheduled_at'       => 'When to schedule the maintenance for?',
+        'incident_time'      => 'When did this incident occur?',
+        'notify_subscribers' => 'Notify subscribers?',
+        'visibility'         => 'Incident Visibility',
+        'public'             => 'Viewable by public',
+        'logged_in_only'     => 'Only visible to logged in users',
+        'templates'          => [
+            'name'     => 'Name',
+            'template' => 'Template',
+            'twig'     => 'Incident Templates can make use of the <a href="http://twig.sensiolabs.org/" target="_blank">Twig</a> templating language.',
+        ],
+    ],
+
+    // Components form fields
+    'components' => [
+        'name'        => 'Name',
+        'status'      => 'Status',
+        'group'       => 'Group',
+        'description' => 'Description',
+        'link'        => 'Link',
+        'tags'        => 'Tags',
+        'tags-help'   => 'Comma separated.',
+        'enabled'     => 'Component enabled?',
+
+        'groups' => [
+            'name'               => 'Name',
+            'collapsing'         => 'Choose visibility of the group',
+            'visible'            => 'Always expanded',
+            'collapsed'          => 'Collapse the group by default',
+            'collapsed_incident' => 'Collapse the group, but expand if there are issues',
+        ],
+    ],
+
+    // Metric form fields
+    'metrics' => [
+        'name'             => 'Name',
+        'suffix'           => 'Suffix',
+        'description'      => 'Description',
+        'description-help' => 'You may also use Markdown.',
+        'display-chart'    => 'Display chart on status page?',
+        'default-value'    => 'Default value',
+        'calc_type'        => 'Calculation of metrics',
+        'type_sum'         => 'Sum',
+        'type_avg'         => 'Average',
+        'places'           => 'Decimal places',
+        'default_view'     => 'Default view',
+        'threshold'        => 'How many minutes of threshold between metric points?',
+
+        'points' => [
+            'value' => 'Value',
+        ],
+    ],
+
+    // Settings
+    'settings' => [
+        /// Application setup
+        'app-setup' => [
+            'site-name'              => 'Site Name',
+            'site-url'               => 'Site URL',
+            'display-graphs'         => 'Display graphs on status page?',
+            'about-this-page'        => 'About this page',
+            'days-of-incidents'      => 'How many days of incidents to show?',
+            'banner'                 => 'Banner Image',
+            'banner-help'            => "It's recommended that you upload files no bigger than 930px wide .",
+            'subscribers'            => 'Allow people to signup to email notifications?',
+            'automatic_localization' => 'Automatically localise your status page to your visitor\'s language?',
+        ],
+        'analytics' => [
+            'analytics_google'       => 'Google Analytics code',
+            'analytics_gosquared'    => 'GoSquared Analytics code',
+            'analytics_piwik_url'    => 'URL of your Piwik instance (without http(s)://)',
+            'analytics_piwik_siteid' => 'Piwik\'s site id',
+        ],
+        'localization' => [
+            'site-timezone'        => 'Site timezone',
+            'site-locale'          => 'Site language',
+            'date-format'          => 'Date format',
+            'incident-date-format' => 'Incident timestamp format',
+        ],
+        'security' => [
+            'allowed-domains'      => 'Allowed domains',
+            'allowed-domains-help' => 'Comma separated. The domain set above is automatically allowed by default.',
+        ],
+        'stylesheet' => [
+            'custom-css' => 'Custom Stylesheet',
+        ],
+        'theme' => [
+            'background-color'        => 'Background Color',
+            'background-fills'        => 'Background fills (components, incidents, footer)',
+            'banner-background-color' => 'Banner background color',
+            'banner-padding'          => 'Banner padding',
+            'fullwidth-banner'        => 'Enable fullwidth banner?',
+            'text-color'              => 'Text Color',
+            'dashboard-login'         => 'Show dashboard button in the footer?',
+            'reds'                    => 'Red (used for errors)',
+            'blues'                   => 'Blue (used for information)',
+            'greens'                  => 'Green (used for success)',
+            'yellows'                 => 'Yellow (used for alerts)',
+            'oranges'                 => 'Orange (used for notices)',
+            'metrics'                 => 'Metrics fill',
+            'links'                   => 'Links',
+        ],
+    ],
+
+    'user' => [
+        'username'       => 'Username',
+        'email'          => 'Email',
+        'password'       => 'Password',
+        'api-token'      => 'API Token',
+        'api-token-help' => 'Regenerating your API token will prevent existing applications from accessing Cachet.',
+        'gravatar'       => 'Change your profile picture at Gravatar.',
+        'user_level'     => 'User Level',
+        'levels'         => [
+            'admin' => 'Admin',
+            'user'  => 'User',
+        ],
+        '2fa' => [
+            'help' => 'Enabling two factor authentication increases security of your account. You will need to download <a href="https://support.google.com/accounts/answer/1066447?hl=en">Google Authenticator</a> or a similar app on to your mobile device. When you login you will be asked to provide a token generated by the app.',
+        ],
+        'team' => [
+            'description' => 'Invite your team members by entering their email addresses here.',
+            'email'       => 'Email #:id',
+        ],
+    ],
+
+    // Buttons
+    'add'    => 'Add',
+    'save'   => 'Save',
+    'update' => 'Update',
+    'create' => 'Create',
+    'edit'   => 'Edit',
+    'delete' => 'Delete',
+    'submit' => 'Submit',
+    'cancel' => 'Cancel',
+    'remove' => 'Remove',
+    'invite' => 'Invite',
+    'signup' => 'Sign Up',
+
+    // Other
+    'optional' => '* Optional',
+];

resources/lang/ar-SA/pagination.php

@@ -0,0 +1,28 @@
+<?php
+
+/*
+ * This file is part of Cachet.
+ *
+ * (c) Alt Three Services Limited
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+return [
+
+    /*
+    |--------------------------------------------------------------------------
+    | Pagination Language Lines
+    |--------------------------------------------------------------------------
+    |
+    | The following language lines are used by the paginator library to build
+    | the simple pagination links. You are free to change them to anything
+    | you want to customize your views to better match your application.
+    |
+    */
+
+    'previous' => '&laquo; Previous',
+    'next'     => 'Next &raquo;',
+
+];

resources/lang/ar-SA/setup.php

@@ -0,0 +1,23 @@
+<?php
+
+/*
+ * This file is part of Cachet.
+ *
+ * (c) Alt Three Services Limited
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+return [
+    'setup'             => 'Setup',
+    'title'             => 'Setup Cachet',
+    'service_details'   => 'Service Details',
+    'env_setup'         => 'Environment Setup',
+    'status_page_setup' => 'Status Page Setup',
+    'show_support'      => 'Show support for Cachet?',
+    'admin_account'     => 'Administrator Account',
+    'complete_setup'    => 'Complete Setup',
+    'completed'         => 'Cachet has been configured successfully!',
+    'finish_setup'      => 'Go to dashboard',
+];

resources/lang/ar-SA/validation.php

@@ -0,0 +1,122 @@
+<?php
+
+/*
+ * This file is part of Cachet.
+ *
+ * (c) Alt Three Services Limited
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+return [
+
+    /*
+    |--------------------------------------------------------------------------
+    | Validation Language Lines
+    |--------------------------------------------------------------------------
+    |
+    | The following language lines contain the default error messages used by
+    | the validator class. Some of these rules have multiple versions such
+    | as the size rules. Feel free to tweak each of these messages here.
+    |
+    */
+
+    'accepted'   => 'The :attribute must be accepted.',
+    'active_url' => 'The :attribute is not a valid URL.',
+    'after'      => 'The :attribute must be a date after :date.',
+    'alpha'      => 'The :attribute may only contain letters.',
+    'alpha_dash' => 'The :attribute may only contain letters, numbers, and dashes.',
+    'alpha_num'  => 'The :attribute may only contain letters and numbers.',
+    'array'      => 'The :attribute must be an array.',
+    'before'     => 'The :attribute must be a date before :date.',
+    'between'    => [
+        'numeric' => 'The :attribute must be a date before :date.',
+        'file'    => 'The :attribute must be between :min and :max.',
+        'string'  => 'The :attribute must be between :min and :max kilobytes.',
+        'array'   => 'The :attribute must have between :min and :max items.',
+    ],
+    'boolean'        => 'The :attribute must have between :min and :max items.',
+    'confirmed'      => 'The :attribute field must be true or false.',
+    'date'           => 'The :attribute confirmation does not match.',
+    'date_format'    => 'The :attribute is not a valid date.',
+    'different'      => 'The :attribute does not match the format :format.',
+    'digits'         => 'The :attribute and :other must be different.',
+    'digits_between' => 'The :attribute must be :digits digits.',
+    'email'          => 'The :attribute must be between :min and :max digits.',
+    'exists'         => 'The :attribute must be a valid email address.',
+    'distinct'       => 'The :attribute field has a duplicate value.',
+    'filled'         => 'The :attribute format is invalid.',
+    'image'          => 'The :attribute must be an image.',
+    'in'             => 'The :attribute must be an image.',
+    'in_array'       => 'The :attribute field does not exist in :other.',
+    'integer'        => 'The selected :attribute is invalid.',
+    'ip'             => 'The :attribute must be an integer.',
+    'json'           => 'The :attribute must be a valid JSON string.',
+    'max'            => [
+        'numeric' => 'The :attribute must be a valid IP address.',
+        'file'    => 'The :attribute may not be greater than :max.',
+        'string'  => 'The :attribute may not be greater than :max kilobytes.',
+        'array'   => 'The :attribute may not have more than :max items.',
+    ],
+    'mimes' => 'The :attribute may not have more than :max items.',
+    'min'   => [
+        'numeric' => 'The :attribute must be a file of type: :values.',
+        'file'    => 'The :attribute must be at least :min kilobytes.',
+        'string'  => 'The :attribute must be at least :min kilobytes.',
+        'array'   => 'The :attribute must be at least :min characters.',
+    ],
+    'not_in'               => 'The :attribute must have at least :min items.',
+    'numeric'              => 'The selected :attribute is invalid.',
+    'present'              => 'The :attribute field must be present.',
+    'regex'                => 'The :attribute must be a number.',
+    'required'             => 'The :attribute format is invalid.',
+    'required_if'          => 'The :attribute field is required.',
+    'required_unless'      => 'The :attribute field is required unless :other is in :values.',
+    'required_with'        => 'The :attribute field is required when :other is :value.',
+    'required_with_all'    => 'The :attribute field is required when :values is present.',
+    'required_without'     => 'The :attribute field is required when :values is present.',
+    'required_without_all' => 'The :attribute field is required when :values is not present.',
+    'same'                 => 'The :attribute field is required when none of :values are present.',
+    'size'                 => [
+        'numeric' => 'The :attribute and :other must match.',
+        'file'    => 'The :attribute must be :size kilobytes.',
+        'string'  => 'The :attribute must be :size characters.',
+        'array'   => 'The :attribute must be :size characters.',
+    ],
+    'string'   => 'The :attribute must contain :size items.',
+    'timezone' => 'The :attribute must be a valid zone.',
+    'unique'   => 'The :attribute has already been taken.',
+    'url'      => 'The :attribute format is invalid.',
+
+    /*
+    |--------------------------------------------------------------------------
+    | Custom Validation Language Lines
+    |--------------------------------------------------------------------------
+    |
+    | Here you may specify custom validation messages for attributes using the
+    | convention "attribute.rule" to name the lines. This makes it quick to
+    | specify a specific custom language line for a given attribute rule.
+    |
+    */
+
+    'custom' => [
+        'attribute-name' => [
+            'rule-name' => 'custom-message',
+        ],
+    ],
+
+    /*
+    |--------------------------------------------------------------------------
+    | Custom Validation Attributes
+    |--------------------------------------------------------------------------
+    |
+    | The following language lines are used to swap attribute place-holders
+    | with something more reader friendly such as E-Mail Address instead
+    | of "email". This simply helps us make messages a little cleaner.
+    |
+    */
+
+    'attributes' => [],
+
+];

resources/lang/ar/cachet.php

@@ -103,8 +103,8 @@ return [
     'users' => [
         'email' => [
             'invite' => [
-                'text'           => "You have been invited to the team :app_name status page, to sign up follow the next link.\n:link\nThank you, :app_name",
-                'html'           => '<p>You have been invited to the team :app_name status page, to sign up follow the next link.</p><p><a href=":link">:link</a></p><p>Thank you, :app_name</p>',
+                'text' => "You have been invited to the team :app_name status page, to sign up follow the next link.\n:link\nThank you, :app_name",
+                'html' => '<p>You have been invited to the team :app_name status page, to sign up follow the next link.</p><p><a href=":link">:link</a></p><p>Thank you, :app_name</p>',
             ],
         ],
     ],

resources/lang/ar/dashboard.php

@@ -224,7 +224,7 @@ return [
             'contributors'  => 'Contributors',
             'license'       => 'Cachet is a BSD-3-licensed open source project, released by <a href="https://alt-three.com/?utm_source=cachet&utm_medium=credits&utm_campaign=Cachet%20Credit%20Dashboard" target="_blank">Alt Three Services Limited</a>.',
             'backers-title' => 'Backers & Sponsors',
-            'backers'       => 'If you\'d like to support future development, check out the <a href="https://patreon.com/jbrooksuk" target="_blank">Cachet Patreon</a> campaign.',
+            'backers'       => 'If you\'d like to support future development, check out the CrowdIn and GitHub.',
             'thank-you'     => 'Thank you to each and every one of the :count contributors.',
         ],
     ],
@@ -251,8 +251,6 @@ return [
 
     // Widgets
     'widgets' => [
-        'support'          => 'Support Cachet',
-        'support_subtitle' => 'Check out our <strong><a href="https://patreon.com/jbrooksuk" target="_blank">Patreon</a></strong> page!',
         'news'             => 'Latest News',
         'news_subtitle'    => 'Get the latest updates',
     ],

resources/lang/ar/forms.php

@@ -118,10 +118,10 @@ return [
             'analytics_piwik_siteid' => 'Piwik\'s site id',
         ],
         'localization' => [
-            'site-timezone'          => 'Site timezone',
-            'site-locale'            => 'Site language',
-            'date-format'            => 'Date format',
-            'incident-date-format'   => 'Incident timestamp format',
+            'site-timezone'        => 'Site timezone',
+            'site-locale'          => 'Site language',
+            'date-format'          => 'Date format',
+            'incident-date-format' => 'Incident timestamp format',
         ],
         'security' => [
             'allowed-domains'      => 'Allowed domains',

resources/lang/ca-ES/cachet.php

@@ -0,0 +1,144 @@
+<?php
+
+/*
+ * This file is part of Cachet.
+ *
+ * (c) Alt Three Services Limited
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+return [
+    // Components
+    'components' => [
+        'last_updated' => 'Last updated :timestamp',
+        'status'       => [
+            1 => 'Operational',
+            2 => 'Performance Issues',
+            3 => 'Partial Outage',
+            4 => 'Major Outage',
+        ],
+        'group' => [
+            'other' => 'Other Components',
+        ],
+    ],
+
+    // Incidents
+    'incidents' => [
+        'none'          => 'No incidents reported',
+        'past'          => 'Past Incidents',
+        'previous_week' => 'Previous Week',
+        'next_week'     => 'Next Week',
+        'scheduled'     => 'Scheduled Maintenance',
+        'scheduled_at'  => ', scheduled :timestamp',
+        'status'        => [
+            0 => 'Scheduled', // TODO: Hopefully remove this.
+            1 => 'Investigating',
+            2 => 'Identified',
+            3 => 'Watching',
+            4 => 'Fixed',
+        ],
+    ],
+
+    // Service Status
+    'service' => [
+        'good'  => '[0,1] System operational|[2,Inf] All systems are operational',
+        'bad'   => '[0,1] The system is currently experiencing issues|[2,Inf] Some systems are experiencing issues',
+        'major' => '[0,1] The service experiencing a major outage|[2,Inf] Some systems are experiencing a major outage',
+    ],
+
+    'api' => [
+        'regenerate' => 'Regenerate API Key',
+        'revoke'     => 'Revoke API Key',
+    ],
+
+    // Metrics
+    'metrics' => [
+        'filter' => [
+            'last_hour' => 'Last Hour',
+            'hourly'    => 'Last 12 Hours',
+            'weekly'    => 'Week',
+            'monthly'   => 'Month',
+        ],
+    ],
+
+    // Subscriber
+    'subscriber' => [
+        'subscribe' => 'Subscribe to get the most recent updates',
+        'button'    => 'Subscribe',
+        'manage'    => [
+            'no_subscriptions' => 'You\'re currently subscribed to all updates.',
+            'my_subscriptions' => 'You\'re currently subscribed to the following updates.',
+        ],
+        'email' => [
+            'subscribe'          => 'Subscribe to email updates.',
+            'subscribed'         => 'You\'ve been subscribed to email notifications, please check your email to confirm your subscription.',
+            'verified'           => 'Your email subscription has been confirmed. Thank you!',
+            'manage'             => 'Manage your subscription',
+            'unsubscribe'        => 'Unsubscribe from email updates.',
+            'unsubscribed'       => 'Your email subscription has been cancelled.',
+            'failure'            => 'Something went wrong with the subscription.',
+            'already-subscribed' => 'Cannot subscribe :email because they\'re already subscribed.',
+            'verify'             => [
+                'text'   => "Please confirm your email subscription to :app_name status updates.\n:link",
+                'html'   => '<p>Please confirm your email subscription to :app_name status updates.</p>',
+                'button' => 'Confirm Subscription',
+            ],
+            'maintenance' => [
+                'subject' => '[Maintenance Scheduled] :name',
+            ],
+            'incident' => [
+                'subject' => '[New Incident] :status: :name',
+            ],
+            'component' => [
+                'subject'       => 'Component Status Update',
+                'text'          => 'The component :component_name has seen a status change. The component is now at :component_human_status.\nThank you, :app_name',
+                'html'          => '<p>The component :component_name has seen a status change. The component is now at :component_human_status.</p><p>Thank you, :app_name</p>',
+                'tooltip-title' => 'Subscribe to notifications for :component_name.',
+            ],
+        ],
+    ],
+
+    'users' => [
+        'email' => [
+            'invite' => [
+                'text' => "You have been invited to the team :app_name status page, to sign up follow the next link.\n:link\nThank you, :app_name",
+                'html' => '<p>You have been invited to the team :app_name status page, to sign up follow the next link.</p><p><a href=":link">:link</a></p><p>Thank you, :app_name</p>',
+            ],
+        ],
+    ],
+
+    'signup' => [
+        'title'    => 'Sign Up',
+        'username' => 'Username',
+        'email'    => 'Email',
+        'password' => 'Password',
+        'success'  => 'Your account has been created.',
+        'failure'  => 'Something went wrong with the signup.',
+    ],
+
+    'system' => [
+        'update' => 'There is a newer version of Cachet available. You can learn how to update <a href="https://docs.cachethq.io/docs/updating-cachet">here</a>!',
+    ],
+
+    // Modal
+    'modal' => [
+        'close'     => 'Close',
+        'subscribe' => [
+            'title'  => 'Subscribe to component updates',
+            'body'   => 'Enter your email address to subscribe to updates for this component. If you\'re already subscribed, you\'ll already receive emails for this component.',
+            'button' => 'Subscribe',
+        ],
+    ],
+
+    // Other
+    'home'            => 'Home',
+    'description'     => 'Stay up to date with the latest service updates from :app.',
+    'powered_by'      => 'Powered by <a href="https://cachethq.io" class="links">Cachet</a>.',
+    'about_this_site' => 'About This Site',
+    'rss-feed'        => 'RSS',
+    'atom-feed'       => 'Atom',
+    'feed'            => 'Status Feed',
+
+];

resources/lang/ca-ES/dashboard.php

@@ -0,0 +1,273 @@
+<?php
+
+/*
+ * This file is part of Cachet.
+ *
+ * (c) Alt Three Services Limited
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+return [
+
+    'dashboard' => 'Dashboard',
+
+    // Incidents
+    'incidents' => [
+        'title'                    => 'Incidents &amp; Schedule',
+        'incidents'                => 'Incidents',
+        'logged'                   => '{0} There are no incidents, good work.|You have logged one incident.|You have reported <strong>:count</strong> incidents.',
+        'incident-create-template' => 'Create Template',
+        'incident-templates'       => 'Incident Templates',
+        'add'                      => [
+            'title'   => 'Report an incident',
+            'success' => 'Incident added.',
+            'failure' => 'There was an error adding the incident, please try again.',
+        ],
+        'edit' => [
+            'title'   => 'Edit an incident',
+            'success' => 'Incident updated.',
+            'failure' => 'There was an error editing the incident, please try again.',
+        ],
+        'delete' => [
+            'success' => 'The incident has been deleted and will not show on your status page.',
+            'failure' => 'The incident could not be deleted, please try again.',
+        ],
+
+        // Incident templates
+        'templates' => [
+            'title' => 'Incident Templates',
+            'add'   => [
+                'title'   => 'Create an incident template',
+                'message' => 'You should add an incident template.',
+                'success' => 'Your new incident template has been created.',
+                'failure' => 'Something went wrong with the incident template.',
+            ],
+            'edit' => [
+                'title'   => 'Edit Template',
+                'success' => 'The incident template has been updated.',
+                'failure' => 'Something went wrong updating the incident template',
+            ],
+            'delete' => [
+                'success' => 'The incident template has been deleted.',
+                'failure' => 'The incident template could not be deleted, please try again.',
+            ],
+        ],
+    ],
+
+    // Incident Maintenance
+    'schedule' => [
+        'schedule'     => 'Scheduled Maintenance',
+        'logged'       => '{0} There are no schedules, good work.|You have logged one schedule.|You have reported <strong>:count</strong> schedules.',
+        'scheduled_at' => 'Scheduled at :timestamp',
+        'add'          => [
+            'title'   => 'Add Scheduled Maintenance',
+            'success' => 'Schedule added.',
+            'failure' => 'Something went wrong adding the schedule, please try again.',
+        ],
+        'edit' => [
+            'title'   => 'Edit Scheduled Maintenance',
+            'success' => 'Schedule has been updated!',
+            'failure' => 'Something went wrong editing the schedule, please try again.',
+        ],
+        'delete' => [
+            'success' => 'The scheduled maintenance has been deleted and will not show on your status page.',
+            'failure' => 'The scheduled maintenance could not be deleted, please try again.',
+        ],
+    ],
+
+    // Components
+    'components' => [
+        'components'         => 'Components',
+        'component_statuses' => 'Component Statuses',
+        'listed_group'       => 'Grouped under :name',
+        'add'                => [
+            'title'   => 'Add a component',
+            'message' => 'You should add a component.',
+            'success' => 'Component created.',
+            'failure' => 'Something went wrong with the component group, please try again.',
+        ],
+        'edit' => [
+            'title'   => 'Edit a component',
+            'success' => 'Component updated.',
+            'failure' => 'Something went wrong with the component group, please try again.',
+        ],
+        'delete' => [
+            'success' => 'The component has been deleted!',
+            'failure' => 'The component could not be deleted, please try again.',
+        ],
+
+        // Component groups
+        'groups' => [
+            'groups'        => 'Component group|Component groups',
+            'no_components' => 'You should add a component group.',
+            'add'           => [
+                'title'   => 'Add a component group',
+                'success' => 'Component group added.',
+                'failure' => 'Something went wrong with the component group, please try again.',
+            ],
+            'edit' => [
+                'title'   => 'Edit a component group',
+                'success' => 'Component group updated.',
+                'failure' => 'Something went wrong with the component group, please try again.',
+            ],
+            'delete' => [
+                'success' => 'Component group has been deleted!',
+                'failure' => 'The component group could not be deleted, please try again.',
+            ],
+        ],
+    ],
+
+    // Metrics
+    'metrics' => [
+        'metrics' => 'Metrics',
+        'add'     => [
+            'title'   => 'Create a metric',
+            'message' => 'You should add a metric.',
+            'success' => 'Metric created.',
+            'failure' => 'Something went wrong with the metric, please try again.',
+        ],
+        'edit' => [
+            'title'   => 'Edit a metric',
+            'success' => 'Metric updated.',
+            'failure' => 'Something went wrong with the metric, please try again.',
+        ],
+        'delete' => [
+            'success' => 'The metric has been deleted and will no longer display on your status page.',
+            'failure' => 'The metric could not be deleted, please try again.',
+        ],
+    ],
+    // Subscribers
+    'subscribers' => [
+        'subscribers'      => 'Subscribers',
+        'description'      => 'Subscribers will receive email updates when incidents are created or components are updated.',
+        'verified'         => 'Verified',
+        'not_verified'     => 'Not verified',
+        'subscriber'       => ':email, subscribed :date',
+        'no_subscriptions' => 'Subscribed to all updates',
+        'add'              => [
+            'title'   => 'Add a new subscriber',
+            'success' => 'Subscriber has been added!',
+            'failure' => 'Something went wrong adding the subscriber, please try again.',
+            'help'    => 'Enter each subscriber on a new line.',
+        ],
+        'edit' => [
+            'title'   => 'Update subscriber',
+            'success' => 'Subscriber has been updated!',
+            'failure' => 'Something went wrong editing the subscriber, please try again.',
+        ],
+    ],
+
+    // Team
+    'team' => [
+        'team'        => 'Team',
+        'member'      => 'Member',
+        'profile'     => 'Profile',
+        'description' => 'Team Members will be able to add, modify &amp; edit components and incidents.',
+        'add'         => [
+            'title'   => 'Add a new team member',
+            'success' => 'Team member added.',
+            'failure' => 'The team member could not be added, please try again.',
+        ],
+        'edit' => [
+            'title'   => 'Update profile',
+            'success' => 'Profile updated.',
+            'failure' => 'Something went wrong updating the profile, please try again.',
+        ],
+        'delete' => [
+            'success' => 'Team member has been deleted and will no longer have access to the dashboard!',
+            'failure' => 'The team member could not be added, please try again.',
+        ],
+        'invite' => [
+            'title'   => 'Invite a new team member',
+            'success' => 'An invite has been sent',
+            'failure' => 'The invite could not be sent, please try again.',
+        ],
+    ],
+
+    // Settings
+    'settings' => [
+        'settings'  => 'Settings',
+        'app-setup' => [
+            'app-setup'   => 'Application Setup',
+            'images-only' => 'Only images may be uploaded.',
+            'too-big'     => 'The file you uploaded is too big. Upload an image smaller than :size',
+        ],
+        'analytics' => [
+            'analytics' => 'Analytics',
+        ],
+        'localization' => [
+            'localization' => 'Localization',
+        ],
+        'customization' => [
+            'customization' => 'Customization',
+            'header'        => 'Custom Header HTML',
+            'footer'        => 'Custom Footer HTML',
+        ],
+        'security' => [
+            'security'   => 'Security',
+            'two-factor' => 'Users without two-factor authentication',
+        ],
+        'stylesheet' => [
+            'stylesheet' => 'Stylesheet',
+        ],
+        'theme' => [
+            'theme' => 'Theme',
+        ],
+        'edit' => [
+            'success' => 'Settings saved.',
+            'failure' => 'Settings could not be saved.',
+        ],
+        'credits' => [
+            'credits'       => 'Credits',
+            'contributors'  => 'Contributors',
+            'license'       => 'Cachet is a BSD-3-licensed open source project, released by <a href="https://alt-three.com/?utm_source=cachet&utm_medium=credits&utm_campaign=Cachet%20Credit%20Dashboard" target="_blank">Alt Three Services Limited</a>.',
+            'backers-title' => 'Backers & Sponsors',
+            'backers'       => 'If you\'d like to support future development, check out the CrowdIn and GitHub.',
+            'thank-you'     => 'Thank you to each and every one of the :count contributors.',
+        ],
+    ],
+
+    // Login
+    'login' => [
+        'login'      => 'Login',
+        'logged_in'  => 'You\'re logged in.',
+        'welcome'    => 'Welcome Back!',
+        'two-factor' => 'Please enter your token.',
+    ],
+
+    // Sidebar footer
+    'help'        => 'Help',
+    'status_page' => 'Status Page',
+    'logout'      => 'Logout',
+
+    // Notifications
+    'notifications' => [
+        'notifications' => 'Notifications',
+        'awesome'       => 'Awesome.',
+        'whoops'        => 'Whoops.',
+    ],
+
+    // Widgets
+    'widgets' => [
+        'news'             => 'Latest News',
+        'news_subtitle'    => 'Get the latest update',
+    ],
+
+    // Welcome modal
+    'welcome' => [
+        'welcome' => 'Welcome to your new Status page!',
+        'message' => 'Your status page is almost ready! You might want to configure these extra settings',
+        'close'   => 'Take me straight to my dashboard',
+        'steps'   => [
+            'component'  => 'Create components',
+            'incident'   => 'Create incidents',
+            'customize'  => 'Customize',
+            'team'       => 'Add users',
+            'api'        => 'Generate API token',
+            'two-factor' => 'Two Factor Authentication',
+        ],
+    ],
+
+];

resources/lang/ca-ES/forms.php

@@ -0,0 +1,192 @@
+<?php
+
+/*
+ * This file is part of Cachet.
+ *
+ * (c) Alt Three Services Limited
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+return [
+
+    // Setup form fields
+    'setup' => [
+        'email'            => 'Email',
+        'username'         => 'Username',
+        'password'         => 'Password',
+        'site_name'        => 'Site Name',
+        'site_domain'      => 'Site Domain',
+        'site_timezone'    => 'Select your timezone',
+        'site_locale'      => 'Select your language',
+        'enable_google2fa' => 'Enable Google Two Factor Authentication',
+        'cache_driver'     => 'Cache Driver',
+        'session_driver'   => 'Session Driver',
+        'mail_driver'      => 'Mail Driver',
+        'mail_host'        => 'Mail Host',
+        'mail_address'     => 'Mail From Address',
+        'mail_username'    => 'Mail Username',
+        'mail_password'    => 'Mail Password',
+    ],
+
+    // Login form fields
+    'login' => [
+        'login'         => 'Username or Email',
+        'email'         => 'Email',
+        'password'      => 'Password',
+        '2fauth'        => 'Authentication Code',
+        'invalid'       => 'Invalid username or password',
+        'invalid-token' => 'Invalid token',
+        'cookies'       => 'Heu d\'habilitar les galetes (cookies) per poder iniciar sessió.',
+        'rate-limit'    => 'Rate limit exceeded.',
+    ],
+
+    // Incidents form fields
+    'incidents' => [
+        'name'               => 'Name',
+        'status'             => 'Status',
+        'component'          => 'Component',
+        'message'            => 'Message',
+        'message-help'       => 'You may also use Markdown.',
+        'scheduled_at'       => 'When to schedule the maintenance for?',
+        'incident_time'      => 'When did this incident occur?',
+        'notify_subscribers' => 'Notify subscribers?',
+        'visibility'         => 'Incident Visibility',
+        'public'             => 'Viewable by public',
+        'logged_in_only'     => 'Only visible to logged in users',
+        'templates'          => [
+            'name'     => 'Name',
+            'template' => 'Template',
+            'twig'     => 'Incident Templates can make use of the <a href="http://twig.sensiolabs.org/" target="_blank">Twig</a> templating language.',
+        ],
+    ],
+
+    // Components form fields
+    'components' => [
+        'name'        => 'Name',
+        'status'      => 'Status',
+        'group'       => 'Group',
+        'description' => 'Description',
+        'link'        => 'Link',
+        'tags'        => 'Tags',
+        'tags-help'   => 'Comma separated.',
+        'enabled'     => 'Component enabled?',
+
+        'groups' => [
+            'name'               => 'Name',
+            'collapsing'         => 'Choose visibility of the group',
+            'visible'            => 'Always expanded',
+            'collapsed'          => 'Collapse the group by default',
+            'collapsed_incident' => 'Collapse the group, but expand if there are issues',
+        ],
+    ],
+
+    // Metric form fields
+    'metrics' => [
+        'name'             => 'Name',
+        'suffix'           => 'Suffix',
+        'description'      => 'Description',
+        'description-help' => 'You may also use Markdown.',
+        'display-chart'    => 'Display chart on status page?',
+        'default-value'    => 'Default value',
+        'calc_type'        => 'Calculation of metrics',
+        'type_sum'         => 'Sum',
+        'type_avg'         => 'Average',
+        'places'           => 'Decimal places',
+        'default_view'     => 'Default view',
+        'threshold'        => 'How many minutes of threshold between metric points?',
+
+        'points' => [
+            'value' => 'Value',
+        ],
+    ],
+
+    // Settings
+    'settings' => [
+        /// Application setup
+        'app-setup' => [
+            'site-name'              => 'Site Name',
+            'site-url'               => 'Site URL',
+            'display-graphs'         => 'Display graphs on status page?',
+            'about-this-page'        => 'About this page',
+            'days-of-incidents'      => 'How many days of incidents to show?',
+            'banner'                 => 'Banner Image',
+            'banner-help'            => "It's recommended that you upload files no bigger than 930px wide .",
+            'subscribers'            => 'Allow people to signup to email notifications?',
+            'automatic_localization' => 'Automatically localise your status page to your visitor\'s language?',
+        ],
+        'analytics' => [
+            'analytics_google'       => 'Google Analytics code',
+            'analytics_gosquared'    => 'GoSquared Analytics code',
+            'analytics_piwik_url'    => 'URL of your Piwik instance (without http(s)://)',
+            'analytics_piwik_siteid' => 'Piwik\'s site id',
+        ],
+        'localization' => [
+            'site-timezone'        => 'Site timezone',
+            'site-locale'          => 'Site language',
+            'date-format'          => 'Date format',
+            'incident-date-format' => 'Incident timestamp format',
+        ],
+        'security' => [
+            'allowed-domains'      => 'Allowed domains',
+            'allowed-domains-help' => 'Comma separated. The domain set above is automatically allowed by default.',
+        ],
+        'stylesheet' => [
+            'custom-css' => 'Custom Stylesheet',
+        ],
+        'theme' => [
+            'background-color'        => 'Background Color',
+            'background-fills'        => 'Background fills (components, incidents, footer)',
+            'banner-background-color' => 'Banner background color',
+            'banner-padding'          => 'Farciment (padding) del banner',
+            'fullwidth-banner'        => 'Enable fullwidth banner?',
+            'text-color'              => 'Text Color',
+            'dashboard-login'         => 'Show dashboard button in the footer?',
+            'reds'                    => 'Red (used for errors)',
+            'blues'                   => 'Blue (used for information)',
+            'greens'                  => 'Green (used for success)',
+            'yellows'                 => 'Yellow (used for alerts)',
+            'oranges'                 => 'Orange (used for notices)',
+            'metrics'                 => 'Metrics fill',
+            'links'                   => 'Links',
+        ],
+    ],
+
+    'user' => [
+        'username'       => 'Username',
+        'email'          => 'Email',
+        'password'       => 'Password',
+        'api-token'      => 'API Token',
+        'api-token-help' => 'Regenerating your API token will prevent existing applications from accessing Cachet.',
+        'gravatar'       => 'Change your profile picture at Gravatar.',
+        'user_level'     => 'User Level',
+        'levels'         => [
+            'admin' => 'Admin',
+            'user'  => 'User',
+        ],
+        '2fa' => [
+            'help' => 'Enabling two factor authentication increases security of your account. You will need to download <a href="https://support.google.com/accounts/answer/1066447?hl=en">Google Authenticator</a> or a similar app on to your mobile device. When you login you will be asked to provide a token generated by the app.',
+        ],
+        'team' => [
+            'description' => 'Invite your team members by entering their email addresses here.',
+            'email'       => 'Email #:id',
+        ],
+    ],
+
+    // Buttons
+    'add'    => 'Add',
+    'save'   => 'Save',
+    'update' => 'Update',
+    'create' => 'Create',
+    'edit'   => 'Edit',
+    'delete' => 'Delete',
+    'submit' => 'Submit',
+    'cancel' => 'Cancel',
+    'remove' => 'Remove',
+    'invite' => 'Invite',
+    'signup' => 'Sign Up',
+
+    // Other
+    'optional' => '* Optional',
+];

resources/lang/ca-ES/pagination.php

@@ -0,0 +1,28 @@
+<?php
+
+/*
+ * This file is part of Cachet.
+ *
+ * (c) Alt Three Services Limited
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+return [
+
+    /*
+    |--------------------------------------------------------------------------
+    | Pagination Language Lines
+    |--------------------------------------------------------------------------
+    |
+    | The following language lines are used by the paginator library to build
+    | the simple pagination links. You are free to change them to anything
+    | you want to customize your views to better match your application.
+    |
+    */
+
+    'previous' => '&laquo; Previous',
+    'next'     => 'Next &raquo;',
+
+];

resources/lang/ca-ES/setup.php

@@ -0,0 +1,23 @@
+<?php
+
+/*
+ * This file is part of Cachet.
+ *
+ * (c) Alt Three Services Limited
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+return [
+    'setup'             => 'Setup',
+    'title'             => 'Setup Cachet',
+    'service_details'   => 'Service Details',
+    'env_setup'         => 'Environment Setup',
+    'status_page_setup' => 'Status Page Setup',
+    'show_support'      => 'Show support for Cachet?',
+    'admin_account'     => 'Administrator Account',
+    'complete_setup'    => 'Complete Setup',
+    'completed'         => 'Cachet has been configured successfully!',
+    'finish_setup'      => 'Go to dashboard',
+];

resources/lang/ca-ES/validation.php

@@ -0,0 +1,122 @@
+<?php
+
+/*
+ * This file is part of Cachet.
+ *
+ * (c) Alt Three Services Limited
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+return [
+
+    /*
+    |--------------------------------------------------------------------------
+    | Validation Language Lines
+    |--------------------------------------------------------------------------
+    |
+    | The following language lines contain the default error messages used by
+    | the validator class. Some of these rules have multiple versions such
+    | as the size rules. Feel free to tweak each of these messages here.
+    |
+    */
+
+    'accepted'   => 'The :attribute must be accepted.',
+    'active_url' => 'The :attribute is not a valid URL.',
+    'after'      => 'The :attribute must be a date after :date.',
+    'alpha'      => 'The :attribute may only contain letters.',
+    'alpha_dash' => 'The :attribute may only contain letters, numbers, and dashes.',
+    'alpha_num'  => 'The :attribute may only contain letters and numbers.',
+    'array'      => 'The :attribute must be an array.',
+    'before'     => 'The :attribute must be a date before :date.',
+    'between'    => [
+        'numeric' => 'The :attribute must be a date before :date.',
+        'file'    => 'The :attribute must be between :min and :max.',
+        'string'  => 'The :attribute must be between :min and :max kilobytes.',
+        'array'   => 'The :attribute must have between :min and :max items.',
+    ],
+    'boolean'        => 'The :attribute must have between :min and :max items.',
+    'confirmed'      => 'The :attribute field must be true or false.',
+    'date'           => 'The :attribute confirmation does not match.',
+    'date_format'    => 'The :attribute is not a valid date.',
+    'different'      => 'The :attribute does not match the format :format.',
+    'digits'         => 'The :attribute and :other must be different.',
+    'digits_between' => 'The :attribute must be :digits digits.',
+    'email'          => 'The :attribute must be between :min and :max digits.',
+    'exists'         => 'The :attribute must be a valid email address.',
+    'distinct'       => 'The :attribute field has a duplicate value.',
+    'filled'         => 'The :attribute format is invalid.',
+    'image'          => 'The :attribute must be an image.',
+    'in'             => 'The :attribute must be an image.',
+    'in_array'       => 'The :attribute field does not exist in :other.',
+    'integer'        => 'The selected :attribute is invalid.',
+    'ip'             => 'The :attribute must be an integer.',
+    'json'           => 'The :attribute must be a valid JSON string.',
+    'max'            => [
+        'numeric' => 'The :attribute must be a valid IP address.',
+        'file'    => 'The :attribute may not be greater than :max.',
+        'string'  => 'The :attribute may not be greater than :max kilobytes.',
+        'array'   => 'The :attribute may not have more than :max items.',
+    ],
+    'mimes' => 'The :attribute may not have more than :max items.',
+    'min'   => [
+        'numeric' => 'The :attribute must be a file of type: :values.',
+        'file'    => 'The :attribute must be at least :min kilobytes.',
+        'string'  => 'The :attribute must be at least :min kilobytes.',
+        'array'   => 'The :attribute must be at least :min characters.',
+    ],
+    'not_in'               => 'The :attribute must have at least :min items.',
+    'numeric'              => 'The selected :attribute is invalid.',
+    'present'              => 'The :attribute field must be present.',
+    'regex'                => 'The :attribute must be a number.',
+    'required'             => 'The :attribute format is invalid.',
+    'required_if'          => 'The :attribute field is required.',
+    'required_unless'      => 'The :attribute field is required unless :other is in :values.',
+    'required_with'        => 'The :attribute field is required when :other is :value.',
+    'required_with_all'    => 'The :attribute field is required when :values is present.',
+    'required_without'     => 'The :attribute field is required when :values is present.',
+    'required_without_all' => 'The :attribute field is required when :values is not present.',
+    'same'                 => 'The :attribute field is required when none of :values are present.',
+    'size'                 => [
+        'numeric' => 'The :attribute and :other must match.',
+        'file'    => 'The :attribute must be :size kilobytes.',
+        'string'  => 'The :attribute must be :size characters.',
+        'array'   => 'The :attribute must be :size characters.',
+    ],
+    'string'   => 'The :attribute must contain :size items.',
+    'timezone' => 'The :attribute must be a valid zone.',
+    'unique'   => 'The :attribute has already been taken.',
+    'url'      => 'The :attribute format is invalid.',
+
+    /*
+    |--------------------------------------------------------------------------
+    | Custom Validation Language Lines
+    |--------------------------------------------------------------------------
+    |
+    | Here you may specify custom validation messages for attributes using the
+    | convention "attribute.rule" to name the lines. This makes it quick to
+    | specify a specific custom language line for a given attribute rule.
+    |
+    */
+
+    'custom' => [
+        'attribute-name' => [
+            'rule-name' => 'custom-message',
+        ],
+    ],
+
+    /*
+    |--------------------------------------------------------------------------
+    | Custom Validation Attributes
+    |--------------------------------------------------------------------------
+    |
+    | The following language lines are used to swap attribute place-holders
+    | with something more reader friendly such as E-Mail Address instead
+    | of "email". This simply helps us make messages a little cleaner.
+    |
+    */
+
+    'attributes' => [],
+
+];

resources/lang/ca/cachet.php

@@ -103,8 +103,8 @@ return [
     'users' => [
         'email' => [
             'invite' => [
-                'text'           => "You have been invited to the team :app_name status page, to sign up follow the next link.\n:link\nThank you, :app_name",
-                'html'           => '<p>You have been invited to the team :app_name status page, to sign up follow the next link.</p><p><a href=":link">:link</a></p><p>Thank you, :app_name</p>',
+                'text' => "You have been invited to the team :app_name status page, to sign up follow the next link.\n:link\nThank you, :app_name",
+                'html' => '<p>You have been invited to the team :app_name status page, to sign up follow the next link.</p><p><a href=":link">:link</a></p><p>Thank you, :app_name</p>',
             ],
         ],
     ],

resources/lang/ca/dashboard.php

@@ -224,7 +224,7 @@ return [
             'contributors'  => 'Contributors',
             'license'       => 'Cachet is a BSD-3-licensed open source project, released by <a href="https://alt-three.com/?utm_source=cachet&utm_medium=credits&utm_campaign=Cachet%20Credit%20Dashboard" target="_blank">Alt Three Services Limited</a>.',
             'backers-title' => 'Backers & Sponsors',
-            'backers'       => 'If you\'d like to support future development, check out the <a href="https://patreon.com/jbrooksuk" target="_blank">Cachet Patreon</a> campaign.',
+            'backers'       => 'If you\'d like to support future development, check out the CrowdIn and GitHub.',
             'thank-you'     => 'Thank you to each and every one of the :count contributors.',
         ],
     ],
@@ -251,8 +251,6 @@ return [
 
     // Widgets
     'widgets' => [
-        'support'          => 'Support Cachet',
-        'support_subtitle' => 'Check out our <strong><a href="https://patreon.com/jbrooksuk" target="_blank">Patreon</a></strong> page!',
         'news'             => 'Latest News',
         'news_subtitle'    => 'Get the latest updates',
     ],

resources/lang/ca/forms.php

@@ -118,10 +118,10 @@ return [
             'analytics_piwik_siteid' => 'Identificador de lloc del Piwik',
         ],
         'localization' => [
-            'site-timezone'          => 'Seleccioneu el fus horari',
-            'site-locale'            => 'Idioma del lloc',
-            'date-format'            => 'Format de la data',
-            'incident-date-format'   => 'Format del fus horari dels incidents',
+            'site-timezone'        => 'Seleccioneu el fus horari',
+            'site-locale'          => 'Idioma del lloc',
+            'date-format'          => 'Format de la data',
+            'incident-date-format' => 'Format del fus horari dels incidents',
         ],
         'security' => [
             'allowed-domains'      => 'Dominis permesos',

resources/lang/cs-CZ/cachet.php

@@ -0,0 +1,144 @@
+<?php
+
+/*
+ * This file is part of Cachet.
+ *
+ * (c) Alt Three Services Limited
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+return [
+    // Components
+    'components' => [
+        'last_updated' => 'Poslední aktualizace :timestamp',
+        'status'       => [
+            1 => 'V provozu',
+            2 => 'Problémy s výkonem',
+            3 => 'Částečný výpadek',
+            4 => 'Závažný výpadek',
+        ],
+        'group' => [
+            'other' => 'Ostatní služby',
+        ],
+    ],
+
+    // Incidents
+    'incidents' => [
+        'none'          => 'Nejsou nahlášeny žádné incidenty',
+        'past'          => 'Minulé incidenty',
+        'previous_week' => 'Předchozí týden',
+        'next_week'     => 'Následující týden',
+        'scheduled'     => 'Plánovaná údržba',
+        'scheduled_at'  => ', plánované na :timestamp',
+        'status'        => [
+            0 => 'Naplánováno', // TODO: Hopefully remove this.
+            1 => 'Zkoumání příčiny',
+            2 => 'Problém identifikován',
+            3 => 'Sledování',
+            4 => 'Opraveno',
+        ],
+    ],
+
+    // Service Status
+    'service' => [
+        'good'  => '[0,1] Služba je v provozu|[2,Inf] Všechny služby fungují bez problémů',
+        'bad'   => '[0,1] Služba má problémy|[2,Inf] Některá ze služeb má problémy',
+        'major' => '[0,1] Služba má celkový výpadek|[2,Inf] Některé služby mají celkový výpadek',
+    ],
+
+    'api' => [
+        'regenerate' => 'Obnovit API klíč',
+        'revoke'     => 'Zrušit API klíč',
+    ],
+
+    // Metrics
+    'metrics' => [
+        'filter' => [
+            'last_hour' => 'Během poslední hodiny',
+            'hourly'    => 'Posledních 12 hodin',
+            'weekly'    => 'Týden',
+            'monthly'   => 'Měsíc',
+        ],
+    ],
+
+    // Subscriber
+    'subscriber' => [
+        'subscribe' => 'Přihlásit se k odběru upozornění',
+        'button'    => 'Přihlásit',
+        'manage'    => [
+            'no_subscriptions' => 'Aktuálně jsi přihlášen(a) ke všem upozorněním.',
+            'my_subscriptions' => 'Aktuálně jsi přihlášen(a) k následujícím upozorněním.',
+        ],
+        'email' => [
+            'subscribe'          => 'Přihlásit se k zasílání upozornění e-mailem.',
+            'subscribed'         => 'Proběhlo přihlášení k e-mailovým upozorněním, potvrďte ho prosím na vašem e-mailu.',
+            'verified'           => 'E-mail pro zasílání upozornění byl ověřen. Děkujeme!',
+            'manage'             => 'Spravovat e-mailové odběry',
+            'unsubscribe'        => 'Odhlásit z odběru e-mailových upozornění.',
+            'unsubscribed'       => 'Odběr e-mailových upozornění byl zrušen.',
+            'failure'            => 'Došlo k chybě při nastavení odběru e-mailů.',
+            'already-subscribed' => 'Nelze přihlásit k odběru :email, protože je již přihlášen.',
+            'verify'             => [
+                'text'   => "Potvrď prosím svůj email k odběru upozornění od :app_name.\n:link",
+                'html'   => '<p>Prosím potvrď svůj email k odběru upozornění pro :app_name.</p>',
+                'button' => 'Potvrdit odběr',
+            ],
+            'maintenance' => [
+                'subject' => '[Naplánovaná odstávka] :name',
+            ],
+            'incident' => [
+                'subject' => '[Nový incident] :status: :name',
+            ],
+            'component' => [
+                'subject'       => 'Aktualizace stavu služby',
+                'text'          => 'Byl změněn stav služby :component_name. Služba má nyní stav :component_human_status.\nDěkujeme, :app_name',
+                'html'          => '<p>Byl změněn stav služby :component_name. Služba má nyní stav :component_human_status.</p><p>Děkujeme, :app_name</p>',
+                'tooltip-title' => 'Přihlásit se k odběru upozornění pro :component_name.',
+            ],
+        ],
+    ],
+
+    'users' => [
+        'email' => [
+            'invite' => [
+                'text' => "Byl(a) jsi pozván(a) do teamu :app_name, k registraci klikni na následující odkaz.\n:link\nDěkujeme, :app_name",
+                'html' => '<p>Byl(a) jsi pozván(a) do teamu :app_name, k registraci klikni na následující odkaz.</p><p><a href=":link">:link</a></p><p>Děkujeme, :app_name</p>',
+            ],
+        ],
+    ],
+
+    'signup' => [
+        'title'    => 'Registrovat se',
+        'username' => 'Uživatelské jméno',
+        'email'    => 'E-mail',
+        'password' => 'Heslo',
+        'success'  => 'Tvůj účet byl vytvořen.',
+        'failure'  => 'Něco je špatně, nelze se registrovat.',
+    ],
+
+    'system' => [
+        'update' => 'Je k dispozici nová verze Cachet. Jak provést update najdeš <a href="https://docs.cachethq.io/docs/updating-cachet">zde</a>!',
+    ],
+
+    // Modal
+    'modal' => [
+        'close'     => 'Zavřít',
+        'subscribe' => [
+            'title'  => 'Přihlásit se k odběru upozornění',
+            'body'   => 'Zadej svůj email pro odběr upozornění této služby. Pokud již odebíráš upozornění, budeš nadále dostávat emaily pro tuto službu.',
+            'button' => 'Přihlásit',
+        ],
+    ],
+
+    // Other
+    'home'            => 'Hlavní stránka',
+    'description'     => 'Držte krok s nejnovějšími aktualizacemi od: app.',
+    'powered_by'      => 'Vytvořeno pomocí <a href="https://cachethq.io" class="links">Cachet</a>.',
+    'about_this_site' => 'O tomto webu',
+    'rss-feed'        => 'RSS',
+    'atom-feed'       => 'Atom',
+    'feed'            => 'Kanál stavů',
+
+];