Bumped version

Fixes #1237

VERSION

@@ -1 +1 @@
-2.0.0
+2.0.5-dev

app/Commands/User/InviteTeamMemberCommand.php

@@ -16,9 +16,9 @@ final class InviteTeamMemberCommand
     /**
      * The invte emails.
      *
-     * @var string
+     * @var string[]
      */
-    public $email;
+    public $emails;
 
     /**
      * The validation rules.

app/Composers/AppComposer.php

@@ -39,7 +39,7 @@ class AppComposer
         $view->withAppGraphs(Setting::get('display_graphs'));
         $view->withAppLocale(Setting::get('app_locale'));
         $view->withAppName(Setting::get('app_name'));
-        $view->withAppStylesheet(Setting::get('app_stylesheet'));
+        $view->withAppStylesheet(Setting::get('stylesheet'));
         $view->withAppUrl(Config::get('app.url'));
         $view->withShowSupport(Setting::get('show_support'));
     }

app/Handlers/Events/Incident/SendIncidentEmailNotificationHandler.php

@@ -65,7 +65,7 @@ class SendIncidentEmailNotificationHandler
 
         // Only send emails for public incidents.
         if ($event->incident->visible === 1) {
-            foreach ($this->subscriber->all() as $subscriber) {
+            foreach ($this->subscriber->isVerified()->get() as $subscriber) {
                 $mail = [
                     'email'            => $subscriber->email,
                     'subject'          => 'New incident reported.',

app/Handlers/Events/Incident/SendMaintenanceEmailNotificationHandler.php

@@ -62,7 +62,7 @@ class SendMaintenanceEmailNotificationHandler
 
         $data = AutoPresenter::decorate($event->incident);
 
-        foreach ($this->subscriber->all() as $subscriber) {
+        foreach ($this->subscriber->isVerified()->get() as $subscriber) {
             $mail = [
                 'email'            => $subscriber->email,
                 'subject'          => 'Scheduled maintenance.',

app/Http/Controllers/Dashboard/SubscriberController.php

@@ -32,8 +32,6 @@ class SubscriberController extends Controller
      */
     public function showSubscribers()
     {
-        $subscribers = Subscriber::all();
-
         return View::make('dashboard.subscribers.index')
             ->withPageTitle(trans('dashboard.subscribers.subscribers').' - '.trans('dashboard.dashboard'))
             ->withSubscribers(Subscriber::all());

app/Models/Subscriber.php

@@ -13,6 +13,7 @@ namespace CachetHQ\Cachet\Models;
 
 use AltThree\Validator\ValidatingTrait;
 use CachetHQ\Cachet\Presenters\SubscriberPresenter;
+use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Model;
 use McCool\LaravelAutoPresenter\HasPresenter;
 
@@ -62,6 +63,18 @@ class Subscriber extends Model implements HasPresenter
         });
     }
 
+    /**
+     * Scope verified subscribers.
+     *
+     * @param \Illuminate\Database\Eloquent\Builder $query
+     *
+     * @return \Illuminate\Database\Eloquent\Builder
+     */
+    public function scopeIsVerified(Builder $query)
+    {
+        return $query->whereNotNull('verified_at');
+    }
+
     /**
      * Determines if the subscriber is verified.
      *

app/Presenters/AbstractPresenter.php

@@ -24,7 +24,7 @@ abstract class AbstractPresenter extends BaseLaravelAutoPresenter implements Arr
     protected $setting;
 
     /**
-     * Create a incident presenter instance.
+     * Create an abstract presenter instance.
      *
      * @param \Illuminate\Database\Eloquent\Model $resource
      *

composer.json

@@ -20,7 +20,7 @@
     ],
     "require": {
         "php": ">=5.5.9",
-        "laravel/framework": "~5.1.24",
+        "laravel/framework": "~5.1.26",
         "alt-three/emoji": "^2.1",
         "alt-three/validator": "^1.4",
         "barryvdh/laravel-cors": "^0.7",
@@ -30,20 +30,20 @@
         "graham-campbell/core": "^4.2",
         "graham-campbell/markdown": "^5.3",
         "graham-campbell/throttle": "^5.1",
-        "graham-campbell/exceptions": "^6.0",
+        "graham-campbell/exceptions": "^6.1",
         "guzzlehttp/guzzle": "^6.1",
-        "jenssegers/date": "^3.0",
+        "jenssegers/date": "^3.1",
         "mccool/laravel-auto-presenter": "^4.2",
         "pragmarx/google2fa": "^0.7",
         "rcrowe/twigbridge": "^0.9",
-        "roumen/feed": "^2.9"
+        "roumen/feed": "^2.9.8"
     },
     "require-dev": {
         "filp/whoops": "^1.1",
         "fzaninotto/faker": "^1.5",
         "graham-campbell/testbench-core": "^1.1",
-        "mockery/mockery": "^0.9.4",
-        "phpunit/phpunit": "^4.8"
+        "mockery/mockery": "0.9.4",
+        "phpunit/phpunit": "4.8.19"
     },
     "autoload": {
         "classmap": [

database/factories/ModelFactory.php

@@ -9,7 +9,6 @@
  * file that was distributed with this source code.
  */
 
-use Carbon\Carbon;
 use CachetHQ\Cachet\Models\Component;
 use CachetHQ\Cachet\Models\ComponentGroup;
 use CachetHQ\Cachet\Models\Incident;
@@ -18,6 +17,7 @@ use CachetHQ\Cachet\Models\Metric;
 use CachetHQ\Cachet\Models\MetricPoint;
 use CachetHQ\Cachet\Models\Subscriber;
 use CachetHQ\Cachet\Models\User;
+use Carbon\Carbon;
 
 $factory->define(Component::class, function ($faker) {
     return [

package.json

@@ -1,8 +1,8 @@
 {
     "dependencies": {
-        "bower": "~1.6.4",
+        "bower": "~1.6.6",
         "gulp": "~3.9.0",
-        "laravel-elixir": "~3.4.2"
+        "laravel-elixir": "~4.0.4"
     },
     "private": true
 }

public/build/rev-manifest.json

@@ -1,4 +1,4 @@
 {
-  "dist/css/all.css": "dist/css/all-5f7f41a9ac.css",
-  "dist/js/all.js": "dist/js/all-08a6790e58.js"
+  "dist/css/all.css": "dist/css/all-d755dde6a5.css",
+  "dist/js/all.js": "dist/js/all-68c89890bf.js"
 }

resources/views/dashboard/partials/errors.blade.php

@@ -1,15 +1,15 @@
 @if ($errors->any())
-  @include('dashboard.partials._error', ['level' => 'danger', 'title' => Session::get('title'), 'message' => $errors->all(':message')])
+@include('dashboard.partials._error', ['level' => 'danger', 'title' => Session::get('title'), 'message' => $errors->all(':message')])
 @endif
 
 @if ($message = Session::get('success'))
-  @include('dashboard.partials._error', ['level' => 'success', 'title' => Session::get('title'), 'message' => $message])
+@include('dashboard.partials._error', ['level' => 'success', 'title' => Session::get('title'), 'message' => $message])
 @endif
 
 @if ($message = Session::get('warning'))
-  @include('dashboard.partials._error', ['level' => 'warning', 'title' => Session::get('title'), 'message' => $message])
+@include('dashboard.partials._error', ['level' => 'warning', 'title' => Session::get('title'), 'message' => $message])
 @endif
 
 @if ($message = Session::get('info'))
-  @include('dashboard.partials._error', ['level' => 'info', 'title' => Session::get('title'), 'message' => $message])
+@include('dashboard.partials._error', ['level' => 'info', 'title' => Session::get('title'), 'message' => $message])
 @endif

resources/views/dashboard/partials/head.blade.php

@@ -18,7 +18,7 @@
     <link rel="apple-touch-icon" sizes="144x144" href="/img/apple-touch-icon-144x144.png">
     <link rel="apple-touch-icon" sizes="152x152" href="/img/apple-touch-icon-152x152.png">
 
-    <title>@yield('pageTitle', $app_name.' | Cachet')</title>
+    <title>{{ $page_title or $app_name.' | Cachet' }}</title>
 
     <link href="https://fonts.googleapis.com/css?family=Open+Sans:300,400,700" rel="stylesheet" type="text/css">
     <link rel="stylesheet" href="{{ elixir('dist/css/all.css') }}">

resources/views/dashboard/settings/stylesheet.blade.php

@@ -21,7 +21,7 @@
                                 <div class="col-xs-12">
                                     <div class="form-group">
                                         <label>{{ trans('forms.settings.stylesheet.custom-css') }}</label>
-                                        <textarea class="form-control autosize" name="stylesheet" rows="10">{{ $app_stylesheet }}</textarea>
+                                        <textarea class="form-control autosize" name="stylesheet" rows="10">{{ Setting::get('stylesheet') }}</textarea>
                                     </div>
                                 </div>
                             </div>

resources/views/dashboard/settings/theme.blade.php

@@ -135,6 +135,7 @@
                                 <div class="col-sm-12">
                                     <div class="checkbox">
                                         <label>
+                                            <input type="hidden" name="dashboard_login_link" value="0">
                                             <input type="checkbox" value="1" name="dashboard_login_link" {{ Setting::get('dashboard_login_link') ? 'checked' : null }}>
                                             {{ trans('forms.settings.theme.dashboard-login') }}
                                         </label>

resources/views/layout/emails.blade.php

@@ -19,7 +19,7 @@
                             <table width="100%" border="0" cellpadding="0" cellspacing="0">
                                 <tr>
                                     <td class="header-logo">
-                                       <a href="{{ $app_domain }}"><img src="data:{{ $app_banner_type }};base64, {{ $app_banner }}"></a>
+                                       <a href="{{ $app_domain }}"><img src="{{ $message->embedData(base64_decode($app_banner), $app_name) }}"></a>
                                     </td>
                                 </tr>
                             </table>

resources/views/layout/master.blade.php

@@ -44,9 +44,9 @@
 
     @include('partials.crowdin')
 
-    @if($stylesheet = $app_stylesheet)
+    @if($app_stylesheet)
     <style type="text/css">
-    {!! $stylesheet !!}
+    {!! $app_stylesheet !!}
     </style>
     @endif
 

resources/views/partials/metrics.blade.php

@@ -93,7 +93,7 @@
         chartConfig.datasets[0].data = _.values(charter);
 
         charts[metricId].chart = new Chart(charts[metricId].context).Line(chartConfig, {
-            tooltipTemplate: $el.data('metric-name') + ": <%= value %> " + $el.data('metric-suffix'),
+            tooltipTemplate: $el.data('metric-name') + ": <{{ '%' }}= value %> " + $el.data('metric-suffix'),
             scaleShowVerticalLines: true,
             scaleShowLabels: false,
             responsive: true,

resources/views/subscribe.blade.php

@@ -7,18 +7,6 @@
 
     <div class="clearfix"></div>
 
-    @if($app_banner)
-    <div class="row app-banner">
-        <div class="col-md-12 text-center">
-            @if($app_domain)
-            <a href="{{ $app_domain }}"><img src="data:{{ $app_banner_type }};base64, {{ $app_banner }}" class="banner-image img-responsive"></a>
-            @else
-            <img src="data:{{ $app_banner_type }};base64, {{ $app_banner }}" class="banner-image img-responsive">
-            @endif
-        </div>
-    </div>
-    @endif
-
     @include('dashboard.partials.errors')
 
     <div class="panel panel-meassage">