Merge pull request #4174 from cactysman/patch-1

Updated link to PHP manual for date formats

.travis.yml

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

README.md

@@ -1,14 +1,18 @@
 # Cachet
 
 [![StyleCI](https://styleci.io/repos/26730195/shield)](https://styleci.io/repos/26730195/)
-[![Build Status](https://img.shields.io/travis/CachetHQ/Cachet/2.3.svg?style=flat-square)](https://travis-ci.org/CachetHQ/Cachet)
+[![Build Status](https://img.shields.io/travis/CachetHQ/Cachet/master.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.
+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).
 
 ## Features
 
@@ -21,7 +25,11 @@ Cachet is a beautiful and powerful open source status page system.
 - Metrics
 - Cross-database support: MySQL, PostgreSQL and SQLite
 - Subscriber notifications via Email
-- Two factor authentication using Google Authenticator
+- 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.
 
 ## Requirements
 
@@ -29,9 +37,9 @@ Cachet is a beautiful and powerful open source status page system.
 - Apache or Nginx server
 - [Composer](https://getcomposer.org)
 
-## I'm looking to contribute to this awesome project!
+## How to contribute
 
-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!
+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
 
@@ -63,13 +71,11 @@ 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 ready for action.
+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.
 
 ## Installation, Upgrades and Documentation
 
-Documentation is found at [https://docs.cachethq.io](https://docs.cachethq.io).
-
-Here are some useful quick links:
+You can now find our documentation at [https://docs.cachethq.io](https://docs.cachethq.io).
 
 - [Installing Cachet](https://docs.cachethq.io/docs/installing-cachet)
 - [Getting started with Docker](https://docs.cachethq.io/docs/get-started-with-docker)
@@ -78,8 +84,8 @@ Here are some useful quick links:
 
 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.
 
@@ -89,18 +95,14 @@ We list releases on the [Releases page](https://github.com/CachetHQ/Cachet/relea
 
 ## Translations
 
-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)
+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).
 
 ## 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.3.14-dev
+2.5.0-dev

app/Bus/Commands/User/AddUserCommand.php

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

app/Bus/Commands/User/InviteUserCommand.php

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

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

@@ -70,7 +70,7 @@ class ReportIncidentCommandHandler
             'visible' => $command->visible,
         ];
 
-        if (IncidentTemplate::where('slug', '=', $command->template)->first()) {
+        if ($command->template) {
             $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) {
-            $components = Component::whereIn('id', $subscriptions)->get();
+            $subscriptions = Component::whereIn('id', $subscriptions);
         } else {
-            $components = Component::all();
+            $subscriptions = Component::all();
         }
 
-        $components->map(function ($component) use ($subscriber) {
+        foreach ($subscriptions as $component) {
             Subscription::create([
                 'subscriber_id' => $subscriber->id,
                 'component_id'  => $component->id,
             ]);
-        });
+        }
 
         if ($command->verified) {
             dispatch(new VerifySubscriberCommand($subscriber));
@@ -62,8 +62,6 @@ class SubscribeSubscriberCommandHandler
             event(new SubscriberHasSubscribedEvent($subscriber));
         }
 
-        $subscriber->load('subscriptions');
-
         return $subscriber;
     }
 }

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

@@ -13,6 +13,7 @@ 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/AddUserCommandHandler.php

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

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

@@ -11,20 +11,25 @@
 
 namespace CachetHQ\Cachet\Bus\Handlers\Commands\User;
 
-use CachetHQ\Cachet\Bus\Commands\User\InviteTeamMemberCommand;
+use CachetHQ\Cachet\Bus\Commands\User\InviteUserCommand;
 use CachetHQ\Cachet\Bus\Events\User\UserWasInvitedEvent;
 use CachetHQ\Cachet\Models\Invite;
 
-class InviteTeamMemberCommandHandler
+/**
+ * This is the invite user command handler.
+ *
+ * @author James Brooks <james@alt-three.com>
+ */
+class InviteUserCommandHandler
 {
     /**
      * Handle the invite team member command.
      *
-     * @param \CachetHQ\Cachet\Bus\Commands\User\InviteTeamMemberCommand $command
+     * @param \CachetHQ\Cachet\Bus\Commands\User\InviteUserCommand $command
      *
      * @return void
      */
-    public function handle(InviteTeamMemberCommand $command)
+    public function handle(InviteUserCommand $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,12 +11,41 @@
 
 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.
      *
@@ -26,25 +55,28 @@ class AppComposer
      */
     public function compose(View $view)
     {
-        $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'));
+        $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'));
     }
 }

app/Composers/MetricsComposer.php

@@ -12,11 +12,30 @@
 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.
      *
@@ -27,7 +46,7 @@ class MetricsComposer
     public function compose(View $view)
     {
         $metrics = null;
-        if ($displayMetrics = Config::get('setting.display_graphs')) {
+        if ($displayMetrics = $this->config->get('setting.display_graphs')) {
             $metrics = Metric::displayable()->orderBy('order')->orderBy('id')->get();
         }
 

app/Composers/ThemeComposer.php

@@ -11,11 +11,30 @@
 
 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.
      *
@@ -26,17 +45,17 @@ class ThemeComposer
     public function compose(View $view)
     {
         // Theme colors.
-        $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'));
+        $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'));
     }
 }

app/Composers/TimezoneLocaleComposer.php

@@ -13,11 +13,30 @@ namespace CachetHQ\Cachet\Composers;
 
 use DateTime;
 use DateTimeZone;
+use Illuminate\Contracts\Config\Repository;
 use Illuminate\Contracts\View\View;
-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.
      *
@@ -27,7 +46,7 @@ class TimezoneLocaleComposer
      */
     public function compose(View $view)
     {
-        $enabledLangs = Config::get('langs');
+        $enabledLangs = $this->config->get('langs');
 
         $langs = array_map(function ($lang) use ($enabledLangs) {
             $locale = basename($lang);

app/Console/Commands/DemoSeederCommand.php

@@ -163,6 +163,13 @@ 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,6 +11,7 @@
 
 namespace CachetHQ\Cachet\Dates;
 
+use DateTimeZone;
 use Jenssegers\Date\Date;
 
 class DateFactory
@@ -88,4 +89,17 @@ 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,9 +14,6 @@ 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;
 
@@ -55,9 +52,6 @@ class AppServiceProvider extends ServiceProvider
     public function register()
     {
         $this->registerDateFactory();
-        $this->registerCredits();
-        $this->registerFeed();
-        $this->registerReleases();
     }
 
     /**
@@ -74,47 +68,4 @@ 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,6 +48,9 @@ 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',
         ],
@@ -90,5 +93,8 @@ 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,8 +11,14 @@
 
 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;
 
@@ -30,7 +36,39 @@ 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);
+        });
     }
 
     /**
@@ -44,4 +82,19 @@ 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/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(Releases::class)->latest();
+        $latest = app()->make(Releases::class)->latest();
 
         return $this->setMetaData([
             'on_latest' => version_compare(CACHET_VERSION, $latest['tag_name']) === 1,
@@ -55,9 +55,6 @@ class GeneralController extends AbstractApiController
     {
         $system = app()->make(System::class)->getStatus();
 
-        return $this->item([
-            'status'  => $system['system_status'],
-            'message' => $system['system_message'],
-        ]);
+        return $this->item($system['system_message']);
     }
 }

app/Http/Controllers/Api/SubscriberController.php

@@ -17,6 +17,7 @@ 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;
@@ -48,12 +49,10 @@ 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'),
-                Binput::get('verify', false),
-                Binput::get('components', null)
-            ));
+            $subscriber = dispatch(new SubscribeSubscriberCommand(Binput::get('email'), $verified, Binput::get('components')));
         } catch (QueryException $e) {
             throw new BadRequestHttpException();
         }

app/Http/Controllers/Dashboard/DashboardController.php

@@ -11,7 +11,7 @@
 
 namespace CachetHQ\Cachet\Http\Controllers\Dashboard;
 
-use CachetHQ\Cachet\Integrations\Feed;
+use CachetHQ\Cachet\Integrations\Contracts\Feed;
 use CachetHQ\Cachet\Models\Component;
 use CachetHQ\Cachet\Models\ComponentGroup;
 use CachetHQ\Cachet\Models\Incident;

app/Http/Controllers/Dashboard/SettingsController.php

@@ -11,7 +11,7 @@
 
 namespace CachetHQ\Cachet\Http\Controllers\Dashboard;
 
-use CachetHQ\Cachet\Integrations\Credits;
+use CachetHQ\Cachet\Integrations\Contracts\Credits;
 use CachetHQ\Cachet\Models\User;
 use CachetHQ\Cachet\Settings\Repository;
 use Exception;

app/Http/Controllers/Dashboard/SubscriberController.php

@@ -16,6 +16,7 @@ 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;
@@ -52,11 +53,13 @@ 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));
+                dispatch(new SubscribeSubscriberCommand($subscriber, $verified));
             }
         } 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\AddTeamMemberCommand;
-use CachetHQ\Cachet\Bus\Commands\User\InviteTeamMemberCommand;
+use CachetHQ\Cachet\Bus\Commands\User\AddUserCommand;
+use CachetHQ\Cachet\Bus\Commands\User\InviteUserCommand;
 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 AddTeamMemberCommand(
+            dispatch(new AddUserCommand(
                 Binput::get('username'),
                 Binput::get('password'),
                 Binput::get('email'),
@@ -130,7 +130,7 @@ class TeamController extends Controller
     public function postInviteUser()
     {
         try {
-            dispatch(new InviteTeamMemberCommand(
+            dispatch(new InviteUserCommand(
                 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'], 'required', function ($input) {
+        $v->sometimes(['env.mail_address', 'env.mail_username', 'env.mail_password'], 'required', function ($input) {
             return $input->mail_driver !== 'log';
         });
 

app/Http/Controllers/SubscribeController.php

@@ -18,10 +18,12 @@ 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;
@@ -56,10 +58,9 @@ 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')
@@ -147,15 +148,19 @@ 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')
-            ->withComponents(Component::all())
+            ->withUngroupedComponents($ungroupedComponents)
             ->withSubscriber($subscriber)
-            ->withSubscriptions($subscriber->subscriptions->pluck('component_id')->all());
+            ->withSubscriptions($subscriber->subscriptions->pluck('component_id')->all())
+            ->withComponentGroups($componentGroups);
     }
 
     /**
@@ -180,6 +185,8 @@ 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

@@ -0,0 +1,27 @@
+<?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

@@ -0,0 +1,27 @@
+<?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

@@ -0,0 +1,27 @@
+<?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/Core/Credits.php

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

app/Integrations/Core/Feed.php

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

app/Integrations/GitHub/Releases.php

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

app/Models/IncidentTemplate.php

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

app/Presenters/ComponentGroupPresenter.php

@@ -97,4 +97,27 @@ 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,20 +47,6 @@ 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.
      *
@@ -68,20 +54,10 @@ abstract class AbstractMetricRepository
      */
     protected function getTableName()
     {
-        $prefix = $this->getPrefix();
+        $driver = $this->config->get('database.default');
+        $connection = $this->config->get('database.connections.'.$driver);
+        $prefix = $connection['prefix'];
 
         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,7 +36,6 @@ 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`';
@@ -46,7 +45,7 @@ class MySqlRepository extends AbstractMetricRepository implements MetricInterfac
 
         $value = 0;
 
-        $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`)", [
+        $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`)", [
             'metricId'     => $metric->id,
             'timeInterval' => $timeInterval,
         ]);
@@ -74,7 +73,6 @@ 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`';
@@ -84,7 +82,7 @@ class MySqlRepository extends AbstractMetricRepository implements MetricInterfac
 
         $value = 0;
 
-        $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`)", [
+        $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`)", [
             'metricId'     => $metric->id,
             'hourInterval' => $hourInterval,
         ]);
@@ -110,7 +108,6 @@ 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`';
@@ -120,7 +117,7 @@ class MySqlRepository extends AbstractMetricRepository implements MetricInterfac
 
         $value = 0;
 
-        $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')", [
+        $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')", [
             'metricId'     => $metric->id,
             'timeInterval' => $dateTime->format('Ymd'),
         ]);

app/Repositories/Metric/PgSqlRepository.php

@@ -34,20 +34,19 @@ 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($metricPointsTableName.value * $metricPointsTableName.counter)";
+            $queryType = 'sum(metric_points.value * metric_points.counter)';
         } elseif ($metric->calc_type == Metric::CALC_AVG) {
-            $queryType = "avg($metricPointsTableName.value * $metricPointsTableName.counter)";
+            $queryType = 'avg(metric_points.value * metric_points.counter)';
         } else {
-            $queryType = "sum($metricPointsTableName.value * $metricPointsTableName.counter)";
+            $queryType = 'sum(metric_points.value * metric_points.counter)';
         }
 
         $value = 0;
-        $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')", [
+        $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')", [
             'metricId'     => $metric->id,
             'timeInterval' => $dateTime->format('YmdHi'),
         ]);
@@ -74,19 +73,18 @@ 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($metricPointsTableName.value * $metricPointsTableName.counter)";
+            $queryType = 'sum(metric_points.value * metric_points.counter)';
         } elseif ($metric->calc_type == Metric::CALC_AVG) {
-            $queryType = "avg($metricPointsTableName.value * $metricPointsTableName.counter)";
+            $queryType = 'avg(metric_points.value * metric_points.counter)';
         } else {
-            $queryType = "sum($metricPointsTableName.value * $metricPointsTableName.counter)";
+            $queryType = 'sum(metric_points.value * metric_points.counter)';
         }
 
         $value = 0;
-        $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')", [
+        $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')", [
             'metricId'     => $metric->id,
             'timeInterval' => $dateTime->format('YmdH'),
         ]);
@@ -112,7 +110,6 @@ 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';
@@ -121,7 +118,7 @@ class PgSqlRepository extends AbstractMetricRepository implements MetricInterfac
         }
 
         $value = 0;
-        $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')", [
+        $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')", [
             'metricId'     => $metric->id,
             'timeInterval' => $dateTime->format('Ymd'),
         ]);

app/Repositories/Metric/SqliteRepository.php

@@ -30,19 +30,18 @@ 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($metricPointsTableName.value * $metricPointsTableName.counter)";
+            $queryType = 'sum(metric_points.value * metric_points.counter)';
         } elseif ($metric->calc_type == Metric::CALC_AVG) {
-            $queryType = "avg($metricPointsTableName.value * $metricPointsTableName.counter)";
+            $queryType = 'avg(metric_points.value * metric_points.counter)';
         } else {
-            $queryType = "sum($metricPointsTableName.value * $metricPointsTableName.counter)";
+            $queryType = 'sum(metric_points.value * metric_points.counter)';
         }
 
         $value = 0;
-        $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)", [
+        $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)", [
             'metricId'     => $metric->id,
             'timeInterval' => $dateTime->format('YmdHi'),
         ]);
@@ -69,19 +68,18 @@ 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($metricPointsTableName.value * $metricPointsTableName.counter)";
+            $queryType = 'sum(metric_points.value * metric_points.counter)';
         } elseif ($metric->calc_type == Metric::CALC_AVG) {
-            $queryType = "avg($metricPointsTableName.value * $metricPointsTableName.counter)";
+            $queryType = 'avg(metric_points.value * metric_points.counter)';
         } else {
-            $queryType = "sum($metricPointsTableName.value * $metricPointsTableName.counter)";
+            $queryType = 'sum(metric_points.value * metric_points.counter)';
         }
 
         $value = 0;
-        $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)", [
+        $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)", [
             'metricId'     => $metric->id,
             'timeInterval' => $dateTime->format('YmdH'),
         ]);
@@ -107,19 +105,18 @@ 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($metricPointsTableName.value * $metricPointsTableName.counter)";
+            $queryType = 'sum(metric_points.value * metric_points.counter)';
         } elseif ($metric->calc_type == Metric::CALC_AVG) {
-            $queryType = "avg($metricPointsTableName.value * $metricPointsTableName.counter)";
+            $queryType = 'avg(metric_points.value * metric_points.counter)';
         } else {
-            $queryType = "sum($metricPointsTableName.value * $metricPointsTableName.counter)";
+            $queryType = 'sum(metric_points.value * metric_points.counter)';
         }
 
         $value = 0;
-        $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)", [
+        $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)", [
             'metricId'     => $metric->id,
             'timeInterval' => $dateTime->format('Ymd'),
         ]);

app/Subscribers/CommandSubscriber.php

@@ -83,13 +83,6 @@ 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,6 +14,7 @@ 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,28 +20,26 @@
     ],
     "require": {
         "php": ">=5.5.9",
-        "ext-xml": "*",
+        "laravel/framework": "5.2.39",
         "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": "dev-master#df53f9c9d8c6be5d7a2638f45d54b8fb7bc51e2b",
+        "backup-manager/laravel": "^1.1",
         "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": "^9.4",
+        "graham-campbell/exceptions": "^8.6",
         "graham-campbell/markdown": "^6.1",
         "guzzlehttp/guzzle": "^6.2.1",
         "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"
     },
@@ -50,7 +48,7 @@
         "filp/whoops": "^2.1",
         "fzaninotto/faker": "^1.6",
         "graham-campbell/testbench-core": "^1.1",
-        "mockery/mockery": "0.9.9",
+        "mockery/mockery": "0.9.5",
         "phpunit/phpunit": "4.8.21",
         "symfony/css-selector": "^3.0",
         "symfony/dom-crawler": "^3.0"
@@ -100,7 +98,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "2.3-dev"
+            "dev-master": "2.5-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/setting.php

@@ -56,4 +56,36 @@ 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,
 ];

gulpfile.js

@@ -1,8 +1,5 @@
 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,6 +27,7 @@
     </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"/>

resources/assets/js/app.js

@@ -277,6 +277,24 @@ $(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'),

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:          "Open Sans", "Helvetica Neue", "Helvetica", "Arial", sans-serif;
+$base-font-family:          -apple-system, BlinkMacSystemFont, "Open Sans", "Helvetica Neue", "Helvetica", "Arial", sans-serif;
 $base-font-weight:          400;
 $base-letter-spacing:       0.08em;
 $base-font-size:            15px;

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 CrowdIn and GitHub.',
+            'backers'       => 'If you\'d like to support future development, check out the <a href="https://patreon.com/jbrooksuk" target="_blank">Cachet Patreon</a> campaign.',
             'thank-you'     => 'Thank you to each and every one of the :count contributors.',
         ],
     ],
@@ -251,6 +251,8 @@ 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/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 CrowdIn and GitHub.',
+            'backers'       => 'If you\'d like to support future development, check out the <a href="https://patreon.com/jbrooksuk" target="_blank">Cachet Patreon</a> campaign.',
             'thank-you'     => 'Thank you to each and every one of the :count contributors.',
         ],
     ],
@@ -251,6 +251,8 @@ 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/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 CrowdIn and GitHub.',
+            'backers'       => 'If you\'d like to support future development, check out the <a href="https://patreon.com/jbrooksuk" target="_blank">Cachet Patreon</a> campaign.',
             'thank-you'     => 'Thank you to each and every one of the :count contributors.',
         ],
     ],
@@ -251,6 +251,8 @@ 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/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/cs/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 CrowdIn and GitHub.',
+            'backers'       => 'If you\'d like to support future development, check out the <a href="https://patreon.com/jbrooksuk" target="_blank">Cachet Patreon</a> campaign.',
             'thank-you'     => 'Thank you to each and every one of the :count contributors.',
         ],
     ],
@@ -251,6 +251,8 @@ 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/cs/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/da/cachet.php

@@ -103,8 +103,8 @@ return [
     'users' => [
         'email' => [
             'invite' => [
-                'text' => "Du er blevet inviteret til :app_name status status side, Klik på linket for at oprette dig.\n:link\nTak, :app_name",
-                'html' => '<p>Du er blevet inviteret til :app_name status side, Klik på linket for at oprette dig.</p><p><a href=":link">:link</a></p><p>Tak, :app_name</p>',
+                'text'           => "Du er blevet inviteret til :app_name status status side, Klik på linket for at oprette dig.\n:link\nTak, :app_name",
+                'html'           => '<p>Du er blevet inviteret til :app_name status side, Klik på linket for at oprette dig.</p><p><a href=":link">:link</a></p><p>Tak, :app_name</p>',
             ],
         ],
     ],

resources/lang/da/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 CrowdIn and GitHub.',
+            'backers'       => 'If you\'d like to support future development, check out the <a href="https://patreon.com/jbrooksuk" target="_blank">Cachet Patreon</a> campaign.',
             'thank-you'     => 'Thank you to each and every one of the :count contributors.',
         ],
     ],
@@ -251,6 +251,8 @@ 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/da/forms.php

@@ -118,10 +118,10 @@ return [
             'analytics_piwik_siteid' => 'Piwik\'s site id',
         ],
         'localization' => [
-            'site-timezone'        => 'Tidszone',
-            'site-locale'          => 'Sprog på siden',
-            'date-format'          => 'Datoformat',
-            'incident-date-format' => 'Datoformat for hændelser',
+            'site-timezone'          => 'Tidszone',
+            'site-locale'            => 'Sprog på siden',
+            'date-format'            => 'Datoformat',
+            'incident-date-format'   => 'Datoformat for hændelser',
         ],
         'security' => [
             'allowed-domains'      => 'Tilladte domæner',

resources/lang/de/cachet.php

@@ -103,8 +103,8 @@ return [
     'users' => [
         'email' => [
             'invite' => [
-                'text' => "Du wurdest in das Team :app_name Status Seite eingeladen. Um dich zu registrieren klicke den Link.\n:link\nDanke, :app_name",
-                'html' => '<p>Du wurdest in das Team :app_name Status Seite eingeladen. Um dich zu registrieren klicke den Link.</p><p><a href=":link">:link</a></p><p>Danke, :app_name</p>',
+                'text'           => "Du wurdest in das Team :app_name Status Seite eingeladen. Um dich zu registrieren klicke den Link.\n:link\nDanke, :app_name",
+                'html'           => '<p>Du wurdest in das Team :app_name Status Seite eingeladen. Um dich zu registrieren klicke den Link.</p><p><a href=":link">:link</a></p><p>Danke, :app_name</p>',
             ],
         ],
     ],

resources/lang/de/dashboard.php

@@ -224,7 +224,7 @@ return [
             'contributors'  => 'Unterstützer',
             'license'       => 'Cachet ist ein BSD-3-lizensiertes Open Source-Projekt, veröffentlicht von <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' => 'Unterstützer & Sponsoren',
-            'backers'       => 'If you\'d like to support future development, check out the CrowdIn and GitHub.',
+            'backers'       => 'Wenn Du die Entwicklung der Software unterstützen möchtest, kannst Du unter <a href="https://patreon.com/jbrooksuk" target="_blank">Cachet Patreon</a> einen Beitrag leisten.',
             'thank-you'     => 'Vielen Dank an jeden der :count Unterstützer.',
         ],
     ],
@@ -251,6 +251,8 @@ return [
 
     // Widgets
     'widgets' => [
+        'support'          => 'Cachet unterstützen',
+        'support_subtitle' => 'Unterstütze uns unter <strong><a href="https://patreon.com/jbrooksuk" target="_blank">Patreon</a></strong>!',
         'news'             => 'Aktuelle Neuigkeiten',
         'news_subtitle'    => 'Erhalte die neusten Nachrichten',
     ],

resources/lang/de/forms.php

@@ -118,10 +118,10 @@ return [
             'analytics_piwik_siteid' => 'Piwik\'s Seiten-ID',
         ],
         'localization' => [
-            'site-timezone'        => 'Zeitzone ihrer Seite',
-            'site-locale'          => 'Sprache ihrer Seite',
-            'date-format'          => 'Datumsformat',
-            'incident-date-format' => 'Vorfall Zeitstempel-Format',
+            'site-timezone'          => 'Zeitzone ihrer Seite',
+            'site-locale'            => 'Sprache ihrer Seite',
+            'date-format'            => 'Datumsformat',
+            'incident-date-format'   => 'Vorfall Zeitstempel-Format',
         ],
         'security' => [
             'allowed-domains'      => 'Erlaubte Domains',

resources/lang/el/cachet.php

@@ -103,8 +103,8 @@ return [
     'users' => [
         'email' => [
             'invite' => [
-                'text' => "Έχετε προσκληθεί στη σελίδα ενημερώσεων της ομάδας :app_name, εγγραφείτε στον παρακάτω σύνδεσμο.\n:link\nΕυχαριστούμε, :app_name",
-                'html' => '<p>Έχετε προσκληθεί στη σελίδα ενημερώσεων της ομάδας :app_name, εγγραφείτε στον παρακάτω σύνδεσμο.</p><p><a href=":link">:link</a></p><p>Ευχαριστούμε, :app_name</p>',
+                'text'           => "Έχετε προσκληθεί στη σελίδα ενημερώσεων της ομάδας :app_name, εγγραφείτε στον παρακάτω σύνδεσμο.\n:link\nΕυχαριστούμε, :app_name",
+                'html'           => '<p>Έχετε προσκληθεί στη σελίδα ενημερώσεων της ομάδας :app_name, εγγραφείτε στον παρακάτω σύνδεσμο.</p><p><a href=":link">:link</a></p><p>Ευχαριστούμε, :app_name</p>',
             ],
         ],
     ],

resources/lang/el/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 CrowdIn and GitHub.',
+            'backers'       => 'If you\'d like to support future development, check out the <a href="https://patreon.com/jbrooksuk" target="_blank">Cachet Patreon</a> campaign.',
             'thank-you'     => 'Thank you to each and every one of the :count contributors.',
         ],
     ],
@@ -251,6 +251,8 @@ 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/el/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/en-UD/cachet.php

@@ -103,8 +103,8 @@ return [
     'users' => [
         'email' => [
             'invite' => [
-                'text' => 'crwdns553:0crwdne553:0',
-                'html' => 'crwdns555:0crwdne555:0',
+                'text'           => 'crwdns553:0crwdne553:0',
+                'html'           => 'crwdns555:0crwdne555:0',
             ],
         ],
     ],

resources/lang/en-UD/dashboard.php

@@ -251,6 +251,8 @@ return [
 
     // Widgets
     'widgets' => [
+        'support'          => 'crwdns771:0crwdne771:0',
+        'support_subtitle' => 'crwdns772:0crwdne772:0',
         'news'             => 'crwdns773:0crwdne773:0',
         'news_subtitle'    => 'crwdns774:0crwdne774:0',
     ],

resources/lang/en-UD/forms.php

@@ -118,10 +118,10 @@ return [
             'analytics_piwik_siteid' => 'crwdns594:0crwdne594:0',
         ],
         'localization' => [
-            'site-timezone'        => 'crwdns595:0crwdne595:0',
-            'site-locale'          => 'crwdns596:0crwdne596:0',
-            'date-format'          => 'crwdns597:0crwdne597:0',
-            'incident-date-format' => 'crwdns598:0crwdne598:0',
+            'site-timezone'          => 'crwdns595:0crwdne595:0',
+            'site-locale'            => 'crwdns596:0crwdne596:0',
+            'date-format'            => 'crwdns597:0crwdne597:0',
+            'incident-date-format'   => 'crwdns598:0crwdne598:0',
         ],
         'security' => [
             'allowed-domains'      => 'crwdns599:0crwdne599:0',

resources/lang/en/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>',
             ],
         ],
     ],
@@ -136,6 +136,7 @@ return [
     '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>.',
+    'timezone'        => 'Times are shown in :timezone.',
     'about_this_site' => 'About This Site',
     'rss-feed'        => 'RSS',
     'atom-feed'       => 'Atom',

resources/lang/en/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 CrowdIn and GitHub.',
+            'backers'       => 'If you\'d like to support future development, check out the <a href="https://patreon.com/jbrooksuk" target="_blank">Cachet Patreon</a> campaign.',
             'thank-you'     => 'Thank you to each and every one of the :count contributors.',
         ],
     ],
@@ -251,6 +251,8 @@ 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 update',
     ],

resources/lang/en/forms.php

@@ -104,17 +104,20 @@ return [
 
     // Settings
     'settings' => [
-        /// Application setup
+        // 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?',
+            '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?',
+            'skip_subscriber_verification' => 'Skip verifying of users? (Be warned, you could be spammed)',
+            'automatic_localization'       => 'Automatically localise your status page to your visitor\'s language?',
+            'enable_external_dependencies' => 'Enable Third Party Dependencies (Google Fonts, Trackers, etc...)',
+            'show_timezone'                => 'Show the timezone the status page is running in.',
         ],
         'analytics' => [
             'analytics_google'       => 'Google Analytics code',
@@ -123,10 +126,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/es/cachet.php

@@ -103,8 +103,8 @@ return [
     'users' => [
         'email' => [
             'invite' => [
-                'text' => "Te han invitado a la página de estado del equipo de :app_name, para registrarte sigue este enlace.\n:link\nGracias, :app_name",
-                'html' => '<p>Has sido invitado a la página de estado del equipo :app_name, para inscribirte sigue el siguiente enlace.</p><p><a href=":link">:link</a></p><p>Gracias, :app_name</p>',
+                'text'           => "Te han invitado a la página de estado del equipo de :app_name, para registrarte sigue este enlace.\n:link\nGracias, :app_name",
+                'html'           => '<p>Has sido invitado a la página de estado del equipo :app_name, para inscribirte sigue el siguiente enlace.</p><p><a href=":link">:link</a></p><p>Gracias, :app_name</p>',
             ],
         ],
     ],

resources/lang/es/dashboard.php

@@ -224,7 +224,7 @@ return [
             'contributors'  => 'Colaboradores',
             'license'       => 'Cachet es un proyecto de código libre bajo la licencia BSD-3, liberado por <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' => 'Patrocinadores',
-            'backers'       => 'If you\'d like to support future development, check out the CrowdIn and GitHub.',
+            'backers'       => 'Si desea apoyar futuros desarrollos, ingrese a la campaña de <a href="https://patreon.com/jbrooksuk" target="_blank">Cachet Patreon</a>.',
             'thank-you'     => 'Gracias a todos y cada uno de los :count colaboradores.',
         ],
     ],
@@ -251,6 +251,8 @@ return [
 
     // Widgets
     'widgets' => [
+        'support'          => 'Apoye Cachet',
+        'support_subtitle' => '¡Visite nuestro proyecto en la página de <strong><a href="https://patreon.com/jbrooksuk" target="_blank">Patreon</a></strong>!',
         'news'             => 'Últimas noticias',
         'news_subtitle'    => 'Obtener las actualizaciones más recientes',
     ],

resources/lang/es/forms.php

@@ -118,10 +118,10 @@ return [
             'analytics_piwik_siteid' => 'Id de tu sitio Piwik',
         ],
         'localization' => [
-            'site-timezone'        => 'Zona horaria del sitio',
-            'site-locale'          => 'Idioma del sitio',
-            'date-format'          => 'Formato de la fecha',
-            'incident-date-format' => 'Formato de fecha de incidente',
+            'site-timezone'          => 'Zona horaria del sitio',
+            'site-locale'            => 'Idioma del sitio',
+            'date-format'            => 'Formato de la fecha',
+            'incident-date-format'   => 'Formato de fecha de incidente',
         ],
         'security' => [
             'allowed-domains'      => 'Dominios permitidos',

resources/lang/fa/cachet.php

@@ -92,8 +92,8 @@ return [
                 'subject' => '[New Incident] :status: :name',
             ],
             'component' => [
-                'subject' => 'به‌روزرسانی وضعیت کامپوننت',
-                'text'    => 'کامپوننت :component یک تغییر وضعیت دارد. این کامپوننت هم‌اکنون در حالت :component_human_status قرار دارد.\n
+                'subject'       => 'به‌روزرسانی وضعیت کامپوننت',
+                'text'          => 'کامپوننت :component یک تغییر وضعیت دارد. این کامپوننت هم‌اکنون در حالت :component_human_status قرار دارد.\n
 با تشکر، :app_name',
                 'html'          => '<p> کامپوننت با نام :component_name یک تغییر وضعیت دارد. کامپوننت هم‌اکنون در حالت :component_human_status قرار دارد. </p><p> با تشکر :app_name </p>',
                 'tooltip-title' => 'Subscribe to notifications for :component_name.',
@@ -104,8 +104,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/fa/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 CrowdIn and GitHub.',
+            'backers'       => 'If you\'d like to support future development, check out the <a href="https://patreon.com/jbrooksuk" target="_blank">Cachet Patreon</a> campaign.',
             'thank-you'     => 'Thank you to each and every one of the :count contributors.',
         ],
     ],
@@ -251,6 +251,8 @@ 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/fa/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/fi/cachet.php

@@ -103,8 +103,8 @@ return [
     'users' => [
         'email' => [
             'invite' => [
-                'text' => "Sinut on kutsuttu ryhmään :app_name tila sivulle, rekisteröi tästä: \n:link\n. Kiitos, :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'           => "Sinut on kutsuttu ryhmään :app_name tila sivulle, rekisteröi tästä: \n:link\n. Kiitos, :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/fi/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 CrowdIn and GitHub.',
+            'backers'       => 'If you\'d like to support future development, check out the <a href="https://patreon.com/jbrooksuk" target="_blank">Cachet Patreon</a> campaign.',
             'thank-you'     => 'Thank you to each and every one of the :count contributors.',
         ],
     ],
@@ -251,6 +251,8 @@ 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/fi/forms.php

@@ -118,10 +118,10 @@ return [
             'analytics_piwik_siteid' => 'Piwik sivun tunnus',
         ],
         'localization' => [
-            'site-timezone'        => 'Sivuston aikavyöhyke',
-            'site-locale'          => 'Sivuston kieli',
-            'date-format'          => 'Päivämäärän muoto',
-            'incident-date-format' => 'Incident timestamp format',
+            'site-timezone'          => 'Sivuston aikavyöhyke',
+            'site-locale'            => 'Sivuston kieli',
+            'date-format'            => 'Päivämäärän muoto',
+            'incident-date-format'   => 'Incident timestamp format',
         ],
         'security' => [
             'allowed-domains'      => 'Sallittu toimialueet',

resources/lang/fr/cachet.php

@@ -103,8 +103,8 @@ return [
     'users' => [
         'email' => [
             'invite' => [
-                'text' => "Vous avez été invité à la page de statut de l'équipe :app_name , veuillez suivre le lien suivant pour vous inscire \n:link\nMerci, :app_name",
-                'html' => '<p>Vous avez été invité à la page de statut de l\'équipe :app_name, veuillez suivre le lien suivant pour vous inscrire.</p><p><a href=":link">:link</a></p><p>Merci, :app_name</p>',
+                'text'           => "Vous avez été invité à la page de statut de l'équipe :app_name , veuillez suivre le lien suivant pour vous inscire \n:link\nMerci, :app_name",
+                'html'           => '<p>Vous avez été invité à la page de statut de l\'équipe :app_name, veuillez suivre le lien suivant pour vous inscrire.</p><p><a href=":link">:link</a></p><p>Merci, :app_name</p>',
             ],
         ],
     ],

resources/lang/fr/dashboard.php

@@ -224,7 +224,7 @@ return [
             'contributors'  => 'Contributeurs',
             'license'       => 'Cachet est un logiciel libre sous licence BSD-3 édité par <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' => 'Partenaires financiers et sponsors',
-            'backers'       => 'If you\'d like to support future development, check out the CrowdIn and GitHub.',
+            'backers'       => 'Si vous souhaitez aider des développements futurs jetez un œil à la campagne <a href="https://patreon.com/jbrooksuk" target="_blank">Cachet Patreon</a>.',
             'thank-you'     => 'Merci à chacun des :count contributeurs.',
         ],
     ],
@@ -251,6 +251,8 @@ return [
 
     // Widgets
     'widgets' => [
+        'support'          => 'Supportez Cachet',
+        'support_subtitle' => 'Jetez un œil à la page <strong><a href="https://patreon.com/jbrooksuk" target="_blank">Patreon</a></strong>!',
         'news'             => 'Dernières actualités',
         'news_subtitle'    => 'Obtenez les dernières mises à jour',
     ],

resources/lang/fr/forms.php

@@ -118,10 +118,10 @@ return [
             'analytics_piwik_siteid' => 'Id du site de Piwik',
         ],
         'localization' => [
-            'site-timezone'        => 'Fuseau horaire du site',
-            'site-locale'          => 'Langue du site',
-            'date-format'          => 'Format de la date',
-            'incident-date-format' => 'Format de la date de l\'incident',
+            'site-timezone'          => 'Fuseau horaire du site',
+            'site-locale'            => 'Langue du site',
+            'date-format'            => 'Format de la date',
+            'incident-date-format'   => 'Format de la date de l\'incident',
         ],
         'security' => [
             'allowed-domains'      => 'Domaines autorisés',

resources/lang/he/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/he/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 CrowdIn and GitHub.',
+            'backers'       => 'If you\'d like to support future development, check out the <a href="https://patreon.com/jbrooksuk" target="_blank">Cachet Patreon</a> campaign.',
             'thank-you'     => 'Thank you to each and every one of the :count contributors.',
         ],
     ],
@@ -251,6 +251,8 @@ 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/he/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/hu/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>',
             ],
         ],
     ],