From a033d1498d28a09123dcbd5790c7709318e1eff3 Mon Sep 17 00:00:00 2001 From: James Brooks Date: Thu, 3 Jan 2019 19:45:43 +0000 Subject: [PATCH 01/54] Add support for authentication via REMOTE_USER --- .../Providers/RouteServiceProvider.php | 4 +- app/Http/Kernel.php | 22 +++++----- .../Middleware/RemoteUserAuthenticate.php | 44 +++++++++++++++++++ 3 files changed, 59 insertions(+), 11 deletions(-) create mode 100644 app/Http/Middleware/RemoteUserAuthenticate.php diff --git a/app/Foundation/Providers/RouteServiceProvider.php b/app/Foundation/Providers/RouteServiceProvider.php index 9a17c2a6..26171a78 100644 --- a/app/Foundation/Providers/RouteServiceProvider.php +++ b/app/Foundation/Providers/RouteServiceProvider.php @@ -28,6 +28,7 @@ use Illuminate\Routing\Middleware\SubstituteBindings; use Illuminate\Routing\Router; use Illuminate\Session\Middleware\StartSession; use Illuminate\View\Middleware\ShareErrorsFromSession; +use CachetHQ\Cachet\Http\Middleware\RemoteUserAuthenticate; /** * This is the route service provider. @@ -149,9 +150,10 @@ class RouteServiceProvider extends ServiceProvider VerifyCsrfToken::class, SubstituteBindings::class, ]; - + if ($applyAlwaysAuthenticate && !$this->isWhiteListedAuthRoute($routes)) { $middleware[] = Authenticate::class; + $middleware[] = RemoteUserAuthenticate::class; } $router->group(['middleware' => $middleware], function (Router $router) use ($routes) { diff --git a/app/Http/Kernel.php b/app/Http/Kernel.php index 775f4691..565e064b 100644 --- a/app/Http/Kernel.php +++ b/app/Http/Kernel.php @@ -24,6 +24,7 @@ use CachetHQ\Cachet\Http\Middleware\TrustProxies; use Illuminate\Auth\Middleware\Authorize; use Illuminate\Foundation\Http\Kernel as HttpKernel; use Illuminate\Foundation\Http\Middleware\CheckForMaintenanceMode; +use CachetHQ\Cachet\Http\Middleware\RemoteUserAuthenticate; class Kernel extends HttpKernel { @@ -43,15 +44,16 @@ class Kernel extends HttpKernel * @var array */ protected $routeMiddleware = [ - 'admin' => Admin::class, - 'can' => Authorize::class, - 'auth' => Authenticate::class, - 'auth.api' => ApiAuthentication::class, - 'guest' => RedirectIfAuthenticated::class, - 'localize' => Localize::class, - 'ready' => ReadyForUse::class, - 'setup' => SetupAlreadyCompleted::class, - 'subscribers' => SubscribersConfigured::class, - 'throttle' => ThrottlingMiddleware::class, + 'admin' => Admin::class, + 'can' => Authorize::class, + 'auth' => Authenticate::class, + 'auth.api' => ApiAuthentication::class, + 'auth.remoteuser' => RemoteUserAuthenticate::class, + 'guest' => RedirectIfAuthenticated::class, + 'localize' => Localize::class, + 'ready' => ReadyForUse::class, + 'setup' => SetupAlreadyCompleted::class, + 'subscribers' => SubscribersConfigured::class, + 'throttle' => ThrottlingMiddleware::class, ]; } diff --git a/app/Http/Middleware/RemoteUserAuthenticate.php b/app/Http/Middleware/RemoteUserAuthenticate.php new file mode 100644 index 00000000..5bf6cf7f --- /dev/null +++ b/app/Http/Middleware/RemoteUserAuthenticate.php @@ -0,0 +1,44 @@ +auth = $auth; + } + + /** + * Handle an incoming request. + * + * @param \Illuminate\Http\Request $request + * @param \Closure $next + * + * @return mixed + */ + public function handle(Request $request, Closure $next) + { + if ($remoteUser = $request->server('REMOTE_USER')) { + $user = User::where('email', '=', $remoteUser)->first(); + + if ($user instanceof User && $this->auth->guest()) { + $this->auth->login($user); + } + } + + return $next($request); + } +} From 6ce087e5adce90774f58d6196c70f4c167b47c72 Mon Sep 17 00:00:00 2001 From: James Brooks Date: Thu, 3 Jan 2019 19:45:59 +0000 Subject: [PATCH 02/54] Apply fixes from StyleCI --- app/Foundation/Providers/RouteServiceProvider.php | 4 ++-- app/Http/Kernel.php | 2 +- app/Http/Middleware/RemoteUserAuthenticate.php | 13 +++++++++++-- 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/app/Foundation/Providers/RouteServiceProvider.php b/app/Foundation/Providers/RouteServiceProvider.php index 26171a78..907522dc 100644 --- a/app/Foundation/Providers/RouteServiceProvider.php +++ b/app/Foundation/Providers/RouteServiceProvider.php @@ -14,6 +14,7 @@ namespace CachetHQ\Cachet\Foundation\Providers; use Barryvdh\Cors\HandleCors; use CachetHQ\Cachet\Http\Middleware\Acceptable; use CachetHQ\Cachet\Http\Middleware\Authenticate; +use CachetHQ\Cachet\Http\Middleware\RemoteUserAuthenticate; use CachetHQ\Cachet\Http\Middleware\Timezone; use CachetHQ\Cachet\Http\Routes\ApiSystemRoutes; use CachetHQ\Cachet\Http\Routes\AuthRoutes; @@ -28,7 +29,6 @@ use Illuminate\Routing\Middleware\SubstituteBindings; use Illuminate\Routing\Router; use Illuminate\Session\Middleware\StartSession; use Illuminate\View\Middleware\ShareErrorsFromSession; -use CachetHQ\Cachet\Http\Middleware\RemoteUserAuthenticate; /** * This is the route service provider. @@ -150,7 +150,7 @@ class RouteServiceProvider extends ServiceProvider VerifyCsrfToken::class, SubstituteBindings::class, ]; - + if ($applyAlwaysAuthenticate && !$this->isWhiteListedAuthRoute($routes)) { $middleware[] = Authenticate::class; $middleware[] = RemoteUserAuthenticate::class; diff --git a/app/Http/Kernel.php b/app/Http/Kernel.php index 565e064b..22b3a679 100644 --- a/app/Http/Kernel.php +++ b/app/Http/Kernel.php @@ -18,13 +18,13 @@ use CachetHQ\Cachet\Http\Middleware\Authenticate; use CachetHQ\Cachet\Http\Middleware\Localize; use CachetHQ\Cachet\Http\Middleware\ReadyForUse; use CachetHQ\Cachet\Http\Middleware\RedirectIfAuthenticated; +use CachetHQ\Cachet\Http\Middleware\RemoteUserAuthenticate; use CachetHQ\Cachet\Http\Middleware\SetupAlreadyCompleted; use CachetHQ\Cachet\Http\Middleware\SubscribersConfigured; use CachetHQ\Cachet\Http\Middleware\TrustProxies; use Illuminate\Auth\Middleware\Authorize; use Illuminate\Foundation\Http\Kernel as HttpKernel; use Illuminate\Foundation\Http\Middleware\CheckForMaintenanceMode; -use CachetHQ\Cachet\Http\Middleware\RemoteUserAuthenticate; class Kernel extends HttpKernel { diff --git a/app/Http/Middleware/RemoteUserAuthenticate.php b/app/Http/Middleware/RemoteUserAuthenticate.php index 5bf6cf7f..075c0c4a 100644 --- a/app/Http/Middleware/RemoteUserAuthenticate.php +++ b/app/Http/Middleware/RemoteUserAuthenticate.php @@ -1,5 +1,14 @@ Date: Fri, 18 Jan 2019 02:01:43 +0200 Subject: [PATCH 03/54] Update ComponentStatusChangedNotification.php --- .../Component/ComponentStatusChangedNotification.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Notifications/Component/ComponentStatusChangedNotification.php b/app/Notifications/Component/ComponentStatusChangedNotification.php index 8621e6f7..47502ed2 100644 --- a/app/Notifications/Component/ComponentStatusChangedNotification.php +++ b/app/Notifications/Component/ComponentStatusChangedNotification.php @@ -140,7 +140,7 @@ class ComponentStatusChangedNotification extends Notification return (new SlackMessage()) ->$status() - ->content(trans('notifications.component.status_update.slack.subject')) + ->content(trans('notifications.component.status_update.slack.title')) ->attachment(function ($attachment) use ($content, $notifiable) { $attachment->title($content, cachet_route('status-page')) ->fields(array_filter([ From d52c961adf3b5fa5ba3afde767c9f878c4dfd76f Mon Sep 17 00:00:00 2001 From: Antonio Date: Fri, 18 Jan 2019 03:00:51 +0200 Subject: [PATCH 04/54] Update NewIncidentNotification.php Fix a incident name issue --- app/Notifications/Incident/NewIncidentNotification.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Notifications/Incident/NewIncidentNotification.php b/app/Notifications/Incident/NewIncidentNotification.php index 8ad938bb..f816fa6f 100644 --- a/app/Notifications/Incident/NewIncidentNotification.php +++ b/app/Notifications/Incident/NewIncidentNotification.php @@ -128,7 +128,7 @@ class NewIncidentNotification extends Notification ->$status() ->content($content) ->attachment(function ($attachment) use ($notifiable) { - $attachment->title(trans('notifications.incident.new.slack.title', [$this->incident->name])) + $attachment->title(trans('notifications.incident.new.slack.title', ['name' => $this->incident->name])) ->timestamp($this->incident->getWrappedObject()->occurred_at) ->fields(array_filter([ 'ID' => "#{$this->incident->id}", From 3b4e2e62364e7cf01ce9a8302e2da4c078fb925d Mon Sep 17 00:00:00 2001 From: Antonio Date: Fri, 18 Jan 2019 03:03:04 +0200 Subject: [PATCH 05/54] Update NewIncidentNotification.php Remove slack unsubscribe --- app/Notifications/Incident/NewIncidentNotification.php | 1 - 1 file changed, 1 deletion(-) diff --git a/app/Notifications/Incident/NewIncidentNotification.php b/app/Notifications/Incident/NewIncidentNotification.php index f816fa6f..e4344d99 100644 --- a/app/Notifications/Incident/NewIncidentNotification.php +++ b/app/Notifications/Incident/NewIncidentNotification.php @@ -134,7 +134,6 @@ class NewIncidentNotification extends Notification 'ID' => "#{$this->incident->id}", 'Link' => $this->incident->permalink, ])) - ->footer(trans('cachet.subscriber.unsubscribe', ['link' => cachet_route('subscribe.unsubscribe', $notifiable->verify_code)])); }); } } From 699df0b9f6fd243a2d4337820a42b0989f151e68 Mon Sep 17 00:00:00 2001 From: Antonio Date: Fri, 18 Jan 2019 03:05:26 +0200 Subject: [PATCH 06/54] Update NewIncidentNotification.php --- app/Notifications/Incident/NewIncidentNotification.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Notifications/Incident/NewIncidentNotification.php b/app/Notifications/Incident/NewIncidentNotification.php index e4344d99..c0f956b2 100644 --- a/app/Notifications/Incident/NewIncidentNotification.php +++ b/app/Notifications/Incident/NewIncidentNotification.php @@ -133,7 +133,7 @@ class NewIncidentNotification extends Notification ->fields(array_filter([ 'ID' => "#{$this->incident->id}", 'Link' => $this->incident->permalink, - ])) + ])); }); } } From e983b43b53b074ded129cb238a5517e7f7785ca7 Mon Sep 17 00:00:00 2001 From: Antonio Date: Fri, 18 Jan 2019 22:41:35 +0200 Subject: [PATCH 07/54] fix notifiction for slack --- app/Notifications/Schedule/NewScheduleNotification.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app/Notifications/Schedule/NewScheduleNotification.php b/app/Notifications/Schedule/NewScheduleNotification.php index 2ba73596..b86c61de 100644 --- a/app/Notifications/Schedule/NewScheduleNotification.php +++ b/app/Notifications/Schedule/NewScheduleNotification.php @@ -124,8 +124,7 @@ class NewScheduleNotification extends Notification implements ShouldQueue ->fields(array_filter([ 'ID' => "#{$this->schedule->id}", 'Status' => $this->schedule->human_status, - ])) - ->footer(trans('cachet.subscriber.unsubscribe', ['link' => cachet_route('subscribe.unsubscribe', $notifiable->verify_code)])); + ])); }); } } From 01281b2c47a05deff74e6736ae68ada69d863329 Mon Sep 17 00:00:00 2001 From: Antonio Date: Sat, 19 Jan 2019 02:12:28 +0200 Subject: [PATCH 08/54] Update index.blade.php Eding manage button for subscription --- resources/views/dashboard/subscribers/index.blade.php | 1 + 1 file changed, 1 insertion(+) diff --git a/resources/views/dashboard/subscribers/index.blade.php b/resources/views/dashboard/subscribers/index.blade.php index 55c0f926..74b72ee9 100644 --- a/resources/views/dashboard/subscribers/index.blade.php +++ b/resources/views/dashboard/subscribers/index.blade.php @@ -51,6 +51,7 @@ @endif
+ {{ trans('forms.edit') }} {{ trans('forms.delete') }}
From e1988f345ee3cd657021d4ba5ad163f60e423708 Mon Sep 17 00:00:00 2001 From: Antonio Date: Sat, 19 Jan 2019 02:30:54 +0200 Subject: [PATCH 09/54] Update SubscriberRoutes.php Adding manage route --- app/Http/Routes/Dashboard/SubscriberRoutes.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app/Http/Routes/Dashboard/SubscriberRoutes.php b/app/Http/Routes/Dashboard/SubscriberRoutes.php index 129d786f..03a94584 100644 --- a/app/Http/Routes/Dashboard/SubscriberRoutes.php +++ b/app/Http/Routes/Dashboard/SubscriberRoutes.php @@ -60,6 +60,10 @@ class SubscriberRoutes 'as' => 'delete:dashboard.subscribers.delete', 'uses' => 'SubscriberController@deleteSubscriberAction', ]); + $router->post('{subscriber}/manage', [ + 'as' => 'manage:dashboard.subscribers.manage', + 'uses' => 'SubscriberController@manageSubscriberAction', + ]); }); } } From a3332054aa026e6dc0e50ad6c167f09849f2a2a7 Mon Sep 17 00:00:00 2001 From: Antonio Date: Sat, 19 Jan 2019 03:03:44 +0200 Subject: [PATCH 10/54] Revert --- app/Http/Routes/Dashboard/SubscriberRoutes.php | 4 ---- 1 file changed, 4 deletions(-) diff --git a/app/Http/Routes/Dashboard/SubscriberRoutes.php b/app/Http/Routes/Dashboard/SubscriberRoutes.php index 03a94584..129d786f 100644 --- a/app/Http/Routes/Dashboard/SubscriberRoutes.php +++ b/app/Http/Routes/Dashboard/SubscriberRoutes.php @@ -60,10 +60,6 @@ class SubscriberRoutes 'as' => 'delete:dashboard.subscribers.delete', 'uses' => 'SubscriberController@deleteSubscriberAction', ]); - $router->post('{subscriber}/manage', [ - 'as' => 'manage:dashboard.subscribers.manage', - 'uses' => 'SubscriberController@manageSubscriberAction', - ]); }); } } From 27a0fb60080c2bef61b132c3de2a87732665f2e5 Mon Sep 17 00:00:00 2001 From: Antonio Date: Sat, 19 Jan 2019 03:05:12 +0200 Subject: [PATCH 11/54] Update index.blade.php --- resources/views/dashboard/subscribers/index.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/views/dashboard/subscribers/index.blade.php b/resources/views/dashboard/subscribers/index.blade.php index 74b72ee9..37ad2090 100644 --- a/resources/views/dashboard/subscribers/index.blade.php +++ b/resources/views/dashboard/subscribers/index.blade.php @@ -51,7 +51,7 @@ @endif
- {{ trans('forms.edit') }} + {{ trans('forms.edit') }} {{ trans('forms.delete') }}
From 123d24da9381fd16411031148c125307b92a7403 Mon Sep 17 00:00:00 2001 From: Antonio Date: Sat, 19 Jan 2019 03:16:32 +0200 Subject: [PATCH 12/54] Admin permision should override setting enableSubscribers is used for Signup on the main dashboard, but cannot be forced for Admin on control --- resources/views/dashboard/subscribers/index.blade.php | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/resources/views/dashboard/subscribers/index.blade.php b/resources/views/dashboard/subscribers/index.blade.php index 37ad2090..bba28c24 100644 --- a/resources/views/dashboard/subscribers/index.blade.php +++ b/resources/views/dashboard/subscribers/index.blade.php @@ -8,7 +8,7 @@ {{ trans('dashboard.subscribers.subscribers') }} - @if($currentUser->isAdmin && $enableSubscribers) + @if($currentUser->isAdmin) {{ trans('dashboard.subscribers.add.title') }} @@ -19,11 +19,7 @@

- @if($enableSubscribers) {{ trans('dashboard.subscribers.description') }} - @else - {{ trans('dashboard.subscribers.description_disabled') }} - @endif

From 47470146aec8394be60313fccceb07be013486aa Mon Sep 17 00:00:00 2001 From: Antonio Date: Sat, 19 Jan 2019 15:39:10 +0200 Subject: [PATCH 13/54] Manage subscribtion Existing subscription user should be able to manage his setting without considering if he is allowed to subscribe or not. --- app/Http/Middleware/SubscribersConfigured.php | 4 ---- 1 file changed, 4 deletions(-) diff --git a/app/Http/Middleware/SubscribersConfigured.php b/app/Http/Middleware/SubscribersConfigured.php index a8bc4056..adcdd7bf 100644 --- a/app/Http/Middleware/SubscribersConfigured.php +++ b/app/Http/Middleware/SubscribersConfigured.php @@ -52,10 +52,6 @@ class SubscribersConfigured */ public function handle(Request $request, Closure $next) { - if (!$this->config->get('setting.enable_subscribers')) { - return cachet_redirect('status-page'); - } - return $next($request); } } From d32f5e1aeac6dfeb39b94302588103f88c7531f1 Mon Sep 17 00:00:00 2001 From: James Brooks Date: Tue, 19 Feb 2019 07:27:44 +0000 Subject: [PATCH 14/54] Add Cache Control middleware for #3479 --- app/Http/Kernel.php | 2 ++ app/Http/Middleware/CacheControl.php | 36 ++++++++++++++++++++++++++++ app/Http/Routes/ApiSystemRoutes.php | 2 +- 3 files changed, 39 insertions(+), 1 deletion(-) create mode 100644 app/Http/Middleware/CacheControl.php diff --git a/app/Http/Kernel.php b/app/Http/Kernel.php index cc9e60b8..df30b79e 100644 --- a/app/Http/Kernel.php +++ b/app/Http/Kernel.php @@ -15,6 +15,7 @@ use Barryvdh\Cors\HandleCors; use CachetHQ\Cachet\Http\Middleware\Admin; use CachetHQ\Cachet\Http\Middleware\ApiAuthentication; use CachetHQ\Cachet\Http\Middleware\Authenticate; +use CachetHQ\Cachet\Http\Middleware\CacheControl; use CachetHQ\Cachet\Http\Middleware\Localize; use CachetHQ\Cachet\Http\Middleware\ReadyForUse; use CachetHQ\Cachet\Http\Middleware\RedirectIfAuthenticated; @@ -47,6 +48,7 @@ class Kernel extends HttpKernel 'admin' => Admin::class, 'can' => Authorize::class, 'cors' => HandleCors::class, + 'cache' => CacheControl::class, 'auth' => Authenticate::class, 'auth.api' => ApiAuthentication::class, 'guest' => RedirectIfAuthenticated::class, diff --git a/app/Http/Middleware/CacheControl.php b/app/Http/Middleware/CacheControl.php new file mode 100644 index 00000000..f6b6b3fa --- /dev/null +++ b/app/Http/Middleware/CacheControl.php @@ -0,0 +1,36 @@ +header('Cache-Control', 'public,max-age='.$maxAge); + + return $response; + } +} diff --git a/app/Http/Routes/ApiSystemRoutes.php b/app/Http/Routes/ApiSystemRoutes.php index 80899f71..92a7aa2e 100644 --- a/app/Http/Routes/ApiSystemRoutes.php +++ b/app/Http/Routes/ApiSystemRoutes.php @@ -43,7 +43,7 @@ class ApiSystemRoutes $router->group(['middleware' => ['auth.api']], function (Registrar $router) { $router->get('ping', 'GeneralController@ping'); $router->get('version', 'GeneralController@version'); - $router->get('status', 'GeneralController@status'); + $router->get('status', ['uses' => 'GeneralController@status', 'middleware' => ['cache']]); }); }); } From 5157e67f5048042b97c3118ce52f816c8cfa03e8 Mon Sep 17 00:00:00 2001 From: James Brooks Date: Tue, 19 Feb 2019 07:30:28 +0000 Subject: [PATCH 15/54] Add status API tests --- tests/Api/GeneralTest.php | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/tests/Api/GeneralTest.php b/tests/Api/GeneralTest.php index ef153884..637d44c8 100644 --- a/tests/Api/GeneralTest.php +++ b/tests/Api/GeneralTest.php @@ -11,6 +11,8 @@ namespace CachetHQ\Tests\Cachet\Api; +use CachetHQ\Cachet\Models\Component; + /** * This is the general test class. * @@ -42,4 +44,36 @@ class GeneralTest extends AbstractApiTestCase $response->assertStatus(406); } + + public function test_can_get_system_status() + { + $response = $this->json('GET', '/api/v1/status'); + + $response->assertStatus(200) + ->assertHeader('Cache-Control') + ->assertJsonFragment([ + 'data' => [ + 'status' => 'success', + 'message' => 'System operational' + ] + ]); + } + + public function test_can_get_system_status_not_success() + { + factory(Component::class)->create([ + 'status' => 3, + ]); + + $response = $this->json('GET', '/api/v1/status'); + + $response->assertStatus(200) + ->assertHeader('Cache-Control') + ->assertJsonFragment([ + 'data' => [ + 'status' => 'info', + 'message' => 'The system is experiencing issues' + ] + ]); + } } From c6bb329ef8914b29be1beec21b4de633b8a491e7 Mon Sep 17 00:00:00 2001 From: James Brooks Date: Tue, 19 Feb 2019 07:30:51 +0000 Subject: [PATCH 16/54] Apply fixes from StyleCI --- app/Http/Middleware/CacheControl.php | 5 +++-- tests/Api/GeneralTest.php | 8 ++++---- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/app/Http/Middleware/CacheControl.php b/app/Http/Middleware/CacheControl.php index f6b6b3fa..fa54dfe0 100644 --- a/app/Http/Middleware/CacheControl.php +++ b/app/Http/Middleware/CacheControl.php @@ -19,8 +19,9 @@ class CacheControl /** * Handle an incoming request. * - * @param \Illuminate\Http\Request $request - * @param \Closure $next + * @param \Illuminate\Http\Request $request + * @param \Closure $next + * * @return mixed */ public function handle(Request $request, Closure $next) diff --git a/tests/Api/GeneralTest.php b/tests/Api/GeneralTest.php index 637d44c8..6d0d77cf 100644 --- a/tests/Api/GeneralTest.php +++ b/tests/Api/GeneralTest.php @@ -54,8 +54,8 @@ class GeneralTest extends AbstractApiTestCase ->assertJsonFragment([ 'data' => [ 'status' => 'success', - 'message' => 'System operational' - ] + 'message' => 'System operational', + ], ]); } @@ -72,8 +72,8 @@ class GeneralTest extends AbstractApiTestCase ->assertJsonFragment([ 'data' => [ 'status' => 'info', - 'message' => 'The system is experiencing issues' - ] + 'message' => 'The system is experiencing issues', + ], ]); } } From a86793079cdf84082f93e5b481f33ce32455bf42 Mon Sep 17 00:00:00 2001 From: Anne-Greeth van Herwijnen Date: Fri, 26 Apr 2019 11:50:15 +0200 Subject: [PATCH 17/54] Make maintenance also optional to notify subscribers --- .../Schedule/CreateScheduleCommand.php | 12 +++++++++++- .../Schedule/ScheduleWasCreatedEvent.php | 11 ++++++++++- .../Schedule/CreateScheduleCommandHandler.php | 4 ++-- .../SendScheduleEmailNotificationHandler.php | 3 +++ .../Dashboard/ScheduleController.php | 18 +++++++++++++++--- .../views/dashboard/maintenance/add.blade.php | 10 +++++++++- 6 files changed, 50 insertions(+), 8 deletions(-) diff --git a/app/Bus/Commands/Schedule/CreateScheduleCommand.php b/app/Bus/Commands/Schedule/CreateScheduleCommand.php index ebeec0d8..ffaee9d7 100644 --- a/app/Bus/Commands/Schedule/CreateScheduleCommand.php +++ b/app/Bus/Commands/Schedule/CreateScheduleCommand.php @@ -60,6 +60,13 @@ final class CreateScheduleCommand */ public $components; + /** + * Whether to notify that the incident was reported. + * + * @var bool + */ + public $notify; + /** * The validation rules. * @@ -72,6 +79,7 @@ final class CreateScheduleCommand 'scheduled_at' => 'required|string', 'completed_at' => 'nullable|string', 'components' => 'nullable|array', + 'notify' => 'nullable|bool' ]; /** @@ -83,10 +91,11 @@ final class CreateScheduleCommand * @param string $scheduled_at * @param string $completed_at * @param array $components + * @param notify $notify * * @return void */ - public function __construct($name, $message, $status, $scheduled_at, $completed_at, array $components = []) + public function __construct($name, $message, $status, $scheduled_at, $completed_at, array $components = [], $notify) { $this->name = $name; $this->message = $message; @@ -94,5 +103,6 @@ final class CreateScheduleCommand $this->scheduled_at = $scheduled_at; $this->completed_at = $completed_at; $this->components = $components; + $this->notify = $notify; } } diff --git a/app/Bus/Events/Schedule/ScheduleWasCreatedEvent.php b/app/Bus/Events/Schedule/ScheduleWasCreatedEvent.php index 1e1ecb4e..d16612c0 100644 --- a/app/Bus/Events/Schedule/ScheduleWasCreatedEvent.php +++ b/app/Bus/Events/Schedule/ScheduleWasCreatedEvent.php @@ -36,18 +36,27 @@ final class ScheduleWasCreatedEvent implements ActionInterface, ScheduleEventInt */ public $schedule; + /** + * Whether to notify that the incident was reported. + * + * @var bool + */ + public $notify; + /** * Create a new schedule was created event instance. * * @param \CachetHQ\Cachet\Models\User $user * @param \CachetHQ\Cachet\Models\Schedule $schedule + * @param bool notify * * @return void */ - public function __construct(User $user, Schedule $schedule) + public function __construct(User $user, Schedule $schedule, $notify = false) { $this->user = $user; $this->schedule = $schedule; + $this->notify = $notify; } /** diff --git a/app/Bus/Handlers/Commands/Schedule/CreateScheduleCommandHandler.php b/app/Bus/Handlers/Commands/Schedule/CreateScheduleCommandHandler.php index 23de4933..9069eadb 100644 --- a/app/Bus/Handlers/Commands/Schedule/CreateScheduleCommandHandler.php +++ b/app/Bus/Handlers/Commands/Schedule/CreateScheduleCommandHandler.php @@ -66,8 +66,7 @@ class CreateScheduleCommandHandler { try { $schedule = Schedule::create($this->filter($command)); - - event(new ScheduleWasCreatedEvent($this->auth->user(), $schedule)); + event(new ScheduleWasCreatedEvent($this->auth->user(), $schedule, (bool) $command->notify)); } catch (InvalidArgumentException $e) { throw new ValidationException(new MessageBag([$e->getMessage()])); } @@ -96,6 +95,7 @@ class CreateScheduleCommandHandler 'status' => $command->status, 'scheduled_at' => $scheduledAt, 'completed_at' => $completedAt, + 'notify' => $command->notify, ]; $availableParams = array_filter($params, function ($val) { diff --git a/app/Bus/Handlers/Events/Schedule/SendScheduleEmailNotificationHandler.php b/app/Bus/Handlers/Events/Schedule/SendScheduleEmailNotificationHandler.php index 11e6b377..84e9db31 100644 --- a/app/Bus/Handlers/Events/Schedule/SendScheduleEmailNotificationHandler.php +++ b/app/Bus/Handlers/Events/Schedule/SendScheduleEmailNotificationHandler.php @@ -51,6 +51,9 @@ class SendScheduleEmailNotificationHandler public function handle(ScheduleEventInterface $event) { $schedule = $event->schedule; + if (!$event->notify) { + return false; + } // First notify all global subscribers. $globalSubscribers = $this->subscriber->isVerified()->isGlobal()->get()->each(function ($subscriber) use ($schedule) { diff --git a/app/Http/Controllers/Dashboard/ScheduleController.php b/app/Http/Controllers/Dashboard/ScheduleController.php index ceb369bc..6f32768f 100644 --- a/app/Http/Controllers/Dashboard/ScheduleController.php +++ b/app/Http/Controllers/Dashboard/ScheduleController.php @@ -15,6 +15,7 @@ use AltThree\Validator\ValidationException; use CachetHQ\Cachet\Bus\Commands\Schedule\CreateScheduleCommand; use CachetHQ\Cachet\Bus\Commands\Schedule\DeleteScheduleCommand; use CachetHQ\Cachet\Bus\Commands\Schedule\UpdateScheduleCommand; +use CachetHQ\Cachet\Integrations\Contracts\System; use CachetHQ\Cachet\Models\IncidentTemplate; use CachetHQ\Cachet\Models\Schedule; use GrahamCampbell\Binput\Facades\Binput; @@ -35,13 +36,22 @@ class ScheduleController extends Controller */ protected $subMenu = []; + /** + * The system instance. + * + * @var \CachetHQ\Cachet\Integrations\Contracts\System + */ + protected $system; + + /** * Creates a new schedule controller instance. * * @return void */ - public function __construct() + public function __construct(System $system) { + $this->system = $system; View::share('subTitle', trans('dashboard.schedule.title')); } @@ -70,7 +80,8 @@ class ScheduleController extends Controller return View::make('dashboard.maintenance.add') ->withPageTitle(trans('dashboard.schedule.add.title').' - '.trans('dashboard.dashboard')) - ->withIncidentTemplates($incidentTemplates); + ->withIncidentTemplates($incidentTemplates) + ->withNotificationsEnabled($this->system->canNotifySubscribers()); } /** @@ -87,7 +98,8 @@ class ScheduleController extends Controller Binput::get('status', Schedule::UPCOMING), Binput::get('scheduled_at'), Binput::get('completed_at'), - Binput::get('components', []) + Binput::get('components', []), + Binput::get('notify', false) )); } catch (ValidationException $e) { return cachet_redirect('dashboard.schedule.create') diff --git a/resources/views/dashboard/maintenance/add.blade.php b/resources/views/dashboard/maintenance/add.blade.php index 99a64bba..07c5d6fa 100644 --- a/resources/views/dashboard/maintenance/add.blade.php +++ b/resources/views/dashboard/maintenance/add.blade.php @@ -57,7 +57,15 @@
- + @if($notificationsEnabled) + +
+ +
+ @endif
From b5816a3340ec5d057fe89c6f4e9789a8f75ed229 Mon Sep 17 00:00:00 2001 From: Anne-Greeth van Herwijnen Date: Fri, 26 Apr 2019 13:12:30 +0200 Subject: [PATCH 18/54] Fix StyleCI --- app/Bus/Commands/Schedule/CreateScheduleCommand.php | 4 ++-- app/Bus/Events/Schedule/ScheduleWasCreatedEvent.php | 4 ++-- app/Http/Controllers/Dashboard/ScheduleController.php | 1 - 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/app/Bus/Commands/Schedule/CreateScheduleCommand.php b/app/Bus/Commands/Schedule/CreateScheduleCommand.php index ffaee9d7..db65f737 100644 --- a/app/Bus/Commands/Schedule/CreateScheduleCommand.php +++ b/app/Bus/Commands/Schedule/CreateScheduleCommand.php @@ -79,7 +79,7 @@ final class CreateScheduleCommand 'scheduled_at' => 'required|string', 'completed_at' => 'nullable|string', 'components' => 'nullable|array', - 'notify' => 'nullable|bool' + 'notify' => 'nullable|bool', ]; /** @@ -95,7 +95,7 @@ final class CreateScheduleCommand * * @return void */ - public function __construct($name, $message, $status, $scheduled_at, $completed_at, array $components = [], $notify) + public function __construct($name, $message, $status, $scheduled_at, $completed_at, $components, $notify) { $this->name = $name; $this->message = $message; diff --git a/app/Bus/Events/Schedule/ScheduleWasCreatedEvent.php b/app/Bus/Events/Schedule/ScheduleWasCreatedEvent.php index d16612c0..2438658d 100644 --- a/app/Bus/Events/Schedule/ScheduleWasCreatedEvent.php +++ b/app/Bus/Events/Schedule/ScheduleWasCreatedEvent.php @@ -36,7 +36,7 @@ final class ScheduleWasCreatedEvent implements ActionInterface, ScheduleEventInt */ public $schedule; - /** + /** * Whether to notify that the incident was reported. * * @var bool @@ -52,7 +52,7 @@ final class ScheduleWasCreatedEvent implements ActionInterface, ScheduleEventInt * * @return void */ - public function __construct(User $user, Schedule $schedule, $notify = false) + public function __construct(User $user, Schedule $schedule, $notify = false) { $this->user = $user; $this->schedule = $schedule; diff --git a/app/Http/Controllers/Dashboard/ScheduleController.php b/app/Http/Controllers/Dashboard/ScheduleController.php index 6f32768f..c06216a9 100644 --- a/app/Http/Controllers/Dashboard/ScheduleController.php +++ b/app/Http/Controllers/Dashboard/ScheduleController.php @@ -43,7 +43,6 @@ class ScheduleController extends Controller */ protected $system; - /** * Creates a new schedule controller instance. * From 1bbe3dcefaf979cdd615e5ac783c6c96c0c2e870 Mon Sep 17 00:00:00 2001 From: Anne-Greeth van Herwijnen Date: Fri, 26 Apr 2019 13:25:39 +0200 Subject: [PATCH 19/54] Fix tests --- tests/Bus/Commands/Schedule/CreateScheduleCommandTest.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tests/Bus/Commands/Schedule/CreateScheduleCommandTest.php b/tests/Bus/Commands/Schedule/CreateScheduleCommandTest.php index 3c3896fc..3377bef9 100644 --- a/tests/Bus/Commands/Schedule/CreateScheduleCommandTest.php +++ b/tests/Bus/Commands/Schedule/CreateScheduleCommandTest.php @@ -34,6 +34,7 @@ class CreateScheduleCommandTest extends AbstractTestCase 'scheduled_at' => date('Y-m-d H:i'), 'completed_at' => date('Y-m-d H:i'), 'components' => [], + 'notify' => 1, ]; $object = new CreateScheduleCommand( $params['name'], @@ -41,7 +42,8 @@ class CreateScheduleCommandTest extends AbstractTestCase $params['status'], $params['scheduled_at'], $params['completed_at'], - $params['components'] + $params['components'], + $params['notify'] ); return compact('params', 'object'); From 9f42d55bb689eaad3c19d912dd50dda123a033cd Mon Sep 17 00:00:00 2001 From: Anne-Greeth van Herwijnen Date: Fri, 26 Apr 2019 14:17:55 +0200 Subject: [PATCH 20/54] Oopsie in the docs --- app/Bus/Commands/Schedule/CreateScheduleCommand.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Bus/Commands/Schedule/CreateScheduleCommand.php b/app/Bus/Commands/Schedule/CreateScheduleCommand.php index db65f737..c7adc096 100644 --- a/app/Bus/Commands/Schedule/CreateScheduleCommand.php +++ b/app/Bus/Commands/Schedule/CreateScheduleCommand.php @@ -91,7 +91,7 @@ final class CreateScheduleCommand * @param string $scheduled_at * @param string $completed_at * @param array $components - * @param notify $notify + * @param bool $notify * * @return void */ From 57dd008064a3f373c136c8c22ac8bacc4ecaeeed Mon Sep 17 00:00:00 2001 From: Anne-Greeth van Herwijnen Date: Fri, 26 Apr 2019 14:26:50 +0200 Subject: [PATCH 21/54] Adds notify to test --- app/Bus/Commands/Schedule/CreateScheduleCommand.php | 2 +- tests/Api/ScheduleTest.php | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/app/Bus/Commands/Schedule/CreateScheduleCommand.php b/app/Bus/Commands/Schedule/CreateScheduleCommand.php index c7adc096..d40d68df 100644 --- a/app/Bus/Commands/Schedule/CreateScheduleCommand.php +++ b/app/Bus/Commands/Schedule/CreateScheduleCommand.php @@ -91,7 +91,7 @@ final class CreateScheduleCommand * @param string $scheduled_at * @param string $completed_at * @param array $components - * @param bool $notify + * @param bool $notify * * @return void */ diff --git a/tests/Api/ScheduleTest.php b/tests/Api/ScheduleTest.php index 99b67b64..3c114c05 100644 --- a/tests/Api/ScheduleTest.php +++ b/tests/Api/ScheduleTest.php @@ -52,6 +52,7 @@ class ScheduleTest extends AbstractApiTestCase 'message' => 'Foo bar, baz.', 'status' => 1, 'scheduled_at' => date('Y-m-d H:i'), + 'notify' => 1, ]; $response = $this->json('POST', '/api/v1/schedules/', $schedule); From 29e0cf95281ba205b6503458322d21de85638968 Mon Sep 17 00:00:00 2001 From: Anne-Greeth van Herwijnen Date: Fri, 26 Apr 2019 14:41:25 +0200 Subject: [PATCH 22/54] Forgot to add notify to CreatScheduleCommand in API --- app/Http/Controllers/Api/ScheduleController.php | 3 ++- tests/Api/ScheduleTest.php | 1 - 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Http/Controllers/Api/ScheduleController.php b/app/Http/Controllers/Api/ScheduleController.php index d12eabc7..c59f46db 100644 --- a/app/Http/Controllers/Api/ScheduleController.php +++ b/app/Http/Controllers/Api/ScheduleController.php @@ -73,7 +73,8 @@ class ScheduleController extends AbstractApiController Binput::get('status'), Binput::get('scheduled_at'), Binput::get('completed_at'), - Binput::get('components', []) + Binput::get('components', []), + Binput::get('notify', false) )); } catch (QueryException $e) { throw new BadRequestHttpException(); diff --git a/tests/Api/ScheduleTest.php b/tests/Api/ScheduleTest.php index 3c114c05..99b67b64 100644 --- a/tests/Api/ScheduleTest.php +++ b/tests/Api/ScheduleTest.php @@ -52,7 +52,6 @@ class ScheduleTest extends AbstractApiTestCase 'message' => 'Foo bar, baz.', 'status' => 1, 'scheduled_at' => date('Y-m-d H:i'), - 'notify' => 1, ]; $response = $this->json('POST', '/api/v1/schedules/', $schedule); From 9eacc59e100ee691633df8f7daf606d5a608d629 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" Date: Sat, 1 Jun 2019 05:12:38 +0000 Subject: [PATCH 23/54] [Security] Bump axios from 0.18.0 to 0.18.1 Bumps [axios](https://github.com/axios/axios) from 0.18.0 to 0.18.1. **This update includes security fixes.** - [Release notes](https://github.com/axios/axios/releases) - [Changelog](https://github.com/axios/axios/blob/v0.18.1/CHANGELOG.md) - [Commits](https://github.com/axios/axios/compare/v0.18.0...v0.18.1) --- yarn.lock | 31 +++++++++++++++++++++++++------ 1 file changed, 25 insertions(+), 6 deletions(-) diff --git a/yarn.lock b/yarn.lock index 7b1cc798..edc728a6 100644 --- a/yarn.lock +++ b/yarn.lock @@ -320,12 +320,12 @@ aws4@^1.8.0: integrity sha512-ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ== axios@^0.18: - version "0.18.0" - resolved "https://registry.yarnpkg.com/axios/-/axios-0.18.0.tgz#32d53e4851efdc0a11993b6cd000789d70c05102" - integrity sha1-MtU+SFHv3AoRmTts0AB4nXDAUQI= + version "0.18.1" + resolved "https://registry.yarnpkg.com/axios/-/axios-0.18.1.tgz#ff3f0de2e7b5d180e757ad98000f1081b87bcea3" + integrity sha512-0BfJq4NSfQXd+SkFdrvFbG7addhYSBA2mQwISr46pD6E5iqkWg02RAs8vyTT/j0RTnoYmeXauBuSv1qKwR179g== dependencies: - follow-redirects "^1.3.0" - is-buffer "^1.1.5" + follow-redirects "1.5.10" + is-buffer "^2.0.2" babel-code-frame@^6.26.0: version "6.26.0" @@ -1861,6 +1861,13 @@ debug@2.6.9, debug@^2.2.0, debug@^2.3.3, debug@^2.6.6, debug@^2.6.8, debug@^2.6. dependencies: ms "2.0.0" +debug@=3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261" + integrity sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g== + dependencies: + ms "2.0.0" + debug@^3.1.0, debug@^3.2.6: version "3.2.6" resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.6.tgz#e83d17de16d8a7efb7717edbe5fb10135eee629b" @@ -2549,7 +2556,14 @@ flush-write-stream@^1.0.0: inherits "^2.0.3" readable-stream "^2.3.6" -follow-redirects@^1.0.0, follow-redirects@^1.3.0: +follow-redirects@1.5.10: + version "1.5.10" + resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.5.10.tgz#7b7a9f9aea2fdff36786a94ff643ed07f4ff5e2a" + integrity sha512-0V5l4Cizzvqt5D44aTXbFZz+FtyXV1vrDN6qrelxtfYQKW0KO0W2T/hkE8xvGa/540LkZlkaUjO4ailYTFtHVQ== + dependencies: + debug "=3.1.0" + +follow-redirects@^1.0.0: version "1.7.0" resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.7.0.tgz#489ebc198dc0e7f64167bd23b03c4c19b5784c76" integrity sha512-m/pZQy4Gj287eNy94nivy5wchN3Kp+Q5WgUPNy5lJSZ3sgkVKSYV/ZChMAQVIgx1SqfZ2zBZtPA2YlXIWxxJOQ== @@ -3245,6 +3259,11 @@ is-buffer@^1.1.5, is-buffer@~1.1.1: resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be" integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w== +is-buffer@^2.0.2: + version "2.0.3" + resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-2.0.3.tgz#4ecf3fcf749cbd1e472689e109ac66261a25e725" + integrity sha512-U15Q7MXTuZlrbymiz95PJpZxu8IlipAp4dtS3wOdgPXx3mqBnslrWU14kxfHB+Py/+2PVKSr37dMAgM2A4uArw== + is-callable@^1.1.4: version "1.1.4" resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.1.4.tgz#1e1adf219e1eeb684d691f9d6a05ff0d30a24d75" From c61085a5428853566b703f488c5a045e7b9105a6 Mon Sep 17 00:00:00 2001 From: James Brooks Date: Thu, 6 Jun 2019 14:32:00 +0100 Subject: [PATCH 24/54] Update deps --- composer.lock | 721 +++++++++++++++++++++++++++++++++++--------------- 1 file changed, 501 insertions(+), 220 deletions(-) diff --git a/composer.lock b/composer.lock index a148b89f..806a7066 100644 --- a/composer.lock +++ b/composer.lock @@ -358,16 +358,16 @@ }, { "name": "aws/aws-sdk-php", - "version": "3.95.0", + "version": "3.99.2", "source": { "type": "git", "url": "https://github.com/aws/aws-sdk-php.git", - "reference": "ae8bb13c2f53d0f6779bafde8a10e4b857263ad7" + "reference": "c3c2877ac7d17125631106c1ee3532e9bf33df53" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/ae8bb13c2f53d0f6779bafde8a10e4b857263ad7", - "reference": "ae8bb13c2f53d0f6779bafde8a10e4b857263ad7", + "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/c3c2877ac7d17125631106c1ee3532e9bf33df53", + "reference": "c3c2877ac7d17125631106c1ee3532e9bf33df53", "shasum": "" }, "require": { @@ -437,7 +437,7 @@ "s3", "sdk" ], - "time": "2019-05-24T18:17:19+00:00" + "time": "2019-06-05T18:07:37+00:00" }, { "name": "bacon/bacon-qr-code", @@ -1325,16 +1325,16 @@ }, { "name": "graham-campbell/exceptions", - "version": "v11.2.0", + "version": "v11.3.0", "source": { "type": "git", "url": "https://github.com/GrahamCampbell/Laravel-Exceptions.git", - "reference": "75cf28f6358ea43cbc257694879849f34b8b408a" + "reference": "c33548417cf9903a049c7311ab57352a7e720b33" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/GrahamCampbell/Laravel-Exceptions/zipball/75cf28f6358ea43cbc257694879849f34b8b408a", - "reference": "75cf28f6358ea43cbc257694879849f34b8b408a", + "url": "https://api.github.com/repos/GrahamCampbell/Laravel-Exceptions/zipball/c33548417cf9903a049c7311ab57352a7e720b33", + "reference": "c33548417cf9903a049c7311ab57352a7e720b33", "shasum": "" }, "require": { @@ -1359,7 +1359,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "11.2-dev" + "dev-master": "11.3-dev" }, "laravel": { "providers": [ @@ -1396,7 +1396,7 @@ "laravel", "whoops" ], - "time": "2019-03-10T12:14:59+00:00" + "time": "2019-06-03T06:57:27+00:00" }, { "name": "graham-campbell/guzzle-factory", @@ -2045,6 +2045,51 @@ ], "time": "2019-03-10T08:50:58+00:00" }, + { + "name": "kylekatarnls/update-helper", + "version": "1.1.1", + "source": { + "type": "git", + "url": "https://github.com/kylekatarnls/update-helper.git", + "reference": "b34a46d7f5ec1795b4a15ac9d46b884377262df9" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/kylekatarnls/update-helper/zipball/b34a46d7f5ec1795b4a15ac9d46b884377262df9", + "reference": "b34a46d7f5ec1795b4a15ac9d46b884377262df9", + "shasum": "" + }, + "require": { + "composer-plugin-api": "^1.1.0", + "php": ">=5.3.0" + }, + "require-dev": { + "codeclimate/php-test-reporter": "dev-master", + "composer/composer": "^2.0.x-dev", + "phpunit/phpunit": ">=4.8.35 <6.0" + }, + "type": "composer-plugin", + "extra": { + "class": "UpdateHelper\\ComposerPlugin" + }, + "autoload": { + "psr-0": { + "UpdateHelper\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Kyle", + "email": "kylekatarnls@gmail.com" + } + ], + "description": "Update helper", + "time": "2019-06-05T08:34:23+00:00" + }, { "name": "laravel/framework", "version": "v5.7.28", @@ -2370,16 +2415,16 @@ }, { "name": "laravolt/avatar", - "version": "2.2.0", + "version": "2.2.1", "source": { "type": "git", "url": "https://github.com/laravolt/avatar.git", - "reference": "0bd373ca7f19600b9b78316dffafba9247cdfbc2" + "reference": "58470dbbac0704772d87e775ac60dcd1580f022a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravolt/avatar/zipball/0bd373ca7f19600b9b78316dffafba9247cdfbc2", - "reference": "0bd373ca7f19600b9b78316dffafba9247cdfbc2", + "url": "https://api.github.com/repos/laravolt/avatar/zipball/58470dbbac0704772d87e775ac60dcd1580f022a", + "reference": "58470dbbac0704772d87e775ac60dcd1580f022a", "shasum": "" }, "require": { @@ -2432,20 +2477,20 @@ "laravel", "laravolt" ], - "time": "2019-02-14T01:09:22+00:00" + "time": "2019-05-24T23:46:54+00:00" }, { "name": "lcobucci/jwt", - "version": "3.3.0", + "version": "3.3.1", "source": { "type": "git", "url": "https://github.com/lcobucci/jwt.git", - "reference": "8866a58fa866f6872f2a6ea0e04ad56480f0f440" + "reference": "a11ec5f4b4d75d1fcd04e133dede4c317aac9e18" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/lcobucci/jwt/zipball/8866a58fa866f6872f2a6ea0e04ad56480f0f440", - "reference": "8866a58fa866f6872f2a6ea0e04ad56480f0f440", + "url": "https://api.github.com/repos/lcobucci/jwt/zipball/a11ec5f4b4d75d1fcd04e133dede4c317aac9e18", + "reference": "a11ec5f4b4d75d1fcd04e133dede4c317aac9e18", "shasum": "" }, "require": { @@ -2487,7 +2532,7 @@ "JWS", "jwt" ], - "time": "2019-05-22T09:44:23+00:00" + "time": "2019-05-24T18:30:49+00:00" }, { "name": "league/commonmark", @@ -2845,31 +2890,34 @@ }, { "name": "nesbot/carbon", - "version": "1.37.1", + "version": "1.38.4", "source": { "type": "git", "url": "https://github.com/briannesbitt/Carbon.git", - "reference": "5be4fdf97076a685b23efdedfc2b73ad0c5eab70" + "reference": "8dd4172bfe1784952c4d58c4db725d183b1c23ad" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/5be4fdf97076a685b23efdedfc2b73ad0c5eab70", - "reference": "5be4fdf97076a685b23efdedfc2b73ad0c5eab70", + "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/8dd4172bfe1784952c4d58c4db725d183b1c23ad", + "reference": "8dd4172bfe1784952c4d58c4db725d183b1c23ad", "shasum": "" }, "require": { + "kylekatarnls/update-helper": "^1.1", "php": ">=5.3.9", "symfony/translation": "~2.6 || ~3.0 || ~4.0" }, "require-dev": { + "composer/composer": "^1.2", + "friendsofphp/php-cs-fixer": "~2", "phpunit/phpunit": "^4.8.35 || ^5.7" }, - "suggest": { - "friendsofphp/php-cs-fixer": "Needed for the `composer phpcs` command. Allow to automatically fix code style.", - "phpstan/phpstan": "Needed for the `composer phpstan` command. Allow to detect potential errors." - }, + "bin": [ + "bin/upgrade-carbon" + ], "type": "library", "extra": { + "update-helper": "Carbon\\Upgrade", "laravel": { "providers": [ "Carbon\\Laravel\\ServiceProvider" @@ -2899,7 +2947,7 @@ "datetime", "time" ], - "time": "2019-04-19T10:27:42+00:00" + "time": "2019-06-03T15:41:40+00:00" }, { "name": "nexmo/client", @@ -2951,16 +2999,16 @@ }, { "name": "nikic/php-parser", - "version": "v4.2.1", + "version": "v4.2.2", "source": { "type": "git", "url": "https://github.com/nikic/PHP-Parser.git", - "reference": "5221f49a608808c1e4d436df32884cbc1b821ac0" + "reference": "1bd73cc04c3843ad8d6b0bfc0956026a151fc420" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/5221f49a608808c1e4d436df32884cbc1b821ac0", - "reference": "5221f49a608808c1e4d436df32884cbc1b821ac0", + "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/1bd73cc04c3843ad8d6b0bfc0956026a151fc420", + "reference": "1bd73cc04c3843ad8d6b0bfc0956026a151fc420", "shasum": "" }, "require": { @@ -2998,20 +3046,20 @@ "parser", "php" ], - "time": "2019-02-16T20:54:15+00:00" + "time": "2019-05-25T20:07:01+00:00" }, { "name": "opis/closure", - "version": "3.2.0", + "version": "3.3.0", "source": { "type": "git", "url": "https://github.com/opis/closure.git", - "reference": "09b4389715a7eec100176ea58286649181753508" + "reference": "f846725591203098246276b2e7b9e8b7814c4965" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/opis/closure/zipball/09b4389715a7eec100176ea58286649181753508", - "reference": "09b4389715a7eec100176ea58286649181753508", + "url": "https://api.github.com/repos/opis/closure/zipball/f846725591203098246276b2e7b9e8b7814c4965", + "reference": "f846725591203098246276b2e7b9e8b7814c4965", "shasum": "" }, "require": { @@ -3019,12 +3067,12 @@ }, "require-dev": { "jeremeamia/superclosure": "^2.0", - "phpunit/phpunit": "^4.0|^5.0|^6.0|^7.0" + "phpunit/phpunit": "^4.0 || ^5.0 || ^6.0 || ^7.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "3.2.x-dev" + "dev-master": "3.3.x-dev" } }, "autoload": { @@ -3059,7 +3107,7 @@ "serialization", "serialize" ], - "time": "2019-05-05T12:50:25+00:00" + "time": "2019-05-31T20:04:32+00:00" }, { "name": "php-http/guzzle6-adapter", @@ -3888,25 +3936,27 @@ }, { "name": "symfony/console", - "version": "v4.2.8", + "version": "v4.3.1", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "e2840bb38bddad7a0feaf85931e38fdcffdb2f81" + "reference": "d50bbeeb0e17e6dd4124ea391eff235e932cbf64" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/e2840bb38bddad7a0feaf85931e38fdcffdb2f81", - "reference": "e2840bb38bddad7a0feaf85931e38fdcffdb2f81", + "url": "https://api.github.com/repos/symfony/console/zipball/d50bbeeb0e17e6dd4124ea391eff235e932cbf64", + "reference": "d50bbeeb0e17e6dd4124ea391eff235e932cbf64", "shasum": "" }, "require": { "php": "^7.1.3", - "symfony/contracts": "^1.0", - "symfony/polyfill-mbstring": "~1.0" + "symfony/polyfill-mbstring": "~1.0", + "symfony/polyfill-php73": "^1.8", + "symfony/service-contracts": "^1.1" }, "conflict": { "symfony/dependency-injection": "<3.4", + "symfony/event-dispatcher": "<4.3", "symfony/process": "<3.3" }, "provide": { @@ -3916,9 +3966,10 @@ "psr/log": "~1.0", "symfony/config": "~3.4|~4.0", "symfony/dependency-injection": "~3.4|~4.0", - "symfony/event-dispatcher": "~3.4|~4.0", + "symfony/event-dispatcher": "^4.3", "symfony/lock": "~3.4|~4.0", - "symfony/process": "~3.4|~4.0" + "symfony/process": "~3.4|~4.0", + "symfony/var-dumper": "^4.3" }, "suggest": { "psr/log": "For using the console logger", @@ -3929,7 +3980,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "4.2-dev" + "dev-master": "4.3-dev" } }, "autoload": { @@ -3956,91 +4007,20 @@ ], "description": "Symfony Console Component", "homepage": "https://symfony.com", - "time": "2019-04-08T14:23:48+00:00" - }, - { - "name": "symfony/contracts", - "version": "v1.1.0", - "source": { - "type": "git", - "url": "https://github.com/symfony/contracts.git", - "reference": "d3636025e8253c6144358ec0a62773cae588395b" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/contracts/zipball/d3636025e8253c6144358ec0a62773cae588395b", - "reference": "d3636025e8253c6144358ec0a62773cae588395b", - "shasum": "" - }, - "require": { - "php": "^7.1.3" - }, - "require-dev": { - "psr/cache": "^1.0", - "psr/container": "^1.0", - "symfony/polyfill-intl-idn": "^1.10" - }, - "suggest": { - "psr/cache": "When using the Cache contracts", - "psr/container": "When using the Service contracts", - "symfony/cache-contracts-implementation": "", - "symfony/event-dispatcher-implementation": "", - "symfony/http-client-contracts-implementation": "", - "symfony/service-contracts-implementation": "", - "symfony/translation-contracts-implementation": "" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.1-dev" - } - }, - "autoload": { - "psr-4": { - "Symfony\\Contracts\\": "" - }, - "exclude-from-classmap": [ - "**/Tests/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Nicolas Grekas", - "email": "p@tchwork.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "A set of abstractions extracted out of the Symfony components", - "homepage": "https://symfony.com", - "keywords": [ - "abstractions", - "contracts", - "decoupling", - "interfaces", - "interoperability", - "standards" - ], - "time": "2019-04-27T14:29:50+00:00" + "time": "2019-06-05T13:25:51+00:00" }, { "name": "symfony/css-selector", - "version": "v4.2.8", + "version": "v4.3.1", "source": { "type": "git", "url": "https://github.com/symfony/css-selector.git", - "reference": "48eddf66950fa57996e1be4a55916d65c10c604a" + "reference": "105c98bb0c5d8635bea056135304bd8edcc42b4d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/css-selector/zipball/48eddf66950fa57996e1be4a55916d65c10c604a", - "reference": "48eddf66950fa57996e1be4a55916d65c10c604a", + "url": "https://api.github.com/repos/symfony/css-selector/zipball/105c98bb0c5d8635bea056135304bd8edcc42b4d", + "reference": "105c98bb0c5d8635bea056135304bd8edcc42b4d", "shasum": "" }, "require": { @@ -4049,7 +4029,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "4.2-dev" + "dev-master": "4.3-dev" } }, "autoload": { @@ -4080,20 +4060,20 @@ ], "description": "Symfony CssSelector Component", "homepage": "https://symfony.com", - "time": "2019-01-16T20:31:39+00:00" + "time": "2019-01-16T21:53:39+00:00" }, { "name": "symfony/debug", - "version": "v4.2.8", + "version": "v4.3.1", "source": { "type": "git", "url": "https://github.com/symfony/debug.git", - "reference": "2d279b6bb1d582dd5740d4d3251ae8c18812ed37" + "reference": "4e025104f1f9adb1f7a2d14fb102c9986d6e97c6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/debug/zipball/2d279b6bb1d582dd5740d4d3251ae8c18812ed37", - "reference": "2d279b6bb1d582dd5740d4d3251ae8c18812ed37", + "url": "https://api.github.com/repos/symfony/debug/zipball/4e025104f1f9adb1f7a2d14fb102c9986d6e97c6", + "reference": "4e025104f1f9adb1f7a2d14fb102c9986d6e97c6", "shasum": "" }, "require": { @@ -4109,7 +4089,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "4.2-dev" + "dev-master": "4.3-dev" } }, "autoload": { @@ -4136,34 +4116,40 @@ ], "description": "Symfony Debug Component", "homepage": "https://symfony.com", - "time": "2019-04-11T11:27:41+00:00" + "time": "2019-05-30T16:10:05+00:00" }, { "name": "symfony/event-dispatcher", - "version": "v4.2.8", + "version": "v4.3.1", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher.git", - "reference": "fbce53cd74ac509cbe74b6f227622650ab759b02" + "reference": "4e6c670af81c4fb0b6c08b035530a9915d0b691f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/fbce53cd74ac509cbe74b6f227622650ab759b02", - "reference": "fbce53cd74ac509cbe74b6f227622650ab759b02", + "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/4e6c670af81c4fb0b6c08b035530a9915d0b691f", + "reference": "4e6c670af81c4fb0b6c08b035530a9915d0b691f", "shasum": "" }, "require": { "php": "^7.1.3", - "symfony/contracts": "^1.0" + "symfony/event-dispatcher-contracts": "^1.1" }, "conflict": { "symfony/dependency-injection": "<3.4" }, + "provide": { + "psr/event-dispatcher-implementation": "1.0", + "symfony/event-dispatcher-implementation": "1.1" + }, "require-dev": { "psr/log": "~1.0", "symfony/config": "~3.4|~4.0", "symfony/dependency-injection": "~3.4|~4.0", "symfony/expression-language": "~3.4|~4.0", + "symfony/http-foundation": "^3.4|^4.0", + "symfony/service-contracts": "^1.1", "symfony/stopwatch": "~3.4|~4.0" }, "suggest": { @@ -4173,7 +4159,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "4.2-dev" + "dev-master": "4.3-dev" } }, "autoload": { @@ -4200,20 +4186,78 @@ ], "description": "Symfony EventDispatcher Component", "homepage": "https://symfony.com", - "time": "2019-04-06T13:51:08+00:00" + "time": "2019-05-30T16:10:05+00:00" }, { - "name": "symfony/finder", - "version": "v4.2.8", + "name": "symfony/event-dispatcher-contracts", + "version": "v1.1.1", "source": { "type": "git", - "url": "https://github.com/symfony/finder.git", - "reference": "e45135658bd6c14b61850bf131c4f09a55133f69" + "url": "https://github.com/symfony/event-dispatcher-contracts.git", + "reference": "8fa2cf2177083dd59cf8e44ea4b6541764fbda69" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/finder/zipball/e45135658bd6c14b61850bf131c4f09a55133f69", - "reference": "e45135658bd6c14b61850bf131c4f09a55133f69", + "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/8fa2cf2177083dd59cf8e44ea4b6541764fbda69", + "reference": "8fa2cf2177083dd59cf8e44ea4b6541764fbda69", + "shasum": "" + }, + "require": { + "php": "^7.1.3" + }, + "suggest": { + "psr/event-dispatcher": "", + "symfony/event-dispatcher-implementation": "" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.1-dev" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Contracts\\EventDispatcher\\": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Generic abstractions related to dispatching event", + "homepage": "https://symfony.com", + "keywords": [ + "abstractions", + "contracts", + "decoupling", + "interfaces", + "interoperability", + "standards" + ], + "time": "2019-05-22T12:23:29+00:00" + }, + { + "name": "symfony/finder", + "version": "v4.3.1", + "source": { + "type": "git", + "url": "https://github.com/symfony/finder.git", + "reference": "b3d4f4c0e4eadfdd8b296af9ca637cfbf51d8176" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/finder/zipball/b3d4f4c0e4eadfdd8b296af9ca637cfbf51d8176", + "reference": "b3d4f4c0e4eadfdd8b296af9ca637cfbf51d8176", "shasum": "" }, "require": { @@ -4222,7 +4266,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "4.2-dev" + "dev-master": "4.3-dev" } }, "autoload": { @@ -4249,24 +4293,25 @@ ], "description": "Symfony Finder Component", "homepage": "https://symfony.com", - "time": "2019-04-06T13:51:08+00:00" + "time": "2019-05-26T20:47:49+00:00" }, { "name": "symfony/http-foundation", - "version": "v4.2.8", + "version": "v4.3.1", "source": { "type": "git", "url": "https://github.com/symfony/http-foundation.git", - "reference": "1ea878bd3af18f934dedb8c0de60656a9a31a718" + "reference": "b7e4945dd9b277cd24e93566e4da0a87956392a9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-foundation/zipball/1ea878bd3af18f934dedb8c0de60656a9a31a718", - "reference": "1ea878bd3af18f934dedb8c0de60656a9a31a718", + "url": "https://api.github.com/repos/symfony/http-foundation/zipball/b7e4945dd9b277cd24e93566e4da0a87956392a9", + "reference": "b7e4945dd9b277cd24e93566e4da0a87956392a9", "shasum": "" }, "require": { "php": "^7.1.3", + "symfony/mime": "^4.3", "symfony/polyfill-mbstring": "~1.1" }, "require-dev": { @@ -4276,7 +4321,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "4.2-dev" + "dev-master": "4.3-dev" } }, "autoload": { @@ -4303,34 +4348,35 @@ ], "description": "Symfony HttpFoundation Component", "homepage": "https://symfony.com", - "time": "2019-05-01T08:36:31+00:00" + "time": "2019-06-06T10:05:02+00:00" }, { "name": "symfony/http-kernel", - "version": "v4.2.8", + "version": "v4.3.1", "source": { "type": "git", "url": "https://github.com/symfony/http-kernel.git", - "reference": "a7713bc522f1a1cdf0b39f809fa4542523fc3114" + "reference": "738ad561cd6a8d1c44ee1da941b2e628e264c429" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-kernel/zipball/a7713bc522f1a1cdf0b39f809fa4542523fc3114", - "reference": "a7713bc522f1a1cdf0b39f809fa4542523fc3114", + "url": "https://api.github.com/repos/symfony/http-kernel/zipball/738ad561cd6a8d1c44ee1da941b2e628e264c429", + "reference": "738ad561cd6a8d1c44ee1da941b2e628e264c429", "shasum": "" }, "require": { "php": "^7.1.3", "psr/log": "~1.0", - "symfony/contracts": "^1.0.2", "symfony/debug": "~3.4|~4.0", - "symfony/event-dispatcher": "~4.1", + "symfony/event-dispatcher": "^4.3", "symfony/http-foundation": "^4.1.1", - "symfony/polyfill-ctype": "~1.8" + "symfony/polyfill-ctype": "~1.8", + "symfony/polyfill-php73": "^1.9" }, "conflict": { + "symfony/browser-kit": "<4.3", "symfony/config": "<3.4", - "symfony/dependency-injection": "<4.2", + "symfony/dependency-injection": "<4.3", "symfony/translation": "<4.2", "symfony/var-dumper": "<4.1.1", "twig/twig": "<1.34|<2.4,>=2" @@ -4340,11 +4386,11 @@ }, "require-dev": { "psr/cache": "~1.0", - "symfony/browser-kit": "~3.4|~4.0", + "symfony/browser-kit": "^4.3", "symfony/config": "~3.4|~4.0", "symfony/console": "~3.4|~4.0", "symfony/css-selector": "~3.4|~4.0", - "symfony/dependency-injection": "^4.2", + "symfony/dependency-injection": "^4.3", "symfony/dom-crawler": "~3.4|~4.0", "symfony/expression-language": "~3.4|~4.0", "symfony/finder": "~3.4|~4.0", @@ -4353,7 +4399,9 @@ "symfony/stopwatch": "~3.4|~4.0", "symfony/templating": "~3.4|~4.0", "symfony/translation": "~4.2", - "symfony/var-dumper": "^4.1.1" + "symfony/translation-contracts": "^1.1", + "symfony/var-dumper": "^4.1.1", + "twig/twig": "^1.34|^2.4" }, "suggest": { "symfony/browser-kit": "", @@ -4365,7 +4413,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "4.2-dev" + "dev-master": "4.3-dev" } }, "autoload": { @@ -4392,7 +4440,66 @@ ], "description": "Symfony HttpKernel Component", "homepage": "https://symfony.com", - "time": "2019-05-01T13:31:08+00:00" + "time": "2019-06-06T13:23:34+00:00" + }, + { + "name": "symfony/mime", + "version": "v4.3.1", + "source": { + "type": "git", + "url": "https://github.com/symfony/mime.git", + "reference": "ec2c5565de60e03f33d4296a655e3273f0ad1f8b" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/mime/zipball/ec2c5565de60e03f33d4296a655e3273f0ad1f8b", + "reference": "ec2c5565de60e03f33d4296a655e3273f0ad1f8b", + "shasum": "" + }, + "require": { + "php": "^7.1.3", + "symfony/polyfill-intl-idn": "^1.10", + "symfony/polyfill-mbstring": "^1.0" + }, + "require-dev": { + "egulias/email-validator": "^2.0", + "symfony/dependency-injection": "~3.4|^4.1" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "4.3-dev" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Component\\Mime\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "A library to manipulate MIME messages", + "homepage": "https://symfony.com", + "keywords": [ + "mime", + "mime-type" + ], + "time": "2019-06-04T09:22:54+00:00" }, { "name": "symfony/polyfill-ctype", @@ -4629,17 +4736,75 @@ "time": "2019-02-06T07:57:58+00:00" }, { - "name": "symfony/process", - "version": "v4.2.8", + "name": "symfony/polyfill-php73", + "version": "v1.11.0", "source": { "type": "git", - "url": "https://github.com/symfony/process.git", - "reference": "8cf39fb4ccff793340c258ee7760fd40bfe745fe" + "url": "https://github.com/symfony/polyfill-php73.git", + "reference": "d1fb4abcc0c47be136208ad9d68bf59f1ee17abd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/process/zipball/8cf39fb4ccff793340c258ee7760fd40bfe745fe", - "reference": "8cf39fb4ccff793340c258ee7760fd40bfe745fe", + "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/d1fb4abcc0c47be136208ad9d68bf59f1ee17abd", + "reference": "d1fb4abcc0c47be136208ad9d68bf59f1ee17abd", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.11-dev" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Polyfill\\Php73\\": "" + }, + "files": [ + "bootstrap.php" + ], + "classmap": [ + "Resources/stubs" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony polyfill backporting some PHP 7.3+ features to lower PHP versions", + "homepage": "https://symfony.com", + "keywords": [ + "compatibility", + "polyfill", + "portable", + "shim" + ], + "time": "2019-02-06T07:57:58+00:00" + }, + { + "name": "symfony/process", + "version": "v4.3.1", + "source": { + "type": "git", + "url": "https://github.com/symfony/process.git", + "reference": "856d35814cf287480465bb7a6c413bb7f5f5e69c" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/process/zipball/856d35814cf287480465bb7a6c413bb7f5f5e69c", + "reference": "856d35814cf287480465bb7a6c413bb7f5f5e69c", "shasum": "" }, "require": { @@ -4648,7 +4813,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "4.2-dev" + "dev-master": "4.3-dev" } }, "autoload": { @@ -4675,20 +4840,20 @@ ], "description": "Symfony Process Component", "homepage": "https://symfony.com", - "time": "2019-04-10T16:20:36+00:00" + "time": "2019-05-30T16:10:05+00:00" }, { "name": "symfony/routing", - "version": "v4.2.8", + "version": "v4.3.1", "source": { "type": "git", "url": "https://github.com/symfony/routing.git", - "reference": "f4e43bb0dff56f0f62fa056c82d7eadcdb391bab" + "reference": "9b31cd24f6ad2cebde6845f6daa9c6d69efe2465" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/routing/zipball/f4e43bb0dff56f0f62fa056c82d7eadcdb391bab", - "reference": "f4e43bb0dff56f0f62fa056c82d7eadcdb391bab", + "url": "https://api.github.com/repos/symfony/routing/zipball/9b31cd24f6ad2cebde6845f6daa9c6d69efe2465", + "reference": "9b31cd24f6ad2cebde6845f6daa9c6d69efe2465", "shasum": "" }, "require": { @@ -4700,7 +4865,7 @@ "symfony/yaml": "<3.4" }, "require-dev": { - "doctrine/annotations": "~1.0", + "doctrine/annotations": "~1.2", "psr/log": "~1.0", "symfony/config": "~4.2", "symfony/dependency-injection": "~3.4|~4.0", @@ -4718,7 +4883,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "4.2-dev" + "dev-master": "4.3-dev" } }, "autoload": { @@ -4751,26 +4916,84 @@ "uri", "url" ], - "time": "2019-04-27T09:38:08+00:00" + "time": "2019-06-05T09:16:20+00:00" }, { - "name": "symfony/translation", - "version": "v4.2.8", + "name": "symfony/service-contracts", + "version": "v1.1.2", "source": { "type": "git", - "url": "https://github.com/symfony/translation.git", - "reference": "181a426dd129cb496f12d7e7555f6d0b37a7615b" + "url": "https://github.com/symfony/service-contracts.git", + "reference": "191afdcb5804db960d26d8566b7e9a2843cab3a0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/translation/zipball/181a426dd129cb496f12d7e7555f6d0b37a7615b", - "reference": "181a426dd129cb496f12d7e7555f6d0b37a7615b", + "url": "https://api.github.com/repos/symfony/service-contracts/zipball/191afdcb5804db960d26d8566b7e9a2843cab3a0", + "reference": "191afdcb5804db960d26d8566b7e9a2843cab3a0", + "shasum": "" + }, + "require": { + "php": "^7.1.3" + }, + "suggest": { + "psr/container": "", + "symfony/service-implementation": "" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.1-dev" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Contracts\\Service\\": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Generic abstractions related to writing services", + "homepage": "https://symfony.com", + "keywords": [ + "abstractions", + "contracts", + "decoupling", + "interfaces", + "interoperability", + "standards" + ], + "time": "2019-05-28T07:50:59+00:00" + }, + { + "name": "symfony/translation", + "version": "v4.3.1", + "source": { + "type": "git", + "url": "https://github.com/symfony/translation.git", + "reference": "5dda505e5f65d759741dfaf4e54b36010a4b57aa" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/translation/zipball/5dda505e5f65d759741dfaf4e54b36010a4b57aa", + "reference": "5dda505e5f65d759741dfaf4e54b36010a4b57aa", "shasum": "" }, "require": { "php": "^7.1.3", - "symfony/contracts": "^1.0.2", - "symfony/polyfill-mbstring": "~1.0" + "symfony/polyfill-mbstring": "~1.0", + "symfony/translation-contracts": "^1.1.2" }, "conflict": { "symfony/config": "<3.4", @@ -4778,7 +5001,7 @@ "symfony/yaml": "<3.4" }, "provide": { - "symfony/translation-contracts-implementation": "1.0" + "symfony/translation-implementation": "1.0" }, "require-dev": { "psr/log": "~1.0", @@ -4788,6 +5011,7 @@ "symfony/finder": "~2.8|~3.0|~4.0", "symfony/http-kernel": "~3.4|~4.0", "symfony/intl": "~3.4|~4.0", + "symfony/service-contracts": "^1.1.2", "symfony/var-dumper": "~3.4|~4.0", "symfony/yaml": "~3.4|~4.0" }, @@ -4799,7 +5023,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "4.2-dev" + "dev-master": "4.3-dev" } }, "autoload": { @@ -4826,20 +5050,77 @@ ], "description": "Symfony Translation Component", "homepage": "https://symfony.com", - "time": "2019-05-01T12:55:36+00:00" + "time": "2019-06-03T20:27:40+00:00" }, { - "name": "symfony/var-dumper", - "version": "v4.2.8", + "name": "symfony/translation-contracts", + "version": "v1.1.2", "source": { "type": "git", - "url": "https://github.com/symfony/var-dumper.git", - "reference": "3c4084cb1537c0e2ad41aad622bbf55a44a5c9ce" + "url": "https://github.com/symfony/translation-contracts.git", + "reference": "93597ce975d91c52ebfaca1253343cd9ccb7916d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-dumper/zipball/3c4084cb1537c0e2ad41aad622bbf55a44a5c9ce", - "reference": "3c4084cb1537c0e2ad41aad622bbf55a44a5c9ce", + "url": "https://api.github.com/repos/symfony/translation-contracts/zipball/93597ce975d91c52ebfaca1253343cd9ccb7916d", + "reference": "93597ce975d91c52ebfaca1253343cd9ccb7916d", + "shasum": "" + }, + "require": { + "php": "^7.1.3" + }, + "suggest": { + "symfony/translation-implementation": "" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.1-dev" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Contracts\\Translation\\": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Generic abstractions related to translation", + "homepage": "https://symfony.com", + "keywords": [ + "abstractions", + "contracts", + "decoupling", + "interfaces", + "interoperability", + "standards" + ], + "time": "2019-05-27T08:16:38+00:00" + }, + { + "name": "symfony/var-dumper", + "version": "v4.3.1", + "source": { + "type": "git", + "url": "https://github.com/symfony/var-dumper.git", + "reference": "f974f448154928d2b5fb7c412bd23b81d063f34b" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/var-dumper/zipball/f974f448154928d2b5fb7c412bd23b81d063f34b", + "reference": "f974f448154928d2b5fb7c412bd23b81d063f34b", "shasum": "" }, "require": { @@ -4868,7 +5149,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "4.2-dev" + "dev-master": "4.3-dev" } }, "autoload": { @@ -4902,7 +5183,7 @@ "debug", "dump" ], - "time": "2019-05-01T12:55:36+00:00" + "time": "2019-06-05T02:08:12+00:00" }, { "name": "tijsverkoyen/css-to-inline-styles", @@ -4953,16 +5234,16 @@ }, { "name": "twig/twig", - "version": "v2.10.0", + "version": "v2.11.2", "source": { "type": "git", "url": "https://github.com/twigphp/Twig.git", - "reference": "5240e21982885b76629552d83b4ebb6d41ccde6b" + "reference": "84a463403da1c81afbcedda8f0e788c78bd25a79" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/twigphp/Twig/zipball/5240e21982885b76629552d83b4ebb6d41ccde6b", - "reference": "5240e21982885b76629552d83b4ebb6d41ccde6b", + "url": "https://api.github.com/repos/twigphp/Twig/zipball/84a463403da1c81afbcedda8f0e788c78bd25a79", + "reference": "84a463403da1c81afbcedda8f0e788c78bd25a79", "shasum": "" }, "require": { @@ -4973,12 +5254,12 @@ "require-dev": { "psr/container": "^1.0", "symfony/debug": "^2.7", - "symfony/phpunit-bridge": "^3.4.19|^4.1.8" + "symfony/phpunit-bridge": "^3.4.19|^4.1.8|^5.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.10-dev" + "dev-master": "2.11-dev" } }, "autoload": { @@ -5016,7 +5297,7 @@ "keywords": [ "templating" ], - "time": "2019-05-14T12:03:52+00:00" + "time": "2019-06-05T11:17:07+00:00" }, { "name": "vlucas/phpdotenv", @@ -5261,16 +5542,16 @@ }, { "name": "bugsnag/bugsnag", - "version": "v3.16.0", + "version": "v3.17.0", "source": { "type": "git", "url": "https://github.com/bugsnag/bugsnag-php.git", - "reference": "ffcb6d5504e762db4e1636864c8b830b60878245" + "reference": "2073d449559b0d533f2cfdfb7ceabbeef8187ac0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/bugsnag/bugsnag-php/zipball/ffcb6d5504e762db4e1636864c8b830b60878245", - "reference": "ffcb6d5504e762db4e1636864c8b830b60878245", + "url": "https://api.github.com/repos/bugsnag/bugsnag-php/zipball/2073d449559b0d533f2cfdfb7ceabbeef8187ac0", + "reference": "2073d449559b0d533f2cfdfb7ceabbeef8187ac0", "shasum": "" }, "require": { @@ -5316,7 +5597,7 @@ "logging", "tracking" ], - "time": "2019-01-29T19:09:14+00:00" + "time": "2019-05-28T11:00:07+00:00" }, { "name": "bugsnag/bugsnag-laravel", @@ -6571,16 +6852,16 @@ }, { "name": "phpunit/phpunit", - "version": "7.5.11", + "version": "7.5.12", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "64cb33f5b520da490a7b13149d39b43cf3c890c6" + "reference": "9ba59817745b0fe0c1a5a3032dfd4a6d2994ad1c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/64cb33f5b520da490a7b13149d39b43cf3c890c6", - "reference": "64cb33f5b520da490a7b13149d39b43cf3c890c6", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/9ba59817745b0fe0c1a5a3032dfd4a6d2994ad1c", + "reference": "9ba59817745b0fe0c1a5a3032dfd4a6d2994ad1c", "shasum": "" }, "require": { @@ -6651,7 +6932,7 @@ "testing", "xunit" ], - "time": "2019-05-14T04:53:02+00:00" + "time": "2019-05-28T11:59:40+00:00" }, { "name": "sebastian/code-unit-reverse-lookup", From 2a790a5daad0b0379067d21ed590ec4de68ae488 Mon Sep 17 00:00:00 2001 From: Cachet Bot <40326150+CachetBot@users.noreply.github.com> Date: Thu, 13 Jun 2019 00:30:14 +0100 Subject: [PATCH 25/54] New translations dashboard.php (Portuguese, Brazilian) --- resources/lang/pt-BR/dashboard.php | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/resources/lang/pt-BR/dashboard.php b/resources/lang/pt-BR/dashboard.php index ceec3ea1..912b3dc9 100644 --- a/resources/lang/pt-BR/dashboard.php +++ b/resources/lang/pt-BR/dashboard.php @@ -30,12 +30,12 @@ return [ 'failure' => 'Algo deu errado com a atualização do incidente.', ], 'edit' => [ - 'title' => 'Edit incident update', + 'title' => 'Editar atualização do incidente', 'success' => 'The incident update has been updated.', 'failure' => 'Something went wrong updating the incident update', ], ], - 'reported_by' => 'Reported by :user', + 'reported_by' => 'Reportado por :user', 'add' => [ 'title' => 'Relatar um incidente', 'success' => 'Incidente adicionado.', @@ -83,13 +83,13 @@ return [ 'failure' => 'Something went wrong adding the Maintenance, please try again.', ], 'edit' => [ - 'title' => 'Edit Maintenance', - 'success' => 'Maintenance has been updated!', - 'failure' => 'Something went wrong editing the Maintenance, please try again.', + 'title' => 'Editar Manutenção', + 'success' => 'Manutenção atualizada!', + 'failure' => 'Algo deu errado ao editar a Manutenção, por favor tente novamente.', ], 'delete' => [ - 'success' => 'The Maintenance has been deleted and will not show on your status page.', - 'failure' => 'The Maintenance could not be deleted, please try again.', + 'success' => 'A manutenção programada foi excluída e não aparecerá na sua página de status.', + 'failure' => 'A Manutenção não pôde ser excluída, por favor tente novamente.', ], ], @@ -158,12 +158,12 @@ return [ 'subscribers' => [ 'subscribers' => 'Assinantes', 'description' => 'Assinantes vão receber atualizações de e-mail quando incidentes criados ou componentes atualizados.', - 'description_disabled' => 'To use this feature, you need allow people to signup for notifications.', + 'description_disabled' => 'Para utilizar esse recurso, você precisa permitir que as pessoas se cadastrem para notificações.', 'verified' => 'Verificado', 'not_verified' => 'Não verificado', 'subscriber' => ':email, inscreveu-se em :date', 'no_subscriptions' => 'Inscrito em todas as atualizações', - 'global' => 'Globally subscribed', + 'global' => 'Inscrito globalmente', 'add' => [ 'title' => 'Adicionar um novo assinante', 'success' => 'Inscrito adicionado.', From 8a6ab70f1c5fb49c172a28be5848f1808a0fc3aa Mon Sep 17 00:00:00 2001 From: Cachet Bot <40326150+CachetBot@users.noreply.github.com> Date: Thu, 13 Jun 2019 00:40:14 +0100 Subject: [PATCH 26/54] New translations dashboard.php (Portuguese, Brazilian) --- resources/lang/pt-BR/dashboard.php | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/resources/lang/pt-BR/dashboard.php b/resources/lang/pt-BR/dashboard.php index 912b3dc9..4933c85c 100644 --- a/resources/lang/pt-BR/dashboard.php +++ b/resources/lang/pt-BR/dashboard.php @@ -26,13 +26,13 @@ return [ 'count' => '{0}Nenhuma atualização|[1]Uma atualização|[2]Duas atualizações|[3,*]Várias atualizações', 'add' => [ 'title' => 'Crie uma nova atualização de incidente', - 'success' => 'Your new incident update has been created.', + 'success' => 'Sua atualização de incidente foi criada.', 'failure' => 'Algo deu errado com a atualização do incidente.', ], 'edit' => [ 'title' => 'Editar atualização do incidente', - 'success' => 'The incident update has been updated.', - 'failure' => 'Something went wrong updating the incident update', + 'success' => 'Sua atualização de incidente foi atualizada.', + 'failure' => 'Algo deu errado ao atualizar as informações do incidente', ], ], 'reported_by' => 'Reportado por :user', @@ -56,7 +56,7 @@ return [ 'title' => 'Template de incidentes', 'add' => [ 'title' => 'Criar um modelo de incidente', - 'message' => 'Create your first incident template.', + 'message' => 'Crie seu primeiro template de incidente.', 'success' => 'Seu novo modelo de incidente foi criado.', 'failure' => 'Algo deu errado com o modelo de incidente.', ], @@ -75,12 +75,12 @@ return [ // Incident Maintenance 'schedule' => [ 'schedule' => 'Manutenção', - 'logged' => '{0}There has been no Maintenance, good work.|[1]You have logged one schedule.|[2,*]You have reported :count schedules.', + 'logged' => '{0}Ainda não ocorreu nenhuma manuteção, bom trabalho. |[1]Você agendou uma manuteção. | [2, *] Você adicionou : manutenções.', 'scheduled_at' => 'Agendada em :timestamp', 'add' => [ 'title' => 'Adicionar manutenção agendada', - 'success' => 'Maintenance added.', - 'failure' => 'Something went wrong adding the Maintenance, please try again.', + 'success' => 'Manutenção adicionada.', + 'failure' => 'Algo deu errado ao adicionar a Manutenção, por favor tente novamente.', ], 'edit' => [ 'title' => 'Editar Manutenção', From f823a93c06d1e676b8a450fd4ed289b2a2981bfa Mon Sep 17 00:00:00 2001 From: Cachet Bot <40326150+CachetBot@users.noreply.github.com> Date: Thu, 13 Jun 2019 00:40:15 +0100 Subject: [PATCH 27/54] New translations pagination.php (Portuguese, Brazilian) --- resources/lang/pt-BR/pagination.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/lang/pt-BR/pagination.php b/resources/lang/pt-BR/pagination.php index 0ee724cf..7c01792f 100644 --- a/resources/lang/pt-BR/pagination.php +++ b/resources/lang/pt-BR/pagination.php @@ -22,7 +22,7 @@ return [ | */ - 'previous' => 'Previous', - 'next' => 'Next', + 'previous' => 'Anterior', + 'next' => 'Avançar', ]; From 7ae29e4063a731f91752c5bca7fdeec814c7a16d Mon Sep 17 00:00:00 2001 From: Cachet Bot <40326150+CachetBot@users.noreply.github.com> Date: Thu, 13 Jun 2019 00:50:13 +0100 Subject: [PATCH 28/54] New translations pagination.php (Portuguese, Brazilian) --- resources/lang/pt-BR/pagination.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/lang/pt-BR/pagination.php b/resources/lang/pt-BR/pagination.php index 7c01792f..2eccd922 100644 --- a/resources/lang/pt-BR/pagination.php +++ b/resources/lang/pt-BR/pagination.php @@ -23,6 +23,6 @@ return [ */ 'previous' => 'Anterior', - 'next' => 'Avançar', + 'next' => 'Próxima', ]; From 1dba880e4478c4f876f92f7e7df2ba312208ef16 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" Date: Mon, 17 Jun 2019 06:40:01 +0000 Subject: [PATCH 29/54] Bump barryvdh/laravel-debugbar from 3.2.3 to 3.2.4 Bumps [barryvdh/laravel-debugbar](https://github.com/barryvdh/laravel-debugbar) from 3.2.3 to 3.2.4. - [Release notes](https://github.com/barryvdh/laravel-debugbar/releases) - [Changelog](https://github.com/barryvdh/laravel-debugbar/blob/master/changelog.md) - [Commits](https://github.com/barryvdh/laravel-debugbar/compare/v3.2.3...v3.2.4) Signed-off-by: dependabot-preview[bot] --- composer.lock | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/composer.lock b/composer.lock index 806a7066..e52149a3 100644 --- a/composer.lock +++ b/composer.lock @@ -5474,16 +5474,16 @@ }, { "name": "barryvdh/laravel-debugbar", - "version": "v3.2.3", + "version": "v3.2.4", "source": { "type": "git", "url": "https://github.com/barryvdh/laravel-debugbar.git", - "reference": "5fcba4cc8e92a230b13b99c1083fc22ba8a5c479" + "reference": "2d195779ea4f809f69764a795e2ec371dbb76a96" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/barryvdh/laravel-debugbar/zipball/5fcba4cc8e92a230b13b99c1083fc22ba8a5c479", - "reference": "5fcba4cc8e92a230b13b99c1083fc22ba8a5c479", + "url": "https://api.github.com/repos/barryvdh/laravel-debugbar/zipball/2d195779ea4f809f69764a795e2ec371dbb76a96", + "reference": "2d195779ea4f809f69764a795e2ec371dbb76a96", "shasum": "" }, "require": { @@ -5538,7 +5538,7 @@ "profiler", "webprofiler" ], - "time": "2019-02-26T18:01:54+00:00" + "time": "2019-03-25T09:39:08+00:00" }, { "name": "bugsnag/bugsnag", From 0cea52de5fe318372c092c0f75de63e84f6c0bca Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" Date: Mon, 17 Jun 2019 06:41:36 +0000 Subject: [PATCH 30/54] Bump aws/aws-sdk-php from 3.99.2 to 3.100.4 Bumps [aws/aws-sdk-php](https://github.com/aws/aws-sdk-php) from 3.99.2 to 3.100.4. - [Release notes](https://github.com/aws/aws-sdk-php/releases) - [Changelog](https://github.com/aws/aws-sdk-php/blob/master/CHANGELOG.md) - [Commits](https://github.com/aws/aws-sdk-php/compare/3.99.2...3.100.4) Signed-off-by: dependabot-preview[bot] --- composer.lock | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/composer.lock b/composer.lock index 806a7066..809fd234 100644 --- a/composer.lock +++ b/composer.lock @@ -358,16 +358,16 @@ }, { "name": "aws/aws-sdk-php", - "version": "3.99.2", + "version": "3.100.4", "source": { "type": "git", "url": "https://github.com/aws/aws-sdk-php.git", - "reference": "c3c2877ac7d17125631106c1ee3532e9bf33df53" + "reference": "803f3cdc37f42112c4df1af0a77e25130b9448d3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/c3c2877ac7d17125631106c1ee3532e9bf33df53", - "reference": "c3c2877ac7d17125631106c1ee3532e9bf33df53", + "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/803f3cdc37f42112c4df1af0a77e25130b9448d3", + "reference": "803f3cdc37f42112c4df1af0a77e25130b9448d3", "shasum": "" }, "require": { @@ -437,7 +437,7 @@ "s3", "sdk" ], - "time": "2019-06-05T18:07:37+00:00" + "time": "2019-06-14T18:12:13+00:00" }, { "name": "bacon/bacon-qr-code", From c5217637e66e4da37760106d83337b091693865c Mon Sep 17 00:00:00 2001 From: Anthony Bocci Date: Sat, 8 Jun 2019 15:00:27 +0200 Subject: [PATCH 31/54] Allow Cachet to be setup not from the server's root The `asset()` helper was missing at some places so it was not possible to install it in an other place than the server's root (/). The paths have been fixed and now use the `asset()` helper. Also, The steps process takes care of the current path. See: #3618 --- public/dist/js/all.js | 56 +++++++++++----------- public/dist/js/app.js | 2 +- public/mix-manifest.json | 4 +- resources/assets/js/cachet.js | 3 +- resources/views/layout/clean.blade.php | 8 ++-- resources/views/layout/dashboard.blade.php | 8 ++-- resources/views/layout/master.blade.php | 8 ++-- 7 files changed, 45 insertions(+), 44 deletions(-) diff --git a/public/dist/js/all.js b/public/dist/js/all.js index 06549564..c2f89fda 100644 --- a/public/dist/js/all.js +++ b/public/dist/js/all.js @@ -1,28 +1,28 @@ -if(webpackJsonp([1],{0:function(e,t,n){n("sV/x"),n("9GM1"),e.exports=n("xZZD")},"0hRT":function(e,t){e.exports={props:[],data:function(){return{env:{cache_driver:null,queue_driver:null,session_driver:null,mail_driver:"smtp"},mail:{host:null,from:{email:null,name:"status@cachethq.io"},username:null,password:null,requiresHost:!0,requiresUsername:!1,requiresPassword:!1},system:{name:null,domain:null,timezone:null,language:null}}},watch:{"env.mail_driver":function(e){"log"===e||"mail"===e?(this.mail.requiresHost=!1,this.mail.requiresUsername=!1,this.mail.requiresPassword=!1):"ses"===e||"mandrill"===e?(this.mail.requiresHost=!1,this.mail.requiresUsername=!0,this.mail.requiresPassword=!0):"smtp"===e?(this.mail.requiresHost=!0,this.mail.requiresUsername=!1,this.mail.requiresPassword=!1):(this.mail.requiresHost=!0,this.mail.requiresUsername=!0,this.mail.requiresPassword=!0)}}}},"21It":function(e,t,n){"use strict";var r=n("FtD3");e.exports=function(e,t,n){var i=n.config.validateStatus;n.status&&i&&!i(n.status)?t(r("Request failed with status code "+n.status,n.config,null,n.request,n)):e(n)}},"3Cgm":function(e,t,n){"use strict";(function(t){function n(e){l.length||o(),l[l.length]=e}function r(){for(;dc){for(var t=0,n=l.length-d;t10)for(var n=0;n1&&e!==Math.floor(e)&&(i=e-Math.floor(e));var o=r.helpers.log10(Math.abs(i)),a="";if(0!==e){var s=-1*Math.floor(o);s=Math.max(Math.min(s,2),0),a=e.toFixed(s)}else a="0";return a}}}]},tooltips:{callbacks:{label:function(t,n){return t.yLabel+" "+e.suffix}}}}})}}}},"7GwW":function(e,t,n){"use strict";var r=n("cGG2"),i=n("21It"),o=n("DQCr"),a=n("oJlt"),s=n("GHBc"),u=n("FtD3"),l="undefined"!=typeof window&&window.btoa&&window.btoa.bind(window)||n("thJu");e.exports=function(e){return new Promise(function(t,d){var c=e.data,f=e.headers;r.isFormData(c)&&delete f["Content-Type"];var h=new XMLHttpRequest,p="onreadystatechange",m=!1;if("undefined"==typeof window||!window.XDomainRequest||"withCredentials"in h||s(e.url)||(h=new window.XDomainRequest,p="onload",m=!0,h.onprogress=function(){},h.ontimeout=function(){}),e.auth){var _=e.auth.username||"",g=e.auth.password||"";f.Authorization="Basic "+l(_+":"+g)}if(h.open(e.method.toUpperCase(),o(e.url,e.params,e.paramsSerializer),!0),h.timeout=e.timeout,h[p]=function(){if(h&&(4===h.readyState||m)&&(0!==h.status||h.responseURL&&0===h.responseURL.indexOf("file:"))){var n="getAllResponseHeaders"in h?a(h.getAllResponseHeaders()):null,r={data:e.responseType&&"text"!==e.responseType?h.response:h.responseText,status:1223===h.status?204:h.status,statusText:1223===h.status?"No Content":h.statusText,headers:n,config:e,request:h};i(t,d,r),h=null}},h.onerror=function(){d(u("Network Error",e,null,h)),h=null},h.ontimeout=function(){d(u("timeout of "+e.timeout+"ms exceeded",e,"ECONNABORTED",h)),h=null},r.isStandardBrowserEnv()){var y=n("p1b6"),v=(e.withCredentials||s(e.url))&&e.xsrfCookieName?y.read(e.xsrfCookieName):void 0;v&&(f[e.xsrfHeaderName]=v)}if("setRequestHeader"in h&&r.forEach(f,function(e,t){void 0===c&&"content-type"===t.toLowerCase()?delete f[t]:h.setRequestHeader(t,e)}),e.withCredentials&&(h.withCredentials=!0),e.responseType)try{h.responseType=e.responseType}catch(t){if("json"!==e.responseType)throw t}"function"==typeof e.onDownloadProgress&&h.addEventListener("progress",e.onDownloadProgress),"function"==typeof e.onUploadProgress&&h.upload&&h.upload.addEventListener("progress",e.onUploadProgress),e.cancelToken&&e.cancelToken.promise.then(function(e){h&&(h.abort(),d(e),h=null)}),void 0===c&&(c=null),h.send(c)})}},"7t+N":function(e,t,n){var r;!function(t,n){"use strict";"object"==typeof e&&"object"==typeof e.exports?e.exports=t.document?n(t,!0):function(e){if(!e.document)throw new Error("jQuery requires a window with a document");return n(e)}:n(t)}("undefined"!=typeof window?window:this,function(n,i){"use strict";function o(e,t,n){var r,i,o=(n=n||ne).createElement("script");if(o.text=e,t)for(r in _e)(i=t[r]||t.getAttribute&&t.getAttribute(r))&&o.setAttribute(r,i);n.head.appendChild(o).parentNode.removeChild(o)}function a(e){return null==e?e+"":"object"==typeof e||"function"==typeof e?ue[le.call(e)]||"object":typeof e}function s(e){var t=!!e&&"length"in e&&e.length,n=a(e);return!pe(e)&&!me(e)&&("array"===n||0===t||"number"==typeof t&&t>0&&t-1 in e)}function u(e,t){return e.nodeName&&e.nodeName.toLowerCase()===t.toLowerCase()}function l(e,t,n){return pe(t)?ge.grep(e,function(e,r){return!!t.call(e,r,e)!==n}):t.nodeType?ge.grep(e,function(e){return e===t!==n}):"string"!=typeof t?ge.grep(e,function(e){return se.call(t,e)>-1!==n}):ge.filter(t,e,n)}function d(e,t){for(;(e=e[t])&&1!==e.nodeType;);return e}function c(e){return e}function f(e){throw e}function h(e,t,n,r){var i;try{e&&pe(i=e.promise)?i.call(e).done(t).fail(n):e&&pe(i=e.then)?i.call(e,t,n):t.apply(void 0,[e].slice(r))}catch(e){n.apply(void 0,[e])}}function p(){ne.removeEventListener("DOMContentLoaded",p),n.removeEventListener("load",p),ge.ready()}function m(e,t){return t.toUpperCase()}function _(e){return e.replace(Ee,"ms-").replace(He,m)}function g(){this.expando=ge.expando+g.uid++}function y(e,t,n){var r;if(void 0===n&&1===e.nodeType)if(r="data-"+t.replace(Ie,"-$&").toLowerCase(),"string"==typeof(n=e.getAttribute(r))){try{n=function(e){return"true"===e||"false"!==e&&("null"===e?null:e===+e+""?+e:Ne.test(e)?JSON.parse(e):e)}(n)}catch(e){}Pe.set(e,t,n)}else n=void 0;return n}function v(e,t,n,r){var i,o,a=20,s=r?function(){return r.cur()}:function(){return ge.css(e,t,"")},u=s(),l=n&&n[3]||(ge.cssNumber[t]?"":"px"),d=e.nodeType&&(ge.cssNumber[t]||"px"!==l&&+u)&&We.exec(ge.css(e,t));if(d&&d[3]!==l){for(u/=2,l=l||d[3],d=+u||1;a--;)ge.style(e,t,d+l),(1-o)*(1-(o=s()/u||.5))<=0&&(a=0),d/=o;d*=2,ge.style(e,t,d+l),n=n||[]}return n&&(d=+d||+u||0,i=n[1]?d+(n[1]+1)*n[2]:+n[2],r&&(r.unit=l,r.start=d,r.end=i)),i}function b(e){var t,n=e.ownerDocument,r=e.nodeName,i=Ve[r];return i||(t=n.body.appendChild(n.createElement(r)),i=ge.css(t,"display"),t.parentNode.removeChild(t),"none"===i&&(i="block"),Ve[r]=i,i)}function M(e,t){for(var n,r,i=[],o=0,a=e.length;o-1)i&&i.push(o);else if(d=ze(o),s=w(f.appendChild(o),"script"),d&&L(s),n)for(c=0;o=s[c++];)Xe.test(o.type||"")&&n.push(o);return f}function k(){return!0}function T(){return!1}function D(e,t){return e===function(){try{return ne.activeElement}catch(e){}}()==("focus"===t)}function Y(e,t,n,r,i,o){var a,s;if("object"==typeof t){for(s in"string"!=typeof n&&(r=r||n,n=void 0),t)Y(e,s,n,r,t[s],o);return e}if(null==r&&null==i?(i=n,r=n=void 0):null==i&&("string"==typeof n?(i=r,r=void 0):(i=r,r=n,n=void 0)),!1===i)i=T;else if(!i)return e;return 1===o&&(a=i,(i=function(e){return ge().off(e),a.apply(this,arguments)}).guid=a.guid||(a.guid=ge.guid++)),e.each(function(){ge.event.add(this,t,i,r,n)})}function S(e,t,n){n?(Oe.set(e,t,!1),ge.event.add(e,t,{namespace:!1,handler:function(e){var r,i,o=Oe.get(this,t);if(1&e.isTrigger&&this[t]){if(o.length)(ge.event.special[t]||{}).delegateType&&e.stopPropagation();else if(o=ie.call(arguments),Oe.set(this,t,o),r=n(this,t),this[t](),o!==(i=Oe.get(this,t))||r?Oe.set(this,t,!1):i={},o!==i)return e.stopImmediatePropagation(),e.preventDefault(),i.value}else o.length&&(Oe.set(this,t,{value:ge.event.trigger(ge.extend(o[0],ge.Event.prototype),o.slice(1),this)}),e.stopImmediatePropagation())}})):void 0===Oe.get(e,t)&&ge.event.add(e,t,k)}function C(e,t){return u(e,"table")&&u(11!==t.nodeType?t:t.firstChild,"tr")&&ge(e).children("tbody")[0]||e}function j(e){return e.type=(null!==e.getAttribute("type"))+"/"+e.type,e}function E(e){return"true/"===(e.type||"").slice(0,5)?e.type=e.type.slice(5):e.removeAttribute("type"),e}function H(e,t){var n,r,i,o,a,s,u,l;if(1===t.nodeType){if(Oe.hasData(e)&&(o=Oe.access(e),a=Oe.set(t,o),l=o.events))for(i in delete a.handle,a.events={},l)for(n=0,r=l[i].length;n1&&"string"==typeof p&&!he.checkClone&&at.test(p))return e.each(function(i){var o=e.eq(i);m&&(t[0]=p.call(this,i,o.html())),A(o,t,n,r)});if(f&&(a=(i=x(t,e[0].ownerDocument,!1,e,r)).firstChild,1===i.childNodes.length&&(i=a),a||r)){for(u=(s=ge.map(w(i,"script"),j)).length;c=0&&(u+=Math.max(0,Math.ceil(e["offset"+t[0].toUpperCase()+t.slice(1)]-o-u-s-.5))||0),u}function $(e,t,n){var r=lt(e),i=(!he.boxSizingReliable()||n)&&"border-box"===ge.css(e,"boxSizing",!1,r),o=i,a=P(e,t,r),s="offset"+t[0].toUpperCase()+t.slice(1);if(ut.test(a)){if(!n)return a;a="auto"}return(!he.boxSizingReliable()&&i||"auto"===a||!parseFloat(a)&&"inline"===ge.css(e,"display",!1,r))&&e.getClientRects().length&&(i="border-box"===ge.css(e,"boxSizing",!1,r),(o=s in e)&&(a=e[s])),(a=parseFloat(a)||0)+W(e,t,n||(i?"border":"content"),o,r,a)+"px"}function F(e,t,n,r,i){return new F.prototype.init(e,t,n,r,i)}function z(){vt&&(!1===ne.hidden&&n.requestAnimationFrame?n.requestAnimationFrame(z):n.setTimeout(z,ge.fx.interval),ge.fx.tick())}function q(){return n.setTimeout(function(){yt=void 0}),yt=Date.now()}function B(e,t){var n,r=0,i={height:e};for(t=t?1:0;r<4;r+=2-t)i["margin"+(n=$e[r])]=i["padding"+n]=e;return t&&(i.opacity=i.width=e),i}function U(e,t,n){for(var r,i=(V.tweeners[t]||[]).concat(V.tweeners["*"]),o=0,a=i.length;o=0&&nv.cacheLength&&delete t[e.shift()],t[n+" "]=r}}function r(e){return e[P]=!0,e}function i(e){var t=S.createElement("fieldset");try{return!!e(t)}catch(e){return!1}finally{t.parentNode&&t.parentNode.removeChild(t),t=null}}function o(e,t){for(var n=e.split("|"),r=n.length;r--;)v.attrHandle[n[r]]=t}function a(e,t){var n=t&&e,r=n&&1===e.nodeType&&1===t.nodeType&&e.sourceIndex-t.sourceIndex;if(r)return r;if(n)for(;n=n.nextSibling;)if(n===t)return-1;return e?1:-1}function s(e){return function(t){return"form"in t?t.parentNode&&!1===t.disabled?"label"in t?"label"in t.parentNode?t.parentNode.disabled===e:t.disabled===e:t.isDisabled===e||t.isDisabled!==!e&&we(t)===e:t.disabled===e:"label"in t&&t.disabled===e}}function u(e){return r(function(t){return t=+t,r(function(n,r){for(var i,o=e([],n.length,t),a=o.length;a--;)n[i=o[a]]&&(n[i]=!(r[i]=n[i]))})})}function l(e){return e&&void 0!==e.getElementsByTagName&&e}function d(){}function c(e){for(var t=0,n=e.length,r="";t1?function(t,n,r){for(var i=e.length;i--;)if(!e[i](t,n,r))return!1;return!0}:e[0]}function p(e,t,n,r,i){for(var o,a=[],s=0,u=e.length,l=null!=t;s-1&&(r[d]=!(s[d]=f))}}else v=p(v===s?v.splice(_,v.length):v),a?a(null,s,v,l):G.apply(s,v)})}function _(e){for(var t,n,r,i=e.length,o=v.relative[e[0].type],a=o||v.relative[" "],s=o?1:0,u=f(function(e){return e===t},a,!0),l=f(function(e){return K(t,e)>-1},a,!0),d=[function(e,n,r){var i=!o&&(r||n!==k)||((t=n).nodeType?u(e,n,r):l(e,n,r));return t=null,i}];s1&&h(d),s>1&&c(e.slice(0,s-1).concat({value:" "===e[s-2].type?"*":""})).replace(ie,"$1"),n,s+~]|"+Q+")"+Q+"*"),se=new RegExp(Q+"|>"),ue=new RegExp(ne),le=new RegExp("^"+ee+"$"),de={ID:new RegExp("^#("+ee+")"),CLASS:new RegExp("^\\.("+ee+")"),TAG:new RegExp("^("+ee+"|[*])"),ATTR:new RegExp("^"+te),PSEUDO:new RegExp("^"+ne),CHILD:new RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+Q+"*(even|odd|(([+-]|)(\\d*)n|)"+Q+"*(?:([+-]|)"+Q+"*(\\d+)|))"+Q+"*\\)|)","i"),bool:new RegExp("^(?:"+Z+")$","i"),needsContext:new RegExp("^"+Q+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+Q+"*((?:-\\d)?\\d*)"+Q+"*\\)|)(?=[^-]|$)","i")},ce=/HTML$/i,fe=/^(?:input|select|textarea|button)$/i,he=/^h\d$/i,pe=/^[^{]+\{\s*\[native \w/,me=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,_e=/[+~]/,ge=new RegExp("\\\\([\\da-f]{1,6}"+Q+"?|("+Q+")|.)","ig"),ye=function(e,t,n){var r="0x"+t-65536;return r!=r||n?t:r<0?String.fromCharCode(r+65536):String.fromCharCode(r>>10|55296,1023&r|56320)},ve=/([\0-\x1f\x7f]|^-?\d)|^-$|[^\0-\x1f\x7f-\uFFFF\w-]/g,be=function(e,t){return t?"\0"===e?"�":e.slice(0,-1)+"\\"+e.charCodeAt(e.length-1).toString(16)+" ":"\\"+e},Me=function(){Y()},we=f(function(e){return!0===e.disabled&&"fieldset"===e.nodeName.toLowerCase()},{dir:"parentNode",next:"legend"});try{G.apply(U=X.call(N.childNodes),N.childNodes),U[N.childNodes.length].nodeType}catch(e){G={apply:U.length?function(e,t){J.apply(e,X.call(t))}:function(e,t){for(var n=e.length,r=0;e[n++]=t[r++];);e.length=n-1}}}for(g in y=t.support={},M=t.isXML=function(e){var t=e.namespaceURI,n=(e.ownerDocument||e).documentElement;return!ce.test(t||n&&n.nodeName||"HTML")},Y=t.setDocument=function(e){var t,n,r=e?e.ownerDocument||e:N;return r!==S&&9===r.nodeType&&r.documentElement?(C=(S=r).documentElement,j=!M(S),N!==S&&(n=S.defaultView)&&n.top!==n&&(n.addEventListener?n.addEventListener("unload",Me,!1):n.attachEvent&&n.attachEvent("onunload",Me)),y.attributes=i(function(e){return e.className="i",!e.getAttribute("className")}),y.getElementsByTagName=i(function(e){return e.appendChild(S.createComment("")),!e.getElementsByTagName("*").length}),y.getElementsByClassName=pe.test(S.getElementsByClassName),y.getById=i(function(e){return C.appendChild(e).id=P,!S.getElementsByName||!S.getElementsByName(P).length}),y.getById?(v.filter.ID=function(e){var t=e.replace(ge,ye);return function(e){return e.getAttribute("id")===t}},v.find.ID=function(e,t){if(void 0!==t.getElementById&&j){var n=t.getElementById(e);return n?[n]:[]}}):(v.filter.ID=function(e){var t=e.replace(ge,ye);return function(e){var n=void 0!==e.getAttributeNode&&e.getAttributeNode("id");return n&&n.value===t}},v.find.ID=function(e,t){if(void 0!==t.getElementById&&j){var n,r,i,o=t.getElementById(e);if(o){if((n=o.getAttributeNode("id"))&&n.value===e)return[o];for(i=t.getElementsByName(e),r=0;o=i[r++];)if((n=o.getAttributeNode("id"))&&n.value===e)return[o]}return[]}}),v.find.TAG=y.getElementsByTagName?function(e,t){return void 0!==t.getElementsByTagName?t.getElementsByTagName(e):y.qsa?t.querySelectorAll(e):void 0}:function(e,t){var n,r=[],i=0,o=t.getElementsByTagName(e);if("*"===e){for(;n=o[i++];)1===n.nodeType&&r.push(n);return r}return o},v.find.CLASS=y.getElementsByClassName&&function(e,t){if(void 0!==t.getElementsByClassName&&j)return t.getElementsByClassName(e)},H=[],E=[],(y.qsa=pe.test(S.querySelectorAll))&&(i(function(e){C.appendChild(e).innerHTML="",e.querySelectorAll("[msallowcapture^='']").length&&E.push("[*^$]="+Q+"*(?:''|\"\")"),e.querySelectorAll("[selected]").length||E.push("\\["+Q+"*(?:value|"+Z+")"),e.querySelectorAll("[id~="+P+"-]").length||E.push("~="),e.querySelectorAll(":checked").length||E.push(":checked"),e.querySelectorAll("a#"+P+"+*").length||E.push(".#.+[+~]")}),i(function(e){e.innerHTML="";var t=S.createElement("input");t.setAttribute("type","hidden"),e.appendChild(t).setAttribute("name","D"),e.querySelectorAll("[name=d]").length&&E.push("name"+Q+"*[*^$|!~]?="),2!==e.querySelectorAll(":enabled").length&&E.push(":enabled",":disabled"),C.appendChild(e).disabled=!0,2!==e.querySelectorAll(":disabled").length&&E.push(":enabled",":disabled"),e.querySelectorAll("*,:x"),E.push(",.*:")})),(y.matchesSelector=pe.test(A=C.matches||C.webkitMatchesSelector||C.mozMatchesSelector||C.oMatchesSelector||C.msMatchesSelector))&&i(function(e){y.disconnectedMatch=A.call(e,"*"),A.call(e,"[s!='']:x"),H.push("!=",ne)}),E=E.length&&new RegExp(E.join("|")),H=H.length&&new RegExp(H.join("|")),t=pe.test(C.compareDocumentPosition),O=t||pe.test(C.contains)?function(e,t){var n=9===e.nodeType?e.documentElement:e,r=t&&t.parentNode;return e===r||!(!r||1!==r.nodeType||!(n.contains?n.contains(r):e.compareDocumentPosition&&16&e.compareDocumentPosition(r)))}:function(e,t){if(t)for(;t=t.parentNode;)if(t===e)return!0;return!1},q=t?function(e,t){if(e===t)return D=!0,0;var n=!e.compareDocumentPosition-!t.compareDocumentPosition;return n||(1&(n=(e.ownerDocument||e)===(t.ownerDocument||t)?e.compareDocumentPosition(t):1)||!y.sortDetached&&t.compareDocumentPosition(e)===n?e===S||e.ownerDocument===N&&O(N,e)?-1:t===S||t.ownerDocument===N&&O(N,t)?1:T?K(T,e)-K(T,t):0:4&n?-1:1)}:function(e,t){if(e===t)return D=!0,0;var n,r=0,i=e.parentNode,o=t.parentNode,s=[e],u=[t];if(!i||!o)return e===S?-1:t===S?1:i?-1:o?1:T?K(T,e)-K(T,t):0;if(i===o)return a(e,t);for(n=e;n=n.parentNode;)s.unshift(n);for(n=t;n=n.parentNode;)u.unshift(n);for(;s[r]===u[r];)r++;return r?a(s[r],u[r]):s[r]===N?-1:u[r]===N?1:0},S):S},t.matches=function(e,n){return t(e,null,null,n)},t.matchesSelector=function(e,n){if((e.ownerDocument||e)!==S&&Y(e),y.matchesSelector&&j&&!z[n+" "]&&(!H||!H.test(n))&&(!E||!E.test(n)))try{var r=A.call(e,n);if(r||y.disconnectedMatch||e.document&&11!==e.document.nodeType)return r}catch(e){z(n,!0)}return t(n,S,null,[e]).length>0},t.contains=function(e,t){return(e.ownerDocument||e)!==S&&Y(e),O(e,t)},t.attr=function(e,t){(e.ownerDocument||e)!==S&&Y(e);var n=v.attrHandle[t.toLowerCase()],r=n&&B.call(v.attrHandle,t.toLowerCase())?n(e,t,!j):void 0;return void 0!==r?r:y.attributes||!j?e.getAttribute(t):(r=e.getAttributeNode(t))&&r.specified?r.value:null},t.escape=function(e){return(e+"").replace(ve,be)},t.error=function(e){throw new Error("Syntax error, unrecognized expression: "+e)},t.uniqueSort=function(e){var t,n=[],r=0,i=0 -;if(D=!y.detectDuplicates,T=!y.sortStable&&e.slice(0),e.sort(q),D){for(;t=e[i++];)t===e[i]&&(r=n.push(i));for(;r--;)e.splice(n[r],1)}return T=null,e},b=t.getText=function(e){var t,n="",r=0,i=e.nodeType;if(i){if(1===i||9===i||11===i){if("string"==typeof e.textContent)return e.textContent;for(e=e.firstChild;e;e=e.nextSibling)n+=b(e)}else if(3===i||4===i)return e.nodeValue}else for(;t=e[r++];)n+=b(t);return n},(v=t.selectors={cacheLength:50,createPseudo:r,match:de,attrHandle:{},find:{},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(e){return e[1]=e[1].replace(ge,ye),e[3]=(e[3]||e[4]||e[5]||"").replace(ge,ye),"~="===e[2]&&(e[3]=" "+e[3]+" "),e.slice(0,4)},CHILD:function(e){return e[1]=e[1].toLowerCase(),"nth"===e[1].slice(0,3)?(e[3]||t.error(e[0]),e[4]=+(e[4]?e[5]+(e[6]||1):2*("even"===e[3]||"odd"===e[3])),e[5]=+(e[7]+e[8]||"odd"===e[3])):e[3]&&t.error(e[0]),e},PSEUDO:function(e){var t,n=!e[6]&&e[2];return de.CHILD.test(e[0])?null:(e[3]?e[2]=e[4]||e[5]||"":n&&ue.test(n)&&(t=w(n,!0))&&(t=n.indexOf(")",n.length-t)-n.length)&&(e[0]=e[0].slice(0,t),e[2]=n.slice(0,t)),e.slice(0,3))}},filter:{TAG:function(e){var t=e.replace(ge,ye).toLowerCase();return"*"===e?function(){return!0}:function(e){return e.nodeName&&e.nodeName.toLowerCase()===t}},CLASS:function(e){var t=W[e+" "];return t||(t=new RegExp("(^|"+Q+")"+e+"("+Q+"|$)"))&&W(e,function(e){return t.test("string"==typeof e.className&&e.className||void 0!==e.getAttribute&&e.getAttribute("class")||"")})},ATTR:function(e,n,r){return function(i){var o=t.attr(i,e);return null==o?"!="===n:!n||(o+="","="===n?o===r:"!="===n?o!==r:"^="===n?r&&0===o.indexOf(r):"*="===n?r&&o.indexOf(r)>-1:"$="===n?r&&o.slice(-r.length)===r:"~="===n?(" "+o.replace(re," ")+" ").indexOf(r)>-1:"|="===n&&(o===r||o.slice(0,r.length+1)===r+"-"))}},CHILD:function(e,t,n,r,i){var o="nth"!==e.slice(0,3),a="last"!==e.slice(-4),s="of-type"===t;return 1===r&&0===i?function(e){return!!e.parentNode}:function(t,n,u){var l,d,c,f,h,p,m=o!==a?"nextSibling":"previousSibling",_=t.parentNode,g=s&&t.nodeName.toLowerCase(),y=!u&&!s,v=!1;if(_){if(o){for(;m;){for(f=t;f=f[m];)if(s?f.nodeName.toLowerCase()===g:1===f.nodeType)return!1;p=m="only"===e&&!p&&"nextSibling"}return!0}if(p=[a?_.firstChild:_.lastChild],a&&y){for(v=(h=(l=(d=(c=(f=_)[P]||(f[P]={}))[f.uniqueID]||(c[f.uniqueID]={}))[e]||[])[0]===I&&l[1])&&l[2],f=h&&_.childNodes[h];f=++h&&f&&f[m]||(v=h=0)||p.pop();)if(1===f.nodeType&&++v&&f===t){d[e]=[I,h,v];break}}else if(y&&(v=h=(l=(d=(c=(f=t)[P]||(f[P]={}))[f.uniqueID]||(c[f.uniqueID]={}))[e]||[])[0]===I&&l[1]),!1===v)for(;(f=++h&&f&&f[m]||(v=h=0)||p.pop())&&((s?f.nodeName.toLowerCase()!==g:1!==f.nodeType)||!++v||(y&&((d=(c=f[P]||(f[P]={}))[f.uniqueID]||(c[f.uniqueID]={}))[e]=[I,v]),f!==t)););return(v-=i)===r||v%r==0&&v/r>=0}}},PSEUDO:function(e,n){var i,o=v.pseudos[e]||v.setFilters[e.toLowerCase()]||t.error("unsupported pseudo: "+e);return o[P]?o(n):o.length>1?(i=[e,e,"",n],v.setFilters.hasOwnProperty(e.toLowerCase())?r(function(e,t){for(var r,i=o(e,n),a=i.length;a--;)e[r=K(e,i[a])]=!(t[r]=i[a])}):function(e){return o(e,0,i)}):o}},pseudos:{not:r(function(e){var t=[],n=[],i=L(e.replace(ie,"$1"));return i[P]?r(function(e,t,n,r){for(var o,a=i(e,null,r,[]),s=e.length;s--;)(o=a[s])&&(e[s]=!(t[s]=o))}):function(e,r,o){return t[0]=e,i(t,null,o,n),t[0]=null,!n.pop()}}),has:r(function(e){return function(n){return t(e,n).length>0}}),contains:r(function(e){return e=e.replace(ge,ye),function(t){return(t.textContent||b(t)).indexOf(e)>-1}}),lang:r(function(e){return le.test(e||"")||t.error("unsupported lang: "+e),e=e.replace(ge,ye).toLowerCase(),function(t){var n;do{if(n=j?t.lang:t.getAttribute("xml:lang")||t.getAttribute("lang"))return(n=n.toLowerCase())===e||0===n.indexOf(e+"-")}while((t=t.parentNode)&&1===t.nodeType);return!1}}),target:function(t){var n=e.location&&e.location.hash;return n&&n.slice(1)===t.id},root:function(e){return e===C},focus:function(e){return e===S.activeElement&&(!S.hasFocus||S.hasFocus())&&!!(e.type||e.href||~e.tabIndex)},enabled:s(!1),disabled:s(!0),checked:function(e){var t=e.nodeName.toLowerCase();return"input"===t&&!!e.checked||"option"===t&&!!e.selected},selected:function(e){return e.parentNode&&e.parentNode.selectedIndex,!0===e.selected},empty:function(e){for(e=e.firstChild;e;e=e.nextSibling)if(e.nodeType<6)return!1;return!0},parent:function(e){return!v.pseudos.empty(e)},header:function(e){return he.test(e.nodeName)},input:function(e){return fe.test(e.nodeName)},button:function(e){var t=e.nodeName.toLowerCase();return"input"===t&&"button"===e.type||"button"===t},text:function(e){var t;return"input"===e.nodeName.toLowerCase()&&"text"===e.type&&(null==(t=e.getAttribute("type"))||"text"===t.toLowerCase())},first:u(function(){return[0]}),last:u(function(e,t){return[t-1]}),eq:u(function(e,t,n){return[n<0?n+t:n]}),even:u(function(e,t){for(var n=0;nt?t:n;--r>=0;)e.push(r);return e}),gt:u(function(e,t,n){for(var r=n<0?n+t:n;++r0,o=e.length>0,a=function(r,a,s,u,l){var d,c,f,h=0,m="0",_=r&&[],g=[],y=k,b=r||o&&v.find.TAG("*",l),M=I+=null==y?1:Math.random()||.1,w=b.length;for(l&&(k=a===S||a||l);m!==w&&null!=(d=b[m]);m++){if(o&&d){for(c=0,a||d.ownerDocument===S||(Y(d),s=!j);f=e[c++];)if(f(d,a||S,s)){u.push(d);break}l&&(I=M)}i&&((d=!f&&d)&&h--,r&&_.push(d))}if(h+=m,i&&m!==h){for(c=0;f=n[c++];)f(_,g,a,s);if(r){if(h>0)for(;m--;)_[m]||g[m]||(g[m]=V.call(u));g=p(g)}G.apply(u,g),l&&!r&&g.length>0&&h+n.length>1&&t.uniqueSort(u)}return l&&(I=M,k=y),_};return i?r(a):a}(a,o))).selector=e}return s},x=t.select=function(e,t,n,r){var i,o,a,s,u,d="function"==typeof e&&e,f=!r&&w(e=d.selector||e);if(n=n||[],1===f.length){if((o=f[0]=f[0].slice(0)).length>2&&"ID"===(a=o[0]).type&&9===t.nodeType&&j&&v.relative[o[1].type]){if(!(t=(v.find.ID(a.matches[0].replace(ge,ye),t)||[])[0]))return n;d&&(t=t.parentNode),e=e.slice(o.shift().value.length)}for(i=de.needsContext.test(e)?0:o.length;i--&&(a=o[i],!v.relative[s=a.type]);)if((u=v.find[s])&&(r=u(a.matches[0].replace(ge,ye),_e.test(o[0].type)&&l(t.parentNode)||t))){if(o.splice(i,1),!(e=r.length&&c(o)))return G.apply(n,r),n;break}}return(d||L(e,f))(r,t,!j,n,!t||_e.test(e)&&l(t.parentNode)||t),n},y.sortStable=P.split("").sort(q).join("")===P,y.detectDuplicates=!!D,Y(),y.sortDetached=i(function(e){return 1&e.compareDocumentPosition(S.createElement("fieldset"))}),i(function(e){return e.innerHTML="","#"===e.firstChild.getAttribute("href")})||o("type|href|height|width",function(e,t,n){if(!n)return e.getAttribute(t,"type"===t.toLowerCase()?1:2)}),y.attributes&&i(function(e){return e.innerHTML="",e.firstChild.setAttribute("value",""),""===e.firstChild.getAttribute("value")})||o("value",function(e,t,n){if(!n&&"input"===e.nodeName.toLowerCase())return e.defaultValue}),i(function(e){return null==e.getAttribute("disabled")})||o(Z,function(e,t,n){var r;if(!n)return!0===e[t]?t.toLowerCase():(r=e.getAttributeNode(t))&&r.specified?r.value:null}),t}(n);ge.find=ve,ge.expr=ve.selectors,ge.expr[":"]=ge.expr.pseudos,ge.uniqueSort=ge.unique=ve.uniqueSort,ge.text=ve.getText,ge.isXMLDoc=ve.isXML,ge.contains=ve.contains,ge.escapeSelector=ve.escape;var be=function(e,t,n){for(var r=[],i=void 0!==n;(e=e[t])&&9!==e.nodeType;)if(1===e.nodeType){if(i&&ge(e).is(n))break;r.push(e)}return r},Me=function(e,t){for(var n=[];e;e=e.nextSibling)1===e.nodeType&&e!==t&&n.push(e);return n},we=ge.expr.match.needsContext,Le=/^<([a-z][^\/\0>:\x20\t\r\n\f]*)[\x20\t\r\n\f]*\/?>(?:<\/\1>|)$/i;ge.filter=function(e,t,n){var r=t[0];return n&&(e=":not("+e+")"),1===t.length&&1===r.nodeType?ge.find.matchesSelector(r,e)?[r]:[]:ge.find.matches(e,ge.grep(t,function(e){return 1===e.nodeType}))},ge.fn.extend({find:function(e){var t,n,r=this.length,i=this;if("string"!=typeof e)return this.pushStack(ge(e).filter(function(){for(t=0;t1?ge.uniqueSort(n):n},filter:function(e){return this.pushStack(l(this,e||[],!1))},not:function(e){return this.pushStack(l(this,e||[],!0))},is:function(e){return!!l(this,"string"==typeof e&&we.test(e)?ge(e):e||[],!1).length}});var xe,ke=/^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]+))$/;(ge.fn.init=function(e,t,n){var r,i;if(!e)return this;if(n=n||xe,"string"==typeof e){if(!(r="<"===e[0]&&">"===e[e.length-1]&&e.length>=3?[null,e,null]:ke.exec(e))||!r[1]&&t)return!t||t.jquery?(t||n).find(e):this.constructor(t).find(e);if(r[1]){if(t=t instanceof ge?t[0]:t,ge.merge(this,ge.parseHTML(r[1],t&&t.nodeType?t.ownerDocument||t:ne,!0)),Le.test(r[1])&&ge.isPlainObject(t))for(r in t)pe(this[r])?this[r](t[r]):this.attr(r,t[r]);return this}return(i=ne.getElementById(r[2]))&&(this[0]=i,this.length=1),this}return e.nodeType?(this[0]=e,this.length=1,this):pe(e)?void 0!==n.ready?n.ready(e):e(ge):ge.makeArray(e,this)}).prototype=ge.fn,xe=ge(ne);var Te=/^(?:parents|prev(?:Until|All))/,De={children:!0,contents:!0,next:!0,prev:!0};ge.fn.extend({has:function(e){var t=ge(e,this),n=t.length;return this.filter(function(){for(var e=0;e-1:1===n.nodeType&&ge.find.matchesSelector(n,e))){o.push(n);break}return this.pushStack(o.length>1?ge.uniqueSort(o):o)},index:function(e){return e?"string"==typeof e?se.call(ge(e),this[0]):se.call(this,e.jquery?e[0]:e):this[0]&&this[0].parentNode?this.first().prevAll().length:-1},add:function(e,t){return this.pushStack(ge.uniqueSort(ge.merge(this.get(),ge(e,t))))},addBack:function(e){return this.add(null==e?this.prevObject:this.prevObject.filter(e))}}),ge.each({parent:function(e){var t=e.parentNode;return t&&11!==t.nodeType?t:null},parents:function(e){return be(e,"parentNode")},parentsUntil:function(e,t,n){return be(e,"parentNode",n)},next:function(e){return d(e,"nextSibling")},prev:function(e){return d(e,"previousSibling")},nextAll:function(e){return be(e,"nextSibling")},prevAll:function(e){return be(e,"previousSibling")},nextUntil:function(e,t,n){return be(e,"nextSibling",n)},prevUntil:function(e,t,n){return be(e,"previousSibling",n)},siblings:function(e){return Me((e.parentNode||{}).firstChild,e)},children:function(e){return Me(e.firstChild)},contents:function(e){return void 0!==e.contentDocument?e.contentDocument:(u(e,"template")&&(e=e.content||e),ge.merge([],e.childNodes))}},function(e,t){ge.fn[e]=function(n,r){var i=ge.map(this,t,n);return"Until"!==e.slice(-5)&&(r=n),r&&"string"==typeof r&&(i=ge.filter(r,i)),this.length>1&&(De[e]||ge.uniqueSort(i),Te.test(e)&&i.reverse()),this.pushStack(i)}});var Ye=/[^\x20\t\r\n\f]+/g;ge.Callbacks=function(e){e="string"==typeof e?function(e){var t={};return ge.each(e.match(Ye)||[],function(e,n){t[n]=!0}),t}(e):ge.extend({},e);var t,n,r,i,o=[],s=[],u=-1,l=function(){for(i=i||e.once,r=t=!0;s.length;u=-1)for(n=s.shift();++u-1;)o.splice(n,1),n<=u&&u--}),this},has:function(e){return e?ge.inArray(e,o)>-1:o.length>0},empty:function(){return o&&(o=[]),this},disable:function(){return i=s=[],o=n="",this},disabled:function(){return!o},lock:function(){return i=s=[],n||t||(o=n=""),this},locked:function(){return!!i},fireWith:function(e,n){return i||(n=[e,(n=n||[]).slice?n.slice():n],s.push(n),t||l()),this},fire:function(){return d.fireWith(this,arguments),this},fired:function(){return!!r}};return d},ge.extend({Deferred:function(e){var t=[["notify","progress",ge.Callbacks("memory"),ge.Callbacks("memory"),2],["resolve","done",ge.Callbacks("once memory"),ge.Callbacks("once memory"),0,"resolved"],["reject","fail",ge.Callbacks("once memory"),ge.Callbacks("once memory"),1,"rejected"]],r="pending",i={state:function(){return r},always:function(){return o.done(arguments).fail(arguments),this},catch:function(e){return i.then(null,e)},pipe:function(){var e=arguments;return ge.Deferred(function(n){ge.each(t,function(t,r){var i=pe(e[r[4]])&&e[r[4]];o[r[1]](function(){var e=i&&i.apply(this,arguments);e&&pe(e.promise)?e.promise().progress(n.notify).done(n.resolve).fail(n.reject):n[r[0]+"With"](this,i?[e]:arguments)})}),e=null}).promise()},then:function(e,r,i){function o(e,t,r,i){return function(){var s=this,u=arguments,l=function(){var n,l;if(!(e=a&&(r!==f&&(s=void 0,u=[n]),t.rejectWith(s,u))}};e?d():(ge.Deferred.getStackHook&&(d.stackTrace=ge.Deferred.getStackHook()),n.setTimeout(d))}}var a=0;return ge.Deferred(function(n){t[0][3].add(o(0,n,pe(i)?i:c,n.notifyWith)),t[1][3].add(o(0,n,pe(e)?e:c)),t[2][3].add(o(0,n,pe(r)?r:f))}).promise()},promise:function(e){return null!=e?ge.extend(e,i):i}},o={};return ge.each(t,function(e,n){var a=n[2],s=n[5];i[n[1]]=a.add,s&&a.add(function(){r=s},t[3-e][2].disable,t[3-e][3].disable,t[0][2].lock,t[0][3].lock),a.add(n[3].fire),o[n[0]]=function(){return o[n[0]+"With"](this===o?void 0:this,arguments),this},o[n[0]+"With"]=a.fireWith}),i.promise(o),e&&e.call(o,o),o},when:function(e){var t=arguments.length,n=t,r=Array(n),i=ie.call(arguments),o=ge.Deferred(),a=function(e){return function(n){r[e]=this,i[e]=arguments.length>1?ie.call(arguments):n,--t||o.resolveWith(r,i)}};if(t<=1&&(h(e,o.done(a(n)).resolve,o.reject,!t),"pending"===o.state()||pe(i[n]&&i[n].then)))return o.then();for(;n--;)h(i[n],a(n),o.reject);return o.promise()}});var Se=/^(Eval|Internal|Range|Reference|Syntax|Type|URI)Error$/;ge.Deferred.exceptionHook=function(e,t){n.console&&n.console.warn&&e&&Se.test(e.name)&&n.console.warn("jQuery.Deferred exception: "+e.message,e.stack,t)},ge.readyException=function(e){n.setTimeout(function(){throw e})};var Ce=ge.Deferred();ge.fn.ready=function(e){return Ce.then(e).catch(function(e){ge.readyException(e)}),this},ge.extend({isReady:!1,readyWait:1,ready:function(e){(!0===e?--ge.readyWait:ge.isReady)||(ge.isReady=!0,!0!==e&&--ge.readyWait>0||Ce.resolveWith(ne,[ge]))}}),ge.ready.then=Ce.then,"complete"===ne.readyState||"loading"!==ne.readyState&&!ne.documentElement.doScroll?n.setTimeout(ge.ready):(ne.addEventListener("DOMContentLoaded",p),n.addEventListener("load",p));var je=function(e,t,n,r,i,o,s){var u=0,l=e.length,d=null==n;if("object"===a(n))for(u in i=!0,n)je(e,t,u,n[u],!0,o,s);else if(void 0!==r&&(i=!0,pe(r)||(s=!0),d&&(s?(t.call(e,r),t=null):(d=t,t=function(e,t,n){return d.call(ge(e),n)})),t))for(;u1,null,!0)},removeData:function(e){return this.each(function(){Pe.remove(this,e)})}}),ge.extend({queue:function(e,t,n){var r;if(e)return t=(t||"fx")+"queue",r=Oe.get(e,t),n&&(!r||Array.isArray(n)?r=Oe.access(e,t,ge.makeArray(n)):r.push(n)),r||[]},dequeue:function(e,t){t=t||"fx";var n=ge.queue(e,t),r=n.length,i=n.shift(),o=ge._queueHooks(e,t);"inprogress"===i&&(i=n.shift(),r--),i&&("fx"===t&&n.unshift("inprogress"),delete o.stop,i.call(e,function(){ge.dequeue(e,t)},o)),!r&&o&&o.empty.fire()},_queueHooks:function(e,t){var n=t+"queueHooks";return Oe.get(e,n)||Oe.access(e,n,{empty:ge.Callbacks("once memory").add(function(){Oe.remove(e,[t+"queue",n])})})}}),ge.fn.extend({queue:function(e,t){var n=2;return"string"!=typeof e&&(t=e,e="fx",n--),arguments.length\x20\t\r\n\f]*)/i,Xe=/^$|^module$|\/(?:java|ecma)script/i,Ke={option:[1,""],thead:[1,"","
"],col:[2,"","
"],tr:[2,"","
"],td:[3,"","
"],_default:[0,"",""]};Ke.optgroup=Ke.option,Ke.tbody=Ke.tfoot=Ke.colgroup=Ke.caption=Ke.thead,Ke.th=Ke.td;var Ze,Qe,et=/<|&#?\w+;/;Ze=ne.createDocumentFragment().appendChild(ne.createElement("div")),(Qe=ne.createElement("input")).setAttribute("type","radio"),Qe.setAttribute("checked","checked"),Qe.setAttribute("name","t"),Ze.appendChild(Qe),he.checkClone=Ze.cloneNode(!0).cloneNode(!0).lastChild.checked,Ze.innerHTML="",he.noCloneChecked=!!Ze.cloneNode(!0).lastChild.defaultValue;var tt=/^key/,nt=/^(?:mouse|pointer|contextmenu|drag|drop)|click/,rt=/^([^.]*)(?:\.(.+)|)/;ge.event={global:{},add:function(e,t,n,r,i){var o,a,s,u,l,d,c,f,h,p,m,_=Oe.get(e);if(_)for(n.handler&&(n=(o=n).handler,i=o.selector),i&&ge.find.matchesSelector(Fe,i),n.guid||(n.guid=ge.guid++),(u=_.events)||(u=_.events={}),(a=_.handle)||(a=_.handle=function(t){return void 0!==ge&&ge.event.triggered!==t.type?ge.event.dispatch.apply(e,arguments):void 0}),l=(t=(t||"").match(Ye)||[""]).length;l--;)h=m=(s=rt.exec(t[l])||[])[1],p=(s[2]||"").split(".").sort(),h&&(c=ge.event.special[h]||{},h=(i?c.delegateType:c.bindType)||h,c=ge.event.special[h]||{},d=ge.extend({type:h,origType:m,data:r,handler:n,guid:n.guid,selector:i,needsContext:i&&ge.expr.match.needsContext.test(i),namespace:p.join(".")},o),(f=u[h])||((f=u[h]=[]).delegateCount=0,c.setup&&!1!==c.setup.call(e,r,p,a)||e.addEventListener&&e.addEventListener(h,a)),c.add&&(c.add.call(e,d),d.handler.guid||(d.handler.guid=n.guid)),i?f.splice(f.delegateCount++,0,d):f.push(d),ge.event.global[h]=!0)},remove:function(e,t,n,r,i){var o,a,s,u,l,d,c,f,h,p,m,_=Oe.hasData(e)&&Oe.get(e);if(_&&(u=_.events)){for(l=(t=(t||"").match(Ye)||[""]).length;l--;)if(h=m=(s=rt.exec(t[l])||[])[1],p=(s[2]||"").split(".").sort(),h){for(c=ge.event.special[h]||{},f=u[h=(r?c.delegateType:c.bindType)||h]||[],s=s[2]&&new RegExp("(^|\\.)"+p.join("\\.(?:.*\\.|)")+"(\\.|$)"),a=o=f.length;o--;)d=f[o],!i&&m!==d.origType||n&&n.guid!==d.guid||s&&!s.test(d.namespace)||r&&r!==d.selector&&("**"!==r||!d.selector)||(f.splice(o,1),d.selector&&f.delegateCount--,c.remove&&c.remove.call(e,d));a&&!f.length&&(c.teardown&&!1!==c.teardown.call(e,p,_.handle)||ge.removeEvent(e,h,_.handle),delete u[h])}else for(h in u)ge.event.remove(e,h+t[l],n,r,!0);ge.isEmptyObject(u)&&Oe.remove(e,"handle events")}},dispatch:function(e){var t,n,r,i,o,a,s=ge.event.fix(e),u=new Array(arguments.length),l=(Oe.get(this,"events")||{})[s.type]||[],d=ge.event.special[s.type]||{};for(u[0]=s,t=1;t=1))for(;l!==this;l=l.parentNode||this)if(1===l.nodeType&&("click"!==e.type||!0!==l.disabled)){for(o=[],a={},n=0;n-1:ge.find(i,this,null,[l]).length),a[i]&&o.push(r);o.length&&s.push({elem:l,handlers:o})}return l=this,u\x20\t\r\n\f]*)[^>]*)\/>/gi,ot=/\s*$/g;ge.extend({htmlPrefilter:function(e){return e.replace(it,"<$1>")},clone:function(e,t,n){var r,i,o,a,s,u,l,d=e.cloneNode(!0),c=ze(e);if(!(he.noCloneChecked||1!==e.nodeType&&11!==e.nodeType||ge.isXMLDoc(e)))for(a=w(d),r=0,i=(o=w(e)).length;r0&&L(a,!c&&w(e,"script")),d},cleanData:function(e){for(var t,n,r,i=ge.event.special,o=0;void 0!==(n=e[o]);o++)if(Ae(n)){if(t=n[Oe.expando]){if(t.events)for(r in t.events)i[r]?ge.event.remove(n,r):ge.removeEvent(n,r,t.handle);n[Oe.expando]=void 0}n[Pe.expando]&&(n[Pe.expando]=void 0)}}}),ge.fn.extend({detach:function(e){return O(this,e,!0)},remove:function(e){return O(this,e)},text:function(e){return je(this,function(e){return void 0===e?ge.text(this):this.empty().each(function(){1!==this.nodeType&&11!==this.nodeType&&9!==this.nodeType||(this.textContent=e)})},null,e,arguments.length)},append:function(){return A(this,arguments,function(e){1!==this.nodeType&&11!==this.nodeType&&9!==this.nodeType||C(this,e).appendChild(e)})},prepend:function(){return A(this,arguments,function(e){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var t=C(this,e);t.insertBefore(e,t.firstChild)}})},before:function(){return A(this,arguments,function(e){this.parentNode&&this.parentNode.insertBefore(e,this)})},after:function(){return A(this,arguments,function(e){this.parentNode&&this.parentNode.insertBefore(e,this.nextSibling)})},empty:function(){for(var e,t=0;null!=(e=this[t]);t++)1===e.nodeType&&(ge.cleanData(w(e,!1)),e.textContent="");return this},clone:function(e,t){return e=null!=e&&e,t=null==t?e:t,this.map(function(){return ge.clone(this,e,t)})},html:function(e){return je(this,function(e){var t=this[0]||{},n=0,r=this.length;if(void 0===e&&1===t.nodeType)return t.innerHTML;if("string"==typeof e&&!ot.test(e)&&!Ke[(Ge.exec(e)||["",""])[1].toLowerCase()]){e=ge.htmlPrefilter(e);try{for(;n1)}}),ge.Tween=F,F.prototype={constructor:F,init:function(e,t,n,r,i,o){this.elem=e,this.prop=n,this.easing=i||ge.easing._default,this.options=t,this.start=this.now=this.cur(),this.end=r,this.unit=o||(ge.cssNumber[n]?"":"px")},cur:function(){var e=F.propHooks[this.prop];return e&&e.get?e.get(this):F.propHooks._default.get(this)},run:function(e){var t,n=F.propHooks[this.prop];return this.options.duration?this.pos=t=ge.easing[this.easing](e,this.options.duration*e,0,1,this.options.duration):this.pos=t=e,this.now=(this.end-this.start)*t+this.start,this.options.step&&this.options.step.call(this.elem,this.now,this),n&&n.set?n.set(this):F.propHooks._default.set(this),this}},F.prototype.init.prototype=F.prototype,F.propHooks={_default:{get:function(e){var t;return 1!==e.elem.nodeType||null!=e.elem[e.prop]&&null==e.elem.style[e.prop]?e.elem[e.prop]:(t=ge.css(e.elem,e.prop,""))&&"auto"!==t?t:0},set:function(e){ge.fx.step[e.prop]?ge.fx.step[e.prop](e):1!==e.elem.nodeType||!ge.cssHooks[e.prop]&&null==e.elem.style[I(e.prop)]?e.elem[e.prop]=e.now:ge.style(e.elem,e.prop,e.now+e.unit)}}},F.propHooks.scrollTop=F.propHooks.scrollLeft={set:function(e){e.elem.nodeType&&e.elem.parentNode&&(e.elem[e.prop]=e.now)}},ge.easing={linear:function(e){return e},swing:function(e){return.5-Math.cos(e*Math.PI)/2},_default:"swing"},ge.fx=F.prototype.init,ge.fx.step={};var yt,vt,bt=/^(?:toggle|show|hide)$/,Mt=/queueHooks$/;ge.Animation=ge.extend(V,{tweeners:{"*":[function(e,t){var n=this.createTween(e,t);return v(n.elem,e,We.exec(t),n),n}]},tweener:function(e,t){pe(e)?(t=e,e=["*"]):e=e.match(Ye);for(var n,r=0,i=e.length;r1)},removeAttr:function(e){return this.each(function(){ge.removeAttr(this,e)})}}),ge.extend({attr:function(e,t,n){var r,i,o=e.nodeType;if(3!==o&&8!==o&&2!==o)return void 0===e.getAttribute?ge.prop(e,t,n):(1===o&&ge.isXMLDoc(e)||(i=ge.attrHooks[t.toLowerCase()]||(ge.expr.match.bool.test(t)?wt:void 0)),void 0!==n?null===n?void ge.removeAttr(e,t):i&&"set"in i&&void 0!==(r=i.set(e,n,t))?r:(e.setAttribute(t,n+""),n):i&&"get"in i&&null!==(r=i.get(e,t))?r:null==(r=ge.find.attr(e,t))?void 0:r)},attrHooks:{type:{set:function(e,t){if(!he.radioValue&&"radio"===t&&u(e,"input")){var n=e.value;return e.setAttribute("type",t),n&&(e.value=n),t}}}},removeAttr:function(e,t){var n,r=0,i=t&&t.match(Ye);if(i&&1===e.nodeType)for(;n=i[r++];)e.removeAttribute(n)}}),wt={set:function(e,t,n){return!1===t?ge.removeAttr(e,n):e.setAttribute(n,n),n}},ge.each(ge.expr.match.bool.source.match(/\w+/g),function(e,t){var n=Lt[t]||ge.find.attr;Lt[t]=function(e,t,r){var i,o,a=t.toLowerCase();return r||(o=Lt[a],Lt[a]=i,i=null!=n(e,t,r)?a:null,Lt[a]=o),i}});var xt=/^(?:input|select|textarea|button)$/i,kt=/^(?:a|area)$/i;ge.fn.extend({prop:function(e,t){return je(this,ge.prop,e,t,arguments.length>1)},removeProp:function(e){return this.each(function(){delete this[ge.propFix[e]||e]})}}),ge.extend({prop:function(e,t,n){var r,i,o=e.nodeType;if(3!==o&&8!==o&&2!==o)return 1===o&&ge.isXMLDoc(e)||(t=ge.propFix[t]||t,i=ge.propHooks[t]),void 0!==n?i&&"set"in i&&void 0!==(r=i.set(e,n,t))?r:e[t]=n:i&&"get"in i&&null!==(r=i.get(e,t))?r:e[t]},propHooks:{tabIndex:{get:function(e){var t=ge.find.attr(e,"tabindex");return t?parseInt(t,10):xt.test(e.nodeName)||kt.test(e.nodeName)&&e.href?0:-1}}},propFix:{for:"htmlFor",class:"className"}}),he.optSelected||(ge.propHooks.selected={get:function(e){var t=e.parentNode;return t&&t.parentNode&&t.parentNode.selectedIndex,null},set:function(e){var t=e.parentNode;t&&(t.selectedIndex,t.parentNode&&t.parentNode.selectedIndex)}}),ge.each(["tabIndex","readOnly","maxLength","cellSpacing","cellPadding","rowSpan","colSpan","useMap","frameBorder","contentEditable"],function(){ge.propFix[this.toLowerCase()]=this}),ge.fn.extend({addClass:function(e){var t,n,r,i,o,a,s,u=0;if(pe(e))return this.each(function(t){ge(this).addClass(e.call(this,t,G(this)))});if((t=X(e)).length)for(;n=this[u++];)if(i=G(n),r=1===n.nodeType&&" "+J(i)+" "){for(a=0;o=t[a++];)r.indexOf(" "+o+" ")<0&&(r+=o+" ");i!==(s=J(r))&&n.setAttribute("class",s)}return this},removeClass:function(e){var t,n,r,i,o,a,s,u=0;if(pe(e))return this.each(function(t){ge(this).removeClass(e.call(this,t,G(this)))});if(!arguments.length)return this.attr("class","");if((t=X(e)).length)for(;n=this[u++];)if(i=G(n),r=1===n.nodeType&&" "+J(i)+" "){for(a=0;o=t[a++];)for(;r.indexOf(" "+o+" ")>-1;)r=r.replace(" "+o+" "," ");i!==(s=J(r))&&n.setAttribute("class",s)}return this},toggleClass:function(e,t){var n=typeof e,r="string"===n||Array.isArray(e);return"boolean"==typeof t&&r?t?this.addClass(e):this.removeClass(e):pe(e)?this.each(function(n){ge(this).toggleClass(e.call(this,n,G(this),t),t)}):this.each(function(){var t,i,o,a;if(r)for(i=0,o=ge(this),a=X(e);t=a[i++];)o.hasClass(t)?o.removeClass(t):o.addClass(t);else void 0!==e&&"boolean"!==n||((t=G(this))&&Oe.set(this,"__className__",t),this.setAttribute&&this.setAttribute("class",t||!1===e?"":Oe.get(this,"__className__")||""))})},hasClass:function(e){var t,n,r=0;for(t=" "+e+" ";n=this[r++];)if(1===n.nodeType&&(" "+J(G(n))+" ").indexOf(t)>-1)return!0;return!1}});var Tt=/\r/g;ge.fn.extend({val:function(e){var t,n,r,i=this[0];return arguments.length?(r=pe(e),this.each(function(n){var i;1===this.nodeType&&(null==(i=r?e.call(this,n,ge(this).val()):e)?i="":"number"==typeof i?i+="":Array.isArray(i)&&(i=ge.map(i,function(e){return null==e?"":e+""})),(t=ge.valHooks[this.type]||ge.valHooks[this.nodeName.toLowerCase()])&&"set"in t&&void 0!==t.set(this,i,"value")||(this.value=i))})):i?(t=ge.valHooks[i.type]||ge.valHooks[i.nodeName.toLowerCase()])&&"get"in t&&void 0!==(n=t.get(i,"value"))?n:"string"==typeof(n=i.value)?n.replace(Tt,""):null==n?"":n:void 0}}),ge.extend({valHooks:{option:{get:function(e){var t=ge.find.attr(e,"value");return null!=t?t:J(ge.text(e))}},select:{get:function(e){var t,n,r,i=e.options,o=e.selectedIndex,a="select-one"===e.type,s=a?null:[],l=a?o+1:i.length;for(r=o<0?l:a?o:0;r-1)&&(n=!0);return n||(e.selectedIndex=-1),o}}}}),ge.each(["radio","checkbox"],function(){ge.valHooks[this]={set:function(e,t){if(Array.isArray(t))return e.checked=ge.inArray(ge(e).val(),t)>-1}},he.checkOn||(ge.valHooks[this].get=function(e){return null===e.getAttribute("value")?"on":e.value})}),he.focusin="onfocusin"in n;var Dt=/^(?:focusinfocus|focusoutblur)$/,Yt=function(e){e.stopPropagation()};ge.extend(ge.event,{trigger:function(e,t,r,i){var o,a,s,u,l,d,c,f,h=[r||ne],p=de.call(e,"type")?e.type:e,m=de.call(e,"namespace")?e.namespace.split("."):[];if(a=f=s=r=r||ne,3!==r.nodeType&&8!==r.nodeType&&!Dt.test(p+ge.event.triggered)&&(p.indexOf(".")>-1&&(p=(m=p.split(".")).shift(),m.sort()),l=p.indexOf(":")<0&&"on"+p,(e=e[ge.expando]?e:new ge.Event(p,"object"==typeof e&&e)).isTrigger=i?2:3,e.namespace=m.join("."),e.rnamespace=e.namespace?new RegExp("(^|\\.)"+m.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,e.result=void 0,e.target||(e.target=r),t=null==t?[e]:ge.makeArray(t,[e]),c=ge.event.special[p]||{},i||!c.trigger||!1!==c.trigger.apply(r,t))){if(!i&&!c.noBubble&&!me(r)){for(u=c.delegateType||p,Dt.test(u+p)||(a=a.parentNode);a;a=a.parentNode)h.push(a),s=a;s===(r.ownerDocument||ne)&&h.push(s.defaultView||s.parentWindow||n)}for(o=0;(a=h[o++])&&!e.isPropagationStopped();)f=a,e.type=o>1?u:c.bindType||p,(d=(Oe.get(a,"events")||{})[e.type]&&Oe.get(a,"handle"))&&d.apply(a,t),(d=l&&a[l])&&d.apply&&Ae(a)&&(e.result=d.apply(a,t),!1===e.result&&e.preventDefault());return e.type=p,i||e.isDefaultPrevented()||c._default&&!1!==c._default.apply(h.pop(),t)||!Ae(r)||l&&pe(r[p])&&!me(r)&&((s=r[l])&&(r[l]=null),ge.event.triggered=p,e.isPropagationStopped()&&f.addEventListener(p,Yt),r[p](),e.isPropagationStopped()&&f.removeEventListener(p,Yt),ge.event.triggered=void 0,s&&(r[l]=s)),e.result}},simulate:function(e,t,n){var r=ge.extend(new ge.Event,n,{type:e,isSimulated:!0});ge.event.trigger(r,null,t)}}),ge.fn.extend({trigger:function(e,t){return this.each(function(){ge.event.trigger(e,t,this)})},triggerHandler:function(e,t){var n=this[0];if(n)return ge.event.trigger(e,t,n,!0)}}),he.focusin||ge.each({focus:"focusin",blur:"focusout"},function(e,t){var n=function(e){ge.event.simulate(t,e.target,ge.event.fix(e))};ge.event.special[t]={setup:function(){var r=this.ownerDocument||this,i=Oe.access(r,t);i||r.addEventListener(e,n,!0),Oe.access(r,t,(i||0)+1)},teardown:function(){var r=this.ownerDocument||this,i=Oe.access(r,t)-1;i?Oe.access(r,t,i):(r.removeEventListener(e,n,!0),Oe.remove(r,t))}}});var St=n.location,Ct=Date.now(),jt=/\?/;ge.parseXML=function(e){var t;if(!e||"string"!=typeof e)return null;try{t=(new n.DOMParser).parseFromString(e,"text/xml")}catch(e){t=void 0}return t&&!t.getElementsByTagName("parsererror").length||ge.error("Invalid XML: "+e),t};var Et=/\[\]$/,Ht=/\r?\n/g,At=/^(?:submit|button|image|reset|file)$/i,Ot=/^(?:input|select|textarea|keygen)/i;ge.param=function(e,t){var n,r=[],i=function(e,t){var n=pe(t)?t():t;r[r.length]=encodeURIComponent(e)+"="+encodeURIComponent(null==n?"":n)};if(null==e)return"";if(Array.isArray(e)||e.jquery&&!ge.isPlainObject(e))ge.each(e,function(){i(this.name,this.value)});else for(n in e)K(n,e[n],t,i);return r.join("&")},ge.fn.extend({serialize:function(){return ge.param(this.serializeArray())},serializeArray:function(){return this.map(function(){var e=ge.prop(this,"elements");return e?ge.makeArray(e):this}).filter(function(){var e=this.type;return this.name&&!ge(this).is(":disabled")&&Ot.test(this.nodeName)&&!At.test(e)&&(this.checked||!Je.test(e))}).map(function(e,t){var n=ge(this).val();return null==n?null:Array.isArray(n)?ge.map(n,function(e){return{name:t.name,value:e.replace(Ht,"\r\n")}}):{name:t.name,value:n.replace(Ht,"\r\n")}}).get()}});var Pt=/%20/g,Nt=/#.*$/,It=/([?&])_=[^&]*/,Rt=/^(.*?):[ \t]*([^\r\n]*)$/gm,Wt=/^(?:GET|HEAD)$/,$t=/^\/\//,Ft={},zt={},qt="*/".concat("*"),Bt=ne.createElement("a");Bt.href=St.href,ge.extend({active:0,lastModified:{},etag:{},ajaxSettings:{url:St.href,type:"GET",isLocal:/^(?:about|app|app-storage|.+-extension|file|res|widget):$/.test(St.protocol),global:!0,processData:!0,async:!0,contentType:"application/x-www-form-urlencoded; charset=UTF-8",accepts:{"*":qt,text:"text/plain",html:"text/html",xml:"application/xml, text/xml",json:"application/json, text/javascript"},contents:{xml:/\bxml\b/,html:/\bhtml/,json:/\bjson\b/},responseFields:{xml:"responseXML",text:"responseText",json:"responseJSON"},converters:{"* text":String,"text html":!0,"text json":JSON.parse,"text xml":ge.parseXML},flatOptions:{url:!0,context:!0}},ajaxSetup:function(e,t){return t?ee(ee(e,ge.ajaxSettings),t):ee(ge.ajaxSettings,e)},ajaxPrefilter:Z(Ft),ajaxTransport:Z(zt),ajax:function(e,t){function r(e,t,r,s){var l,f,h,b,M,w=t;d||(d=!0,u&&n.clearTimeout(u),i=void 0,a=s||"",L.readyState=e>0?4:0,l=e>=200&&e<300||304===e,r&&(b=function(e,t,n){for(var r,i,o,a,s=e.contents,u=e.dataTypes;"*"===u[0];)u.shift(),void 0===r&&(r=e.mimeType||t.getResponseHeader("Content-Type"));if(r)for(i in s)if(s[i]&&s[i].test(r)){u.unshift(i);break}if(u[0]in n)o=u[0];else{for(i in n){if(!u[0]||e.converters[i+" "+u[0]]){o=i;break}a||(a=i)}o=o||a}if(o)return o!==u[0]&&u.unshift(o),n[o]}(p,L,r)),b=function(e,t,n,r){var i,o,a,s,u,l={},d=e.dataTypes.slice();if(d[1])for(a in e.converters)l[a.toLowerCase()]=e.converters[a];for(o=d.shift();o;)if(e.responseFields[o]&&(n[e.responseFields[o]]=t),!u&&r&&e.dataFilter&&(t=e.dataFilter(t,e.dataType)),u=o,o=d.shift())if("*"===o)o=u;else if("*"!==u&&u!==o){if(!(a=l[u+" "+o]||l["* "+o]))for(i in l)if((s=i.split(" "))[1]===o&&(a=l[u+" "+s[0]]||l["* "+s[0]])){!0===a?a=l[i]:!0!==l[i]&&(o=s[0],d.unshift(s[1]));break}if(!0!==a)if(a&&e.throws)t=a(t);else try{t=a(t)}catch(e){return{state:"parsererror",error:a?e:"No conversion from "+u+" to "+o}}}return{state:"success",data:t}}(p,b,L,l),l?(p.ifModified&&((M=L.getResponseHeader("Last-Modified"))&&(ge.lastModified[o]=M),(M=L.getResponseHeader("etag"))&&(ge.etag[o]=M)),204===e||"HEAD"===p.type?w="nocontent":304===e?w="notmodified":(w=b.state,f=b.data,l=!(h=b.error))):(h=w,!e&&w||(w="error",e<0&&(e=0))),L.status=e,L.statusText=(t||w)+"",l?g.resolveWith(m,[f,w,L]):g.rejectWith(m,[L,w,h]),L.statusCode(v),v=void 0,c&&_.trigger(l?"ajaxSuccess":"ajaxError",[L,p,l?f:h]),y.fireWith(m,[L,w]),c&&(_.trigger("ajaxComplete",[L,p]),--ge.active||ge.event.trigger("ajaxStop")))}"object"==typeof e&&(t=e,e=void 0),t=t||{};var i,o,a,s,u,l,d,c,f,h,p=ge.ajaxSetup({},t),m=p.context||p,_=p.context&&(m.nodeType||m.jquery)?ge(m):ge.event,g=ge.Deferred(),y=ge.Callbacks("once memory"),v=p.statusCode||{},b={},M={},w="canceled",L={readyState:0,getResponseHeader:function(e){var t;if(d){if(!s)for(s={};t=Rt.exec(a);)s[t[1].toLowerCase()+" "]=(s[t[1].toLowerCase()+" "]||[]).concat(t[2]);t=s[e.toLowerCase()+" "]}return null==t?null:t.join(", ")},getAllResponseHeaders:function(){return d?a:null},setRequestHeader:function(e,t){return null==d&&(e=M[e.toLowerCase()]=M[e.toLowerCase()]||e,b[e]=t),this},overrideMimeType:function(e){return null==d&&(p.mimeType=e),this},statusCode:function(e){var t;if(e)if(d)L.always(e[L.status]);else for(t in e)v[t]=[v[t],e[t]];return this},abort:function(e){var t=e||w;return i&&i.abort(t),r(0,t),this}};if(g.promise(L),p.url=((e||p.url||St.href)+"").replace($t,St.protocol+"//"),p.type=t.method||t.type||p.method||p.type,p.dataTypes=(p.dataType||"*").toLowerCase().match(Ye)||[""],null==p.crossDomain){l=ne.createElement("a");try{l.href=p.url,l.href=l.href,p.crossDomain=Bt.protocol+"//"+Bt.host!=l.protocol+"//"+l.host}catch(e){p.crossDomain=!0}}if(p.data&&p.processData&&"string"!=typeof p.data&&(p.data=ge.param(p.data,p.traditional)),Q(Ft,p,t,L),d)return L;for(f in(c=ge.event&&p.global)&&0==ge.active++&&ge.event.trigger("ajaxStart"),p.type=p.type.toUpperCase(),p.hasContent=!Wt.test(p.type),o=p.url.replace(Nt,""),p.hasContent?p.data&&p.processData&&0===(p.contentType||"").indexOf("application/x-www-form-urlencoded")&&(p.data=p.data.replace(Pt,"+")):(h=p.url.slice(o.length),p.data&&(p.processData||"string"==typeof p.data)&&(o+=(jt.test(o)?"&":"?")+p.data,delete p.data),!1===p.cache&&(o=o.replace(It,"$1"),h=(jt.test(o)?"&":"?")+"_="+Ct+++h),p.url=o+h),p.ifModified&&(ge.lastModified[o]&&L.setRequestHeader("If-Modified-Since",ge.lastModified[o]),ge.etag[o]&&L.setRequestHeader("If-None-Match",ge.etag[o])),(p.data&&p.hasContent&&!1!==p.contentType||t.contentType)&&L.setRequestHeader("Content-Type",p.contentType),L.setRequestHeader("Accept",p.dataTypes[0]&&p.accepts[p.dataTypes[0]]?p.accepts[p.dataTypes[0]]+("*"!==p.dataTypes[0]?", "+qt+"; q=0.01":""):p.accepts["*"]),p.headers)L.setRequestHeader(f,p.headers[f]);if(p.beforeSend&&(!1===p.beforeSend.call(m,L,p)||d))return L.abort();if(w="abort",y.add(p.complete),L.done(p.success),L.fail(p.error),i=Q(zt,p,t,L)){if(L.readyState=1,c&&_.trigger("ajaxSend",[L,p]),d)return L;p.async&&p.timeout>0&&(u=n.setTimeout(function(){L.abort("timeout")},p.timeout));try{d=!1,i.send(b,r)}catch(e){if(d)throw e;r(-1,e)}}else r(-1,"No Transport");return L},getJSON:function(e,t,n){return ge.get(e,t,n,"json")},getScript:function(e,t){return ge.get(e,void 0,t,"script")}}),ge.each(["get","post"],function(e,t){ge[t]=function(e,n,r,i){return pe(n)&&(i=i||r,r=n,n=void 0),ge.ajax(ge.extend({url:e,type:t,dataType:i,data:n,success:r},ge.isPlainObject(e)&&e))}}),ge._evalUrl=function(e,t){return ge.ajax({url:e,type:"GET",dataType:"script",cache:!0,async:!1,global:!1,converters:{"text script":function(){}},dataFilter:function(e){ge.globalEval(e,t)}})},ge.fn.extend({wrapAll:function(e){var t;return this[0]&&(pe(e)&&(e=e.call(this[0])),t=ge(e,this[0].ownerDocument).eq(0).clone(!0),this[0].parentNode&&t.insertBefore(this[0]),t.map(function(){for(var e=this;e.firstElementChild;)e=e.firstElementChild;return e}).append(this)),this},wrapInner:function(e){return pe(e)?this.each(function(t){ge(this).wrapInner(e.call(this,t))}):this.each(function(){var t=ge(this),n=t.contents();n.length?n.wrapAll(e):t.append(e)})},wrap:function(e){var t=pe(e);return this.each(function(n){ge(this).wrapAll(t?e.call(this,n):e)})},unwrap:function(e){return this.parent(e).not("body").each(function(){ge(this).replaceWith(this.childNodes)}),this}}),ge.expr.pseudos.hidden=function(e){return!ge.expr.pseudos.visible(e)},ge.expr.pseudos.visible=function(e){return!!(e.offsetWidth||e.offsetHeight||e.getClientRects().length)},ge.ajaxSettings.xhr=function(){try{return new n.XMLHttpRequest}catch(e){}};var Ut={0:200,1223:204},Vt=ge.ajaxSettings.xhr();he.cors=!!Vt&&"withCredentials"in Vt,he.ajax=Vt=!!Vt,ge.ajaxTransport(function(e){var t,r;if(he.cors||Vt&&!e.crossDomain)return{send:function(i,o){var a,s=e.xhr();if(s.open(e.type,e.url,e.async,e.username,e.password),e.xhrFields)for(a in e.xhrFields)s[a]=e.xhrFields[a];for(a in e.mimeType&&s.overrideMimeType&&s.overrideMimeType(e.mimeType),e.crossDomain||i["X-Requested-With"]||(i["X-Requested-With"]="XMLHttpRequest"),i)s.setRequestHeader(a,i[a]);t=function(e){return function(){t&&(t=r=s.onload=s.onerror=s.onabort=s.ontimeout=s.onreadystatechange=null,"abort"===e?s.abort():"error"===e?"number"!=typeof s.status?o(0,"error"):o(s.status,s.statusText):o(Ut[s.status]||s.status,s.statusText,"text"!==(s.responseType||"text")||"string"!=typeof s.responseText?{binary:s.response}:{text:s.responseText},s.getAllResponseHeaders()))}},s.onload=t(),r=s.onerror=s.ontimeout=t("error"),void 0!==s.onabort?s.onabort=r:s.onreadystatechange=function(){4===s.readyState&&n.setTimeout(function(){t&&r()})},t=t("abort");try{s.send(e.hasContent&&e.data||null)}catch(e){if(t)throw e}},abort:function(){t&&t()}}}),ge.ajaxPrefilter(function(e){e.crossDomain&&(e.contents.script=!1)}),ge.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/\b(?:java|ecma)script\b/},converters:{"text script":function(e){return ge.globalEval(e),e}}}),ge.ajaxPrefilter("script",function(e){void 0===e.cache&&(e.cache=!1),e.crossDomain&&(e.type="GET")}),ge.ajaxTransport("script",function(e){var t,n;if(e.crossDomain||e.scriptAttrs)return{send:function(r,i){t=ge(" - - + + @@ -45,5 +45,5 @@
@yield('js') - + diff --git a/resources/views/layout/dashboard.blade.php b/resources/views/layout/dashboard.blade.php index aff29c07..8af82763 100644 --- a/resources/views/layout/dashboard.blade.php +++ b/resources/views/layout/dashboard.blade.php @@ -31,13 +31,13 @@ @if($enableExternalDependencies) @endif - + @yield('css') @include('partials.crowdin') - - + + @@ -61,5 +61,5 @@
@yield('js') - + diff --git a/resources/views/layout/master.blade.php b/resources/views/layout/master.blade.php index 51ed532a..6c99e225 100644 --- a/resources/views/layout/master.blade.php +++ b/resources/views/layout/master.blade.php @@ -48,7 +48,7 @@ @if($enableExternalDependencies) @endif - + @include('partials.stylesheet') @@ -74,8 +74,8 @@ Global.locale = '{{ $appLocale }}'; - - + + @yield('outer-content') @@ -88,5 +88,5 @@ @yield('bottom-content') - + From 67b43ed34d2b83cf36f2f3055cbfc87961de3c53 Mon Sep 17 00:00:00 2001 From: Anthony Bocci Date: Thu, 13 Jun 2019 22:51:24 +0200 Subject: [PATCH 32/54] Add a missing "asset" call --- resources/views/layout/master.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/views/layout/master.blade.php b/resources/views/layout/master.blade.php index 6c99e225..0c91b660 100644 --- a/resources/views/layout/master.blade.php +++ b/resources/views/layout/master.blade.php @@ -16,7 +16,7 @@ - + From ced1088ae0f5ca9d8580fb55c7680e29de01021d Mon Sep 17 00:00:00 2001 From: Cachet Bot <40326150+CachetBot@users.noreply.github.com> Date: Thu, 20 Jun 2019 15:20:29 +0100 Subject: [PATCH 33/54] New translations forms.php (Czech) --- resources/lang/cs-CZ/forms.php | 324 ++++++++++++++++----------------- 1 file changed, 162 insertions(+), 162 deletions(-) diff --git a/resources/lang/cs-CZ/forms.php b/resources/lang/cs-CZ/forms.php index 47a1a3e7..8fc5b709 100644 --- a/resources/lang/cs-CZ/forms.php +++ b/resources/lang/cs-CZ/forms.php @@ -13,134 +13,134 @@ return [ // Setup form fields 'setup' => [ - 'email' => 'Email', - 'username' => 'Username', - 'password' => 'Password', - 'site_name' => 'Site Name', - 'site_domain' => 'Site Domain', - 'site_timezone' => 'Select your timezone', - 'site_locale' => 'Select your language', - 'enable_google2fa' => 'Enable Google Two Factor Authentication', - 'cache_driver' => 'Cache Driver', - 'queue_driver' => 'Queue Driver', - 'session_driver' => 'Session Driver', - 'mail_driver' => 'Mail Driver', - 'mail_host' => 'Mail Host', - 'mail_address' => 'Mail From Address', - 'mail_username' => 'Mail Username', - 'mail_password' => 'Mail Password', + 'email' => 'E-mail', + 'username' => 'Uživatelské jméno', + 'password' => 'Heslo', + 'site_name' => 'Název webu', + 'site_domain' => 'Doména webu', + 'site_timezone' => 'Vyberte vaše časové pásmo', + 'site_locale' => 'Vyberte svůj jazyk', + 'enable_google2fa' => 'Povolit dvoufaktorové ověřování Google', + 'cache_driver' => 'Ovladač cache', + 'queue_driver' => 'Řadič fronty', + 'session_driver' => 'Ovladač sezení', + 'mail_driver' => 'Ovladač pro e-mail', + 'mail_host' => 'Host pro Mail', + 'mail_address' => 'Adresa Mailu', + 'mail_username' => 'Uživatelské jméno pro Mail účet', + 'mail_password' => 'Heslo pro Mail účet', ], // Login form fields 'login' => [ - 'login' => 'Username or Email', - 'email' => 'Email', - 'password' => 'Password', - '2fauth' => 'Authentication Code', - 'invalid' => 'Invalid username or password', - 'invalid-token' => 'Invalid token', - 'cookies' => 'You must enable cookies to login.', - 'rate-limit' => 'Rate limit exceeded.', - 'remember_me' => 'Remember me', + 'login' => 'Uživatelské jméno nebo e-mail', + 'email' => 'E-mail', + 'password' => 'Heslo', + '2fauth' => 'Ověřovací kód', + 'invalid' => 'Nesprávné uživatelské jméno nebo heslo', + 'invalid-token' => 'Neplatný token', + 'cookies' => 'Pro přihlášení je třeba povolit soubory cookie.', + 'rate-limit' => 'Překročen limit.', + 'remember_me' => 'Zůstat přihlášený', ], // Incidents form fields 'incidents' => [ - 'name' => 'Name', - 'status' => 'Status', - 'component' => 'Component', - 'component_status' => 'Component Status', - 'message' => 'Message', - 'message-help' => 'You may also use Markdown.', - 'occurred_at' => 'When did this incident occur?', - 'notify_subscribers' => 'Notify subscribers?', - 'notify_disabled' => 'Due to scheduled maintenance, notifications about this incident or its components will be suppressed.', - 'visibility' => 'Incident Visibility', - 'stick_status' => 'Stick Incident', - 'stickied' => 'Stickied', - 'not_stickied' => 'Not Stickied', - 'public' => 'Viewable by public', - 'logged_in_only' => 'Only visible to logged in users', + 'name' => 'Jméno', + 'status' => 'Stav', + 'component' => 'Komponenta', + 'component_status' => 'Stavy služeb', + 'message' => 'Zpráva', + 'message-help' => 'Můžete také použít Markdown.', + 'occurred_at' => 'Kdy došlo k incidentu?', + 'notify_subscribers' => 'Oznámit odběratelům?', + 'notify_disabled' => 'Z důvodu plánované údržby budou oznámení o tomto incidentu nebo jeho součástech potlačena.', + 'visibility' => 'Viditelnost incidentu', + 'stick_status' => 'Připnout událost', + 'stickied' => 'Připnuté', + 'not_stickied' => 'Nepřipnuté', + 'public' => 'Viditelné veřejnosti', + 'logged_in_only' => 'Viditelné pouze pro přihlášené uživatele', 'templates' => [ - 'name' => 'Name', - 'template' => 'Template', - 'twig' => 'Incident Templates can make use of the Twig templating language.', + 'name' => 'Jméno', + 'template' => 'Šablona', + 'twig' => 'Šablony pro incidenty mohou používat šablonovací jazyk Twing.', ], ], 'schedules' => [ - 'name' => 'Name', - 'status' => 'Status', - 'message' => 'Message', - 'message-help' => 'You may also use Markdown.', - 'scheduled_at' => 'When is this maintenance scheduled for?', - 'completed_at' => 'When did this maintenance complete?', + 'name' => 'Jméno', + 'status' => 'Stav', + 'message' => 'Zpráva', + 'message-help' => 'Můžete také použít Markdown.', + 'scheduled_at' => 'Na kdy je naplánovaná údržba?', + 'completed_at' => 'Kdy bude údržba hotová?', 'templates' => [ - 'name' => 'Name', - 'template' => 'Template', - 'twig' => 'Incident Templates can make use of the Twig templating language.', + 'name' => 'Jméno', + 'template' => 'Šablona', + 'twig' => 'Šablony pro incidenty mohou používat šablonovací jazyk Twing.', ], ], // Components form fields 'components' => [ - 'name' => 'Name', - 'status' => 'Status', - 'group' => 'Group', - 'description' => 'Description', - 'link' => 'Link', - 'tags' => 'Tags', - 'tags-help' => 'Comma separated.', - 'enabled' => 'Component enabled?', + 'name' => 'Jméno', + 'status' => 'Stav', + 'group' => 'Skupina', + 'description' => 'Popis', + 'link' => 'Odkaz', + 'tags' => 'Štítky', + 'tags-help' => 'Oddělené čárkou.', + 'enabled' => 'Je služba povolena?', 'groups' => [ - 'name' => 'Name', - 'collapsing' => 'Expand/Collapse options', - 'visible' => 'Always expanded', - 'collapsed' => 'Collapse the group by default', - 'collapsed_incident' => 'Collapse the group, but expand if there are issues', - 'visibility' => 'Visibility', - 'visibility_public' => 'Visible to public', - 'visibility_authenticated' => 'Visible only to logged in users', + 'name' => 'Jméno', + 'collapsing' => 'Rozbalit nebo sbalit možnosti', + 'visible' => 'Vždy rozbalené', + 'collapsed' => 'Sbalit skupinu ve výchozím nastavení', + 'collapsed_incident' => 'Sbalit skupinu, ale rozšířit, pokud existují problémy', + 'visibility' => 'Viditelnost', + 'visibility_public' => 'Viditelné pro veřejnost', + 'visibility_authenticated' => 'Viditelné pouze pro přihlášené uživatele', ], ], // Action form fields 'actions' => [ - 'name' => 'Name', - 'description' => 'Description', - 'start_at' => 'Schedule start time', - 'timezone' => 'Timezone', - 'schedule_frequency' => 'Schedule frequency (in seconds)', - 'completion_latency' => 'Completion latency (in seconds)', - 'group' => 'Group', - 'active' => 'Active?', + 'name' => 'Jméno', + 'description' => 'Popis', + 'start_at' => 'Naplánovat čas spuštění', + 'timezone' => 'Časová zóna', + 'schedule_frequency' => 'Naplánovat frekvenci (ve vteřinách)', + 'completion_latency' => 'Prodleva dokončení (ve vteřinách)', + 'group' => 'Skupina', + 'active' => 'Aktivní?', 'groups' => [ - 'name' => 'Group Name', + 'name' => 'Název skupiny', ], ], // Metric form fields 'metrics' => [ - 'name' => 'Name', - 'suffix' => 'Suffix', - 'description' => 'Description', - 'description-help' => 'You may also use Markdown.', - 'display-chart' => 'Display chart on status page?', - 'default-value' => 'Default value', - 'calc_type' => 'Calculation of metrics', - 'type_sum' => 'Sum', - 'type_avg' => 'Average', - 'places' => 'Decimal places', - 'default_view' => 'Default view', - 'threshold' => 'How many minutes of threshold between metric points?', - 'visibility' => 'Visibility', - 'visibility_authenticated' => 'Visible to authenticated users', - 'visibility_public' => 'Visible to everybody', - 'visibility_hidden' => 'Always hidden', + 'name' => 'Jméno', + 'suffix' => 'Přípona', + 'description' => 'Popis', + 'description-help' => 'Můžete také použít Markdown.', + 'display-chart' => 'Zobrazovat graf na stavové stránce?', + 'default-value' => 'Výchozí hodnota', + 'calc_type' => 'Výpočet metrik', + 'type_sum' => 'Celkem', + 'type_avg' => 'Průměr', + 'places' => 'Počet desetinných míst', + 'default_view' => 'Výchozí zobrazení', + 'threshold' => 'Jak často se mají snímat metrické body?', + 'visibility' => 'Viditelnost', + 'visibility_authenticated' => 'Viditelné přihlášeným uživatelům', + 'visibility_public' => 'Viditelný všem', + 'visibility_hidden' => 'Vždy skrýt', 'points' => [ - 'value' => 'Value', + 'value' => 'Hodnota', ], ], @@ -148,101 +148,101 @@ return [ 'settings' => [ // Application setup 'app-setup' => [ - 'site-name' => 'Site Name', - 'site-url' => 'Site URL', - 'display-graphs' => 'Display graphs on status page?', - 'about-this-page' => 'About this page', - 'days-of-incidents' => 'How many days of incidents to show?', - 'time_before_refresh' => 'Status page refresh rate (in seconds)', - 'major_outage_rate' => 'Major outage threshold (in %)', - '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?', - 'suppress_notifications_in_maintenance' => 'Suppress notifications when incident occurs during maintenance period?', - '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', - 'only_disrupted_days' => 'Only show days containing incidents in the timeline?', + 'site-name' => 'Název webu', + 'site-url' => 'URL adresa webu', + 'display-graphs' => 'Zobrazit grafy na stavové stránce?', + 'about-this-page' => 'O této stránce', + 'days-of-incidents' => 'Kolik dní incidentů zobrazovat?', + 'time_before_refresh' => 'Obnovovací frekvence status stránky (v sekundách)', + 'major_outage_rate' => 'Hlavní doba výpadků (v %)', + 'banner' => 'Obrázek banneru', + 'banner-help' => "Doručuje se nenahrávat soubory větší než 930 pixelů na šířku", + 'subscribers' => 'Umožnit lidem, aby se přihlašovali k odběru e-mailových upozornění?', + 'suppress_notifications_in_maintenance' => 'Potlačit oznámení dojde-li k události během během času údržby?', + 'skip_subscriber_verification' => 'Přestat ověřovat uživatele? (Pozor na spammery)', + 'automatic_localization' => 'Automaticky lokalizovat stránku do jazyka návštěvníka?', + 'enable_external_dependencies' => 'Povolit závislosti třetích stran (Google písma, Trackery, atd...)', + 'show_timezone' => 'Zobrazit časové pásmo, ve které je zobrazena stavová stránka', + 'only_disrupted_days' => 'Zobrazit na časové ose pouze dny, kdy došlo k incidentu?', ], 'analytics' => [ - 'analytics_google' => 'Google Analytics code', - 'analytics_gosquared' => 'GoSquared Analytics code', - 'analytics_piwik_url' => 'URL of your Piwik instance (without http(s)://)', - 'analytics_piwik_siteid' => 'Piwik\'s site id', + 'analytics_google' => 'Kód pro Google Analytics', + 'analytics_gosquared' => 'Kód pro GoSquared Analytics', + 'analytics_piwik_url' => 'URL tvojí instance Piwik (bez http(s)://)', + 'analytics_piwik_siteid' => 'Id webu Piwik', ], 'localization' => [ - 'site-timezone' => 'Site timezone', - 'site-locale' => 'Site language', - 'date-format' => 'Date format', - 'incident-date-format' => 'Incident timestamp format', + 'site-timezone' => 'Časové pásmo webu', + 'site-locale' => 'Jazyk webu', + 'date-format' => 'Formát datumu', + 'incident-date-format' => 'Formát času pro incident', ], 'security' => [ - 'allowed-domains' => 'Allowed domains', - 'allowed-domains-help' => 'Comma separated. The domain set above is automatically allowed by default.', - 'always-authenticate' => 'Always authenticate', - 'always-authenticate-help' => 'Require login to view any Cachet page', + 'allowed-domains' => 'Povolené domény', + 'allowed-domains-help' => 'Oddělené čárkami. Výše uvedené domény jsou ve výchozím nastavení automaticky povoleny.', + 'always-authenticate' => 'Vždy ověřovat', + 'always-authenticate-help' => 'Požadovat přihlášení k zobrazení jakékoli Cachet stránky', ], 'stylesheet' => [ - 'custom-css' => 'Custom Stylesheet', + 'custom-css' => 'Vlastní šablona stylů', ], 'theme' => [ - 'background-color' => 'Background color', - 'background-fills' => 'Background fills (components, incidents, footer)', - 'banner-background-color' => 'Banner background color', - 'banner-padding' => 'Banner padding', - 'fullwidth-banner' => 'Enable full width banner?', - 'text-color' => 'Text color', - 'dashboard-login' => 'Show dashboard button in the footer?', - 'reds' => 'Red (used for errors)', - 'blues' => 'Blue (used for information)', - 'greens' => 'Green (used for success)', - 'yellows' => 'Yellow (used for alerts)', - 'oranges' => 'Orange (used for notices)', - 'metrics' => 'Metrics fill', - 'links' => 'Links', + 'background-color' => 'Barva pozadí', + 'background-fills' => 'Pozadí výplně (komponenty, incidenty, zápatí)', + 'banner-background-color' => 'Barva pozadí banneru', + 'banner-padding' => 'Odsazení banneru', + 'fullwidth-banner' => 'Povolit banner přes celou obrazovku?', + 'text-color' => 'Barva textu', + 'dashboard-login' => 'Zobrazit tlačítko Řídící panel v zápatí?', + 'reds' => 'Červená (používané pro chyby)', + 'blues' => 'Modrá (používané pro informace)', + 'greens' => 'Zelená (používá se pro vyřešení problémů)', + 'yellows' => 'Žlutá (používá se pro upozornění)', + 'oranges' => 'Oranžová (slouží k oznámení)', + 'metrics' => 'Vyplnění metrik', + 'links' => 'Odkazy', ], ], 'user' => [ - 'username' => 'Username', - 'email' => 'Email', - 'password' => 'Password', + 'username' => 'Uživatelské jméno', + 'email' => 'E-mail', + 'password' => 'Heslo', 'api-token' => 'API Token', - 'api-token-help' => 'Regenerating your API token will prevent existing applications from accessing Cachet.', - 'gravatar' => 'Change your profile picture at Gravatar.', - 'user_level' => 'User Level', + 'api-token-help' => 'Přegenerování vašeho API tokenu zabrání současným aplikacím přistupovat ke Cachet.', + 'gravatar' => 'Profilový obrázek si změn na Gravatar.', + 'user_level' => 'Úroveň uživatele', 'levels' => [ - 'admin' => 'Admin', - 'user' => 'User', + 'admin' => 'Správce', + 'user' => 'Uživatel', ], '2fa' => [ - 'help' => 'Enabling two factor authentication increases security of your account. You will need to download Google Authenticator or a similar app on to your mobile device. When you login you will be asked to provide a token generated by the app.', + 'help' => 'Zapnutí dvoufaktorového ověřování zvýší zabezpečení vašeho účtu. Budete muset stáhnout Google Authenticator nebo podobnou aplikaci pro mobilní zařízení. Po přihlášení budete vyzváni k zadání tokenu vygenerovaného aplikací.', ], 'team' => [ - 'description' => 'Invite your team members by entering their email addresses here.', - 'email' => 'Your Team Members Email Address', + 'description' => 'Pozvi uživatele do týmu zadáním emailové adresy.', + 'email' => 'Email #:id', ], ], 'general' => [ - 'timezone' => 'Select Timezone', + 'timezone' => 'Vybrat časové pásmo', ], // Buttons - 'add' => 'Add', - 'save' => 'Save', - 'update' => 'Update', - 'create' => 'Create', - 'edit' => 'Edit', - 'delete' => 'Delete', - 'submit' => 'Submit', - 'cancel' => 'Cancel', - 'remove' => 'Remove', - 'invite' => 'Invite', - 'signup' => 'Sign Up', - 'manage_updates' => 'Manage Updates', + 'add' => 'Přidat', + 'save' => 'Uložit', + 'update' => 'Aktualizovat', + 'create' => 'Vytvořit', + 'edit' => 'Upravit', + 'delete' => 'Smazat', + 'submit' => 'Potvrdit', + 'cancel' => 'Zrušit', + 'remove' => 'Smazat', + 'invite' => 'Pozvat', + 'signup' => 'Registrovat se', + 'manage_updates' => 'Správa aktualizací', // Other - 'optional' => '* Optional', + 'optional' => '* Volitelné', ]; From edfc16daf3cae1d348a9148d3761c161be693807 Mon Sep 17 00:00:00 2001 From: Cachet Bot <40326150+CachetBot@users.noreply.github.com> Date: Thu, 20 Jun 2019 15:20:30 +0100 Subject: [PATCH 34/54] New translations validation.php (Czech) --- resources/lang/cs-CZ/validation.php | 64 ++++++++++++++--------------- 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/resources/lang/cs-CZ/validation.php b/resources/lang/cs-CZ/validation.php index 7d196d98..cbe58ca3 100644 --- a/resources/lang/cs-CZ/validation.php +++ b/resources/lang/cs-CZ/validation.php @@ -22,72 +22,72 @@ return [ | */ - 'accepted' => 'The :attribute must be accepted.', - 'active_url' => 'The :attribute is not a valid URL.', - 'after' => 'The :attribute must be a date after :date.', - 'alpha' => 'The :attribute may only contain letters.', - 'alpha_dash' => 'The :attribute may only contain letters, numbers, and dashes.', - 'alpha_num' => 'The :attribute may only contain letters and numbers.', - 'array' => 'The :attribute must be an array.', - 'before' => 'The :attribute must be a date before :date.', + 'accepted' => 'Je potřeba potvrdit :attribute.', + 'active_url' => ':attribute není platná adresa URL.', + 'after' => ':attribute musí být datum po :date.', + 'alpha' => ':attribute může obsahovat pouze písmena.', + 'alpha_dash' => ':attribute může obsahovat pouze písmena, čísla a pomlčky.', + 'alpha_num' => ':attribute může obsahovat pouze písmena a čísla.', + 'array' => ':attribute musí být textové pole.', + 'before' => ':attribute musí být datum před :date.', 'between' => [ - 'numeric' => 'The :attribute must be between :min and :max.', - 'file' => 'The :attribute must be between :min and :max kilobytes.', + 'numeric' => ':attribute musí mít hodnou mezi :min a :max.', + 'file' => ':attribute musí mít velikost v rozmezí :min až :max kilobytů.', 'string' => 'The :attribute must be between :min and :max characters.', - 'array' => 'The :attribute must have between :min and :max items.', + 'array' => ':attribute musí mít mezi :min a :max položkami.', ], - 'boolean' => 'The :attribute field must be true or false.', - 'confirmed' => 'The :attribute confirmation does not match.', - 'date' => 'The :attribute is not a valid date.', - 'date_format' => 'The :attribute does not match the format :format.', + 'boolean' => ':attribute musí mít hodnotu pravda nebo nepravda.', + 'confirmed' => 'Potvrzení :attribute se neshoduje.', + 'date' => ':attribute není platné datum.', + 'date_format' => ':attribute se neshoduje se správným formátem :format.', 'different' => 'The :attribute and :other must be different.', 'digits' => 'The :attribute must be :digits digits.', 'digits_between' => 'The :attribute must be between :min and :max digits.', 'email' => 'The :attribute must be a valid email address.', 'exists' => 'The selected :attribute is invalid.', - 'distinct' => 'The :attribute field has a duplicate value.', + 'distinct' => ':attribute má duplicitní hodnotu.', 'filled' => 'The :attribute field is required.', - 'image' => 'The :attribute must be an image.', + 'image' => ':attribute musí být obrázek.', 'in' => 'The selected :attribute is invalid.', - 'in_array' => 'The :attribute field does not exist in :other.', + 'in_array' => ':attribute není v :other.', 'integer' => 'The :attribute must be an integer.', 'ip' => 'The :attribute must be a valid IP address.', - 'json' => 'The :attribute must be a valid JSON string.', + 'json' => ': attribute musí být ve formátu JSON.', 'max' => [ 'numeric' => 'The :attribute may not be greater than :max.', 'file' => 'The :attribute may not be greater than :max kilobytes.', 'string' => 'The :attribute may not be greater than :max characters.', - 'array' => 'The :attribute may not have more than :max items.', + 'array' => 'Atribut nesmí mít více než :max položek.', ], 'mimes' => 'The :attribute must be a file of type: :values.', 'min' => [ 'numeric' => 'The :attribute must be at least :min.', - 'file' => 'The :attribute must be at least :min kilobytes.', + 'file' => 'Atribut musí mít alespoň :min kB.', 'string' => 'The :attribute must be at least :min characters.', 'array' => 'The :attribute must have at least :min items.', ], 'not_in' => 'The selected :attribute is invalid.', 'numeric' => 'The :attribute must be a number.', - 'present' => 'The :attribute field must be present.', - 'regex' => 'The :attribute format is invalid.', + 'present' => 'Pole :attribute je vyžadováno.', + 'regex' => 'Formát :attribute je neplatný.', 'required' => 'The :attribute field is required.', 'required_if' => 'The :attribute field is required when :other is :value.', - 'required_unless' => 'The :attribute field is required unless :other is in :values.', - 'required_with' => 'The :attribute field is required when :values is present.', - 'required_with_all' => 'The :attribute field is required when :values is present.', + 'required_unless' => 'Pole :attribute je požadováno, pokud :other není v :value.', + 'required_with' => 'Pole :attribute je požadováno, když je zadané :values.', + 'required_with_all' => 'Pole :attribute je požadováno, když je zadané :values.', 'required_without' => 'The :attribute field is required when :values is not present.', 'required_without_all' => 'The :attribute field is required when none of :values are present.', 'same' => 'The :attribute and :other must match.', 'size' => [ 'numeric' => 'The :attribute must be :size.', - 'file' => 'The :attribute must be :size kilobytes.', - 'string' => 'The :attribute must be :size characters.', + 'file' => 'Atribut musí mít :size kB.', + 'string' => 'Atribut musí mít :size znaků.', 'array' => 'The :attribute must contain :size items.', ], 'string' => 'The :attribute must be a string.', - 'timezone' => 'The :attribute must be a valid zone.', - 'unique' => 'The :attribute has already been taken.', - 'url' => 'The :attribute format is invalid.', + 'timezone' => ':attribute musí být platná zóna.', + 'unique' => ':attribute byl už použit.', + 'url' => 'Formát :attribute je neplatný.', /* |-------------------------------------------------------------------------- @@ -102,7 +102,7 @@ return [ 'custom' => [ 'attribute-name' => [ - 'rule-name' => 'custom-message', + 'rule-name' => 'vlastní zpráva', ], ], From 4f205e03544dcea6a309128bd59ad08c02453838 Mon Sep 17 00:00:00 2001 From: James Brooks Date: Sun, 23 Jun 2019 07:08:31 +0000 Subject: [PATCH 35/54] Apply fixes from StyleCI --- resources/lang/cs-CZ/forms.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/lang/cs-CZ/forms.php b/resources/lang/cs-CZ/forms.php index 8fc5b709..9f2a13a8 100644 --- a/resources/lang/cs-CZ/forms.php +++ b/resources/lang/cs-CZ/forms.php @@ -156,7 +156,7 @@ return [ 'time_before_refresh' => 'Obnovovací frekvence status stránky (v sekundách)', 'major_outage_rate' => 'Hlavní doba výpadků (v %)', 'banner' => 'Obrázek banneru', - 'banner-help' => "Doručuje se nenahrávat soubory větší než 930 pixelů na šířku", + 'banner-help' => 'Doručuje se nenahrávat soubory větší než 930 pixelů na šířku', 'subscribers' => 'Umožnit lidem, aby se přihlašovali k odběru e-mailových upozornění?', 'suppress_notifications_in_maintenance' => 'Potlačit oznámení dojde-li k události během během času údržby?', 'skip_subscriber_verification' => 'Přestat ověřovat uživatele? (Pozor na spammery)', From a3bbeb541eac73131a6f7fb19fb330e3c32f8a20 Mon Sep 17 00:00:00 2001 From: James Brooks Date: Sun, 23 Jun 2019 08:29:24 +0100 Subject: [PATCH 36/54] Fix use of env. Closes #3651 --- app/Http/Middleware/TrustProxies.php | 5 ++++- config/trustedproxy.php | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/app/Http/Middleware/TrustProxies.php b/app/Http/Middleware/TrustProxies.php index 9fcdfb79..83a86c5e 100644 --- a/app/Http/Middleware/TrustProxies.php +++ b/app/Http/Middleware/TrustProxies.php @@ -13,6 +13,7 @@ namespace CachetHQ\Cachet\Http\Middleware; use Fideloper\Proxy\TrustProxies as Middleware; use Illuminate\Http\Request; +use Illuminate\Support\Facades\Config; /** * This is the trust proxies middleware class. @@ -42,6 +43,8 @@ class TrustProxies extends Middleware */ public function __construct() { - $this->proxies = empty(env('TRUSTED_PROXIES')) ? '*' : explode(',', trim(env('TRUSTED_PROXIES'))); + $proxies = Config::get('trustedproxies.proxies'); + + $this->proxies = empty($proxies) ? '*' : explode(',', trim($proxies)); } } diff --git a/config/trustedproxy.php b/config/trustedproxy.php index c8cfc7c0..b815629b 100644 --- a/config/trustedproxy.php +++ b/config/trustedproxy.php @@ -24,7 +24,7 @@ return [ * of your proxy (e.g. if using ELB or similar). * */ - 'proxies' => null, // [,], '*' + 'proxies' => env('TRUSTED_PROXIES'), // [,], '*' /* * To trust one or more specific proxies that connect From 2efbaebe631601cd7d5b5bd96149b29222e1c65b Mon Sep 17 00:00:00 2001 From: James Brooks Date: Sun, 23 Jun 2019 08:35:55 +0100 Subject: [PATCH 37/54] Fix validation of metric thresholds. Closes #3549 --- app/Http/Controllers/Dashboard/MetricController.php | 6 ++---- app/Models/Metric.php | 8 -------- 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/app/Http/Controllers/Dashboard/MetricController.php b/app/Http/Controllers/Dashboard/MetricController.php index 56a4f6e9..1a0b601c 100644 --- a/app/Http/Controllers/Dashboard/MetricController.php +++ b/app/Http/Controllers/Dashboard/MetricController.php @@ -45,8 +45,7 @@ class MetricController extends Controller public function showAddMetric() { return View::make('dashboard.metrics.add') - ->withPageTitle(trans('dashboard.metrics.add.title').' - '.trans('dashboard.dashboard')) - ->withAcceptableThresholds(Metric::ACCEPTABLE_THRESHOLDS); + ->withPageTitle(trans('dashboard.metrics.add.title').' - '.trans('dashboard.dashboard')); } /** @@ -132,8 +131,7 @@ class MetricController extends Controller { return View::make('dashboard.metrics.edit') ->withPageTitle(trans('dashboard.metrics.edit.title').' - '.trans('dashboard.dashboard')) - ->withMetric($metric) - ->withAcceptableThresholds(Metric::ACCEPTABLE_THRESHOLDS); + ->withMetric($metric); } /** diff --git a/app/Models/Metric.php b/app/Models/Metric.php index 8b5bc2d6..8f1e98df 100644 --- a/app/Models/Metric.php +++ b/app/Models/Metric.php @@ -62,13 +62,6 @@ class Metric extends Model implements HasPresenter */ const VISIBLE_HIDDEN = 2; - /** - * Array of acceptable threshold minutes. - * - * @var int[] - */ - const ACCEPTABLE_THRESHOLDS = [1, 2, 3, 4, 5, 6, 10, 12, 15, 20, 30, 60]; - /** * The model's attributes. * @@ -134,7 +127,6 @@ class Metric extends Model implements HasPresenter 'default_value' => 'required|numeric', 'places' => 'required|numeric|between:0,4', 'default_view' => 'required|numeric|between:0,3', - 'threshold' => 'required|numeric|between:0,10', 'visible' => 'required|numeric|between:0,2', ]; From be26449a42bcb25363efbcb1acb5da8993112a0c Mon Sep 17 00:00:00 2001 From: James Brooks Date: Sun, 23 Jun 2019 08:04:32 +0000 Subject: [PATCH 38/54] Apply fixes from StyleCI --- app/Http/Kernel.php | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/app/Http/Kernel.php b/app/Http/Kernel.php index d63f80cb..aafdf0c6 100644 --- a/app/Http/Kernel.php +++ b/app/Http/Kernel.php @@ -46,18 +46,18 @@ class Kernel extends HttpKernel * @var array */ protected $routeMiddleware = [ - 'admin' => Admin::class, - 'auth.api' => ApiAuthentication::class, + 'admin' => Admin::class, + 'auth.api' => ApiAuthentication::class, 'auth.remoteuser' => RemoteUserAuthenticate::class, - 'auth' => Authenticate::class, - 'cache' => CacheControl::class, - 'can' => Authorize::class, - 'cors' => HandleCors::class, - 'guest' => RedirectIfAuthenticated::class, - 'localize' => Localize::class, - 'ready' => ReadyForUse::class, - 'setup' => SetupAlreadyCompleted::class, - 'subscribers' => SubscribersConfigured::class, - 'throttle' => Throttler::class, + 'auth' => Authenticate::class, + 'cache' => CacheControl::class, + 'can' => Authorize::class, + 'cors' => HandleCors::class, + 'guest' => RedirectIfAuthenticated::class, + 'localize' => Localize::class, + 'ready' => ReadyForUse::class, + 'setup' => SetupAlreadyCompleted::class, + 'subscribers' => SubscribersConfigured::class, + 'throttle' => Throttler::class, ]; } From 8f91f6d92f536745e09ecad36c05cbbf0f992185 Mon Sep 17 00:00:00 2001 From: James Brooks Date: Sun, 23 Jun 2019 16:08:03 +0100 Subject: [PATCH 39/54] Remove Laravolt dependency. Closes #3376 --- app/Models/User.php | 14 +- app/Presenters/UserPresenter.php | 51 --- composer.json | 1 - composer.lock | 348 ++++-------------- config/app.php | 1 - .../dashboard/partials/sidebar.blade.php | 5 +- .../views/dashboard/team/index.blade.php | 13 +- 7 files changed, 89 insertions(+), 344 deletions(-) delete mode 100644 app/Presenters/UserPresenter.php diff --git a/app/Models/User.php b/app/Models/User.php index 219a5218..0422082b 100644 --- a/app/Models/User.php +++ b/app/Models/User.php @@ -12,21 +12,19 @@ namespace CachetHQ\Cachet\Models; use AltThree\Validator\ValidatingTrait; -use CachetHQ\Cachet\Presenters\UserPresenter; use Illuminate\Database\Eloquent\Builder; use Illuminate\Database\Eloquent\Model; use Illuminate\Foundation\Auth\User as Authenticatable; use Illuminate\Notifications\Notifiable; use Illuminate\Support\Facades\Hash; use Illuminate\Support\Str; -use McCool\LaravelAutoPresenter\HasPresenter; /** * This is the user model. * * @author James Brooks */ -class User extends Authenticatable implements HasPresenter +class User extends Authenticatable { use Notifiable, ValidatingTrait; @@ -211,14 +209,4 @@ class User extends Authenticatable implements HasPresenter { return trim($this->google_2fa_secret) !== ''; } - - /** - * Get the presenter class. - * - * @return string - */ - public function getPresenterClass() - { - return UserPresenter::class; - } } diff --git a/app/Presenters/UserPresenter.php b/app/Presenters/UserPresenter.php deleted file mode 100644 index b14022d7..00000000 --- a/app/Presenters/UserPresenter.php +++ /dev/null @@ -1,51 +0,0 @@ - - */ -class UserPresenter extends BasePresenter implements Arrayable -{ - /** - * Returns the users avatar. - * - * @return string - */ - public function avatar() - { - if (Config::get('setting.enable_external_dependencies')) { - return sprintf('https://www.gravatar.com/avatar/%s?size=%d', md5(strtolower($this->email)), 200); - } - - return Avatar::create($this->username)->toBase64(); - } - - /** - * Convert the presenter instance to an array. - * - * @return string[] - */ - public function toArray() - { - return array_merge($this->wrappedObject->toArray(), [ - 'avatar' => $this->avatar(), - ]); - } -} diff --git a/composer.json b/composer.json index 7f6eeac8..4629aa57 100644 --- a/composer.json +++ b/composer.json @@ -49,7 +49,6 @@ "jenssegers/date": "^3.4", "laravel/framework": "5.7.*", "laravel/tinker": "^1.0", - "laravolt/avatar": "^2.1", "mccool/laravel-auto-presenter": "^7.1", "nexmo/client": "^1.5", "pragmarx/google2fa": "^0.7.1", diff --git a/composer.lock b/composer.lock index 19c6599a..c8a56afb 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "616135d38596e8d3c78ed774082dad7e", + "content-hash": "256b508cf308e596a15b1e4625e3e932", "packages": [ { "name": "alt-three/badger", @@ -358,16 +358,16 @@ }, { "name": "aws/aws-sdk-php", - "version": "3.100.4", + "version": "3.100.9", "source": { "type": "git", "url": "https://github.com/aws/aws-sdk-php.git", - "reference": "803f3cdc37f42112c4df1af0a77e25130b9448d3" + "reference": "858a3566f6bce79bb6449a9faff45ab3d8f75a3a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/803f3cdc37f42112c4df1af0a77e25130b9448d3", - "reference": "803f3cdc37f42112c4df1af0a77e25130b9448d3", + "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/858a3566f6bce79bb6449a9faff45ab3d8f75a3a", + "reference": "858a3566f6bce79bb6449a9faff45ab3d8f75a3a", "shasum": "" }, "require": { @@ -437,7 +437,7 @@ "s3", "sdk" ], - "time": "2019-06-14T18:12:13+00:00" + "time": "2019-06-21T18:12:55+00:00" }, { "name": "bacon/bacon-qr-code", @@ -602,62 +602,6 @@ ], "time": "2018-11-02T09:03:50+00:00" }, - { - "name": "danielstjules/stringy", - "version": "3.1.0", - "source": { - "type": "git", - "url": "https://github.com/danielstjules/Stringy.git", - "reference": "df24ab62d2d8213bbbe88cc36fc35a4503b4bd7e" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/danielstjules/Stringy/zipball/df24ab62d2d8213bbbe88cc36fc35a4503b4bd7e", - "reference": "df24ab62d2d8213bbbe88cc36fc35a4503b4bd7e", - "shasum": "" - }, - "require": { - "php": ">=5.4.0", - "symfony/polyfill-mbstring": "~1.1" - }, - "require-dev": { - "phpunit/phpunit": "~4.0" - }, - "type": "library", - "autoload": { - "psr-4": { - "Stringy\\": "src/" - }, - "files": [ - "src/Create.php" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Daniel St. Jules", - "email": "danielst.jules@gmail.com", - "homepage": "http://www.danielstjules.com" - } - ], - "description": "A string manipulation library with multibyte support", - "homepage": "https://github.com/danielstjules/Stringy", - "keywords": [ - "UTF", - "helpers", - "manipulation", - "methods", - "multibyte", - "string", - "utf-8", - "utility", - "utils" - ], - "time": "2017-06-12T01:10:27+00:00" - }, { "name": "dnoegel/php-xdg-base-dir", "version": "0.1", @@ -991,21 +935,24 @@ }, { "name": "doctrine/lexer", - "version": "v1.0.1", + "version": "1.0.2", "source": { "type": "git", "url": "https://github.com/doctrine/lexer.git", - "reference": "83893c552fd2045dd78aef794c31e694c37c0b8c" + "reference": "1febd6c3ef84253d7c815bed85fc622ad207a9f8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/lexer/zipball/83893c552fd2045dd78aef794c31e694c37c0b8c", - "reference": "83893c552fd2045dd78aef794c31e694c37c0b8c", + "url": "https://api.github.com/repos/doctrine/lexer/zipball/1febd6c3ef84253d7c815bed85fc622ad207a9f8", + "reference": "1febd6c3ef84253d7c815bed85fc622ad207a9f8", "shasum": "" }, "require": { "php": ">=5.3.2" }, + "require-dev": { + "phpunit/phpunit": "^4.5" + }, "type": "library", "extra": { "branch-alias": { @@ -1013,8 +960,8 @@ } }, "autoload": { - "psr-0": { - "Doctrine\\Common\\Lexer\\": "lib/" + "psr-4": { + "Doctrine\\Common\\Lexer\\": "lib/Doctrine/Common/Lexer" } }, "notification-url": "https://packagist.org/downloads/", @@ -1035,13 +982,16 @@ "email": "schmittjoh@gmail.com" } ], - "description": "Base library for a lexer that can be used in Top-Down, Recursive Descent Parsers.", - "homepage": "http://www.doctrine-project.org", + "description": "PHP Doctrine Lexer parser library that can be used in Top-Down, Recursive Descent Parsers.", + "homepage": "https://www.doctrine-project.org/projects/lexer.html", "keywords": [ + "annotations", + "docblock", "lexer", - "parser" + "parser", + "php" ], - "time": "2014-09-09T13:34:57+00:00" + "time": "2019-06-08T11:03:04+00:00" }, { "name": "dragonmantank/cron-expression", @@ -1099,16 +1049,16 @@ }, { "name": "egulias/email-validator", - "version": "2.1.8", + "version": "2.1.9", "source": { "type": "git", "url": "https://github.com/egulias/EmailValidator.git", - "reference": "c26463ff9241f27907112fbcd0c86fa670cfef98" + "reference": "128cc721d771ec2c46ce59698f4ca42b73f71b25" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/egulias/EmailValidator/zipball/c26463ff9241f27907112fbcd0c86fa670cfef98", - "reference": "c26463ff9241f27907112fbcd0c86fa670cfef98", + "url": "https://api.github.com/repos/egulias/EmailValidator/zipball/128cc721d771ec2c46ce59698f4ca42b73f71b25", + "reference": "128cc721d771ec2c46ce59698f4ca42b73f71b25", "shasum": "" }, "require": { @@ -1152,7 +1102,7 @@ "validation", "validator" ], - "time": "2019-05-16T22:02:54+00:00" + "time": "2019-06-23T10:14:27+00:00" }, { "name": "erusev/parsedown", @@ -1822,76 +1772,6 @@ ], "time": "2018-12-04T20:46:45+00:00" }, - { - "name": "intervention/image", - "version": "2.4.2", - "source": { - "type": "git", - "url": "https://github.com/Intervention/image.git", - "reference": "e82d274f786e3d4b866a59b173f42e716f0783eb" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/Intervention/image/zipball/e82d274f786e3d4b866a59b173f42e716f0783eb", - "reference": "e82d274f786e3d4b866a59b173f42e716f0783eb", - "shasum": "" - }, - "require": { - "ext-fileinfo": "*", - "guzzlehttp/psr7": "~1.1", - "php": ">=5.4.0" - }, - "require-dev": { - "mockery/mockery": "~0.9.2", - "phpunit/phpunit": "^4.8 || ^5.7" - }, - "suggest": { - "ext-gd": "to use GD library based image processing.", - "ext-imagick": "to use Imagick based image processing.", - "intervention/imagecache": "Caching extension for the Intervention Image library" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.4-dev" - }, - "laravel": { - "providers": [ - "Intervention\\Image\\ImageServiceProvider" - ], - "aliases": { - "Image": "Intervention\\Image\\Facades\\Image" - } - } - }, - "autoload": { - "psr-4": { - "Intervention\\Image\\": "src/Intervention/Image" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Oliver Vogel", - "email": "oliver@olivervogel.com", - "homepage": "http://olivervogel.com/" - } - ], - "description": "Image handling and manipulation library with support for Laravel integration", - "homepage": "http://image.intervention.io/", - "keywords": [ - "gd", - "image", - "imagick", - "laravel", - "thumbnail", - "watermark" - ], - "time": "2018-05-29T14:19:03+00:00" - }, { "name": "jakub-onderka/php-console-color", "version": "v0.2", @@ -2413,72 +2293,6 @@ ], "time": "2018-10-12T19:39:35+00:00" }, - { - "name": "laravolt/avatar", - "version": "2.2.1", - "source": { - "type": "git", - "url": "https://github.com/laravolt/avatar.git", - "reference": "58470dbbac0704772d87e775ac60dcd1580f022a" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/laravolt/avatar/zipball/58470dbbac0704772d87e775ac60dcd1580f022a", - "reference": "58470dbbac0704772d87e775ac60dcd1580f022a", - "shasum": "" - }, - "require": { - "danielstjules/stringy": "~3.1", - "illuminate/cache": "~5.2", - "illuminate/support": "~5.2", - "intervention/image": "^2.1", - "php": ">=7.0" - }, - "require-dev": { - "mockery/mockery": "^0.9.1", - "phpunit/phpunit": "~6.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.0-dev" - }, - "laravel": { - "providers": [ - "Laravolt\\Avatar\\ServiceProvider" - ], - "aliases": { - "Avatar": "Laravolt\\Avatar\\Facade" - } - } - }, - "autoload": { - "psr-4": { - "Laravolt\\Avatar\\": "src" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Bayu Hendra Winata", - "email": "uyab.exe@gmail.com", - "homepage": "http://id-laravel.com", - "role": "Developer" - } - ], - "description": "Turn name, email, and any other string into initial-based avatar or gravatar.", - "homepage": "https://github.com/laravolt/avatar", - "keywords": [ - "avatar", - "gravatar", - "laravel", - "laravolt" - ], - "time": "2019-05-24T23:46:54+00:00" - }, { "name": "lcobucci/jwt", "version": "3.3.1", @@ -2605,16 +2419,16 @@ }, { "name": "league/flysystem", - "version": "1.0.52", + "version": "1.0.53", "source": { "type": "git", "url": "https://github.com/thephpleague/flysystem.git", - "reference": "c5a5097156387970e6f0ccfcdf03f752856f3391" + "reference": "08e12b7628f035600634a5e76d95b5eb66cea674" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/c5a5097156387970e6f0ccfcdf03f752856f3391", - "reference": "c5a5097156387970e6f0ccfcdf03f752856f3391", + "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/08e12b7628f035600634a5e76d95b5eb66cea674", + "reference": "08e12b7628f035600634a5e76d95b5eb66cea674", "shasum": "" }, "require": { @@ -2685,7 +2499,7 @@ "sftp", "storage" ], - "time": "2019-05-20T20:21:14+00:00" + "time": "2019-06-18T20:09:29+00:00" }, { "name": "mccool/laravel-auto-presenter", @@ -4190,16 +4004,16 @@ }, { "name": "symfony/event-dispatcher-contracts", - "version": "v1.1.1", + "version": "v1.1.5", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher-contracts.git", - "reference": "8fa2cf2177083dd59cf8e44ea4b6541764fbda69" + "reference": "c61766f4440ca687de1084a5c00b08e167a2575c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/8fa2cf2177083dd59cf8e44ea4b6541764fbda69", - "reference": "8fa2cf2177083dd59cf8e44ea4b6541764fbda69", + "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/c61766f4440ca687de1084a5c00b08e167a2575c", + "reference": "c61766f4440ca687de1084a5c00b08e167a2575c", "shasum": "" }, "require": { @@ -4244,7 +4058,7 @@ "interoperability", "standards" ], - "time": "2019-05-22T12:23:29+00:00" + "time": "2019-06-20T06:46:26+00:00" }, { "name": "symfony/finder", @@ -4920,23 +4734,23 @@ }, { "name": "symfony/service-contracts", - "version": "v1.1.2", + "version": "v1.1.5", "source": { "type": "git", "url": "https://github.com/symfony/service-contracts.git", - "reference": "191afdcb5804db960d26d8566b7e9a2843cab3a0" + "reference": "f391a00de78ec7ec8cf5cdcdae59ec7b883edb8d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/service-contracts/zipball/191afdcb5804db960d26d8566b7e9a2843cab3a0", - "reference": "191afdcb5804db960d26d8566b7e9a2843cab3a0", + "url": "https://api.github.com/repos/symfony/service-contracts/zipball/f391a00de78ec7ec8cf5cdcdae59ec7b883edb8d", + "reference": "f391a00de78ec7ec8cf5cdcdae59ec7b883edb8d", "shasum": "" }, "require": { - "php": "^7.1.3" + "php": "^7.1.3", + "psr/container": "^1.0" }, "suggest": { - "psr/container": "", "symfony/service-implementation": "" }, "type": "library", @@ -4974,7 +4788,7 @@ "interoperability", "standards" ], - "time": "2019-05-28T07:50:59+00:00" + "time": "2019-06-13T11:15:36+00:00" }, { "name": "symfony/translation", @@ -5054,16 +4868,16 @@ }, { "name": "symfony/translation-contracts", - "version": "v1.1.2", + "version": "v1.1.5", "source": { "type": "git", "url": "https://github.com/symfony/translation-contracts.git", - "reference": "93597ce975d91c52ebfaca1253343cd9ccb7916d" + "reference": "cb4b18ad7b92a26e83b65dde940fab78339e6f3c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/translation-contracts/zipball/93597ce975d91c52ebfaca1253343cd9ccb7916d", - "reference": "93597ce975d91c52ebfaca1253343cd9ccb7916d", + "url": "https://api.github.com/repos/symfony/translation-contracts/zipball/cb4b18ad7b92a26e83b65dde940fab78339e6f3c", + "reference": "cb4b18ad7b92a26e83b65dde940fab78339e6f3c", "shasum": "" }, "require": { @@ -5107,7 +4921,7 @@ "interoperability", "standards" ], - "time": "2019-05-27T08:16:38+00:00" + "time": "2019-06-13T11:15:36+00:00" }, { "name": "symfony/var-dumper", @@ -5234,16 +5048,16 @@ }, { "name": "twig/twig", - "version": "v2.11.2", + "version": "v2.11.3", "source": { "type": "git", "url": "https://github.com/twigphp/Twig.git", - "reference": "84a463403da1c81afbcedda8f0e788c78bd25a79" + "reference": "699ed2342557c88789a15402de5eb834dedd6792" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/twigphp/Twig/zipball/84a463403da1c81afbcedda8f0e788c78bd25a79", - "reference": "84a463403da1c81afbcedda8f0e788c78bd25a79", + "url": "https://api.github.com/repos/twigphp/Twig/zipball/699ed2342557c88789a15402de5eb834dedd6792", + "reference": "699ed2342557c88789a15402de5eb834dedd6792", "shasum": "" }, "require": { @@ -5297,7 +5111,7 @@ "keywords": [ "templating" ], - "time": "2019-06-05T11:17:07+00:00" + "time": "2019-06-18T15:37:11+00:00" }, { "name": "vlucas/phpdotenv", @@ -5831,16 +5645,16 @@ }, { "name": "filp/whoops", - "version": "2.3.1", + "version": "2.4.0", "source": { "type": "git", "url": "https://github.com/filp/whoops.git", - "reference": "bc0fd11bc455cc20ee4b5edabc63ebbf859324c7" + "reference": "1a1a1044ad00e285bd2825fac4c3a0443d90ad33" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/filp/whoops/zipball/bc0fd11bc455cc20ee4b5edabc63ebbf859324c7", - "reference": "bc0fd11bc455cc20ee4b5edabc63ebbf859324c7", + "url": "https://api.github.com/repos/filp/whoops/zipball/1a1a1044ad00e285bd2825fac4c3a0443d90ad33", + "reference": "1a1a1044ad00e285bd2825fac4c3a0443d90ad33", "shasum": "" }, "require": { @@ -5888,7 +5702,7 @@ "throwable", "whoops" ], - "time": "2018-10-23T09:00:00+00:00" + "time": "2019-06-23T09:00:00+00:00" }, { "name": "fzaninotto/faker", @@ -6537,16 +6351,16 @@ }, { "name": "phpspec/prophecy", - "version": "1.8.0", + "version": "1.8.1", "source": { "type": "git", "url": "https://github.com/phpspec/prophecy.git", - "reference": "4ba436b55987b4bf311cb7c6ba82aa528aac0a06" + "reference": "1927e75f4ed19131ec9bcc3b002e07fb1173ee76" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpspec/prophecy/zipball/4ba436b55987b4bf311cb7c6ba82aa528aac0a06", - "reference": "4ba436b55987b4bf311cb7c6ba82aa528aac0a06", + "url": "https://api.github.com/repos/phpspec/prophecy/zipball/1927e75f4ed19131ec9bcc3b002e07fb1173ee76", + "reference": "1927e75f4ed19131ec9bcc3b002e07fb1173ee76", "shasum": "" }, "require": { @@ -6567,8 +6381,8 @@ } }, "autoload": { - "psr-0": { - "Prophecy\\": "src/" + "psr-4": { + "Prophecy\\": "src/Prophecy" } }, "notification-url": "https://packagist.org/downloads/", @@ -6596,7 +6410,7 @@ "spy", "stub" ], - "time": "2018-08-05T17:53:17+00:00" + "time": "2019-06-13T12:50:23+00:00" }, { "name": "phpunit/php-code-coverage", @@ -6754,16 +6568,16 @@ }, { "name": "phpunit/php-timer", - "version": "2.1.1", + "version": "2.1.2", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-timer.git", - "reference": "8b389aebe1b8b0578430bda0c7c95a829608e059" + "reference": "1038454804406b0b5f5f520358e78c1c2f71501e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/8b389aebe1b8b0578430bda0c7c95a829608e059", - "reference": "8b389aebe1b8b0578430bda0c7c95a829608e059", + "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/1038454804406b0b5f5f520358e78c1c2f71501e", + "reference": "1038454804406b0b5f5f520358e78c1c2f71501e", "shasum": "" }, "require": { @@ -6799,7 +6613,7 @@ "keywords": [ "timer" ], - "time": "2019-02-20T10:12:59+00:00" + "time": "2019-06-07T04:22:29+00:00" }, { "name": "phpunit/php-token-stream", @@ -6852,16 +6666,16 @@ }, { "name": "phpunit/phpunit", - "version": "7.5.12", + "version": "7.5.13", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "9ba59817745b0fe0c1a5a3032dfd4a6d2994ad1c" + "reference": "b9278591caa8630127f96c63b598712b699e671c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/9ba59817745b0fe0c1a5a3032dfd4a6d2994ad1c", - "reference": "9ba59817745b0fe0c1a5a3032dfd4a6d2994ad1c", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/b9278591caa8630127f96c63b598712b699e671c", + "reference": "b9278591caa8630127f96c63b598712b699e671c", "shasum": "" }, "require": { @@ -6932,7 +6746,7 @@ "testing", "xunit" ], - "time": "2019-05-28T11:59:40+00:00" + "time": "2019-06-19T12:01:51+00:00" }, { "name": "sebastian/code-unit-reverse-lookup", @@ -7502,16 +7316,16 @@ }, { "name": "theseer/tokenizer", - "version": "1.1.2", + "version": "1.1.3", "source": { "type": "git", "url": "https://github.com/theseer/tokenizer.git", - "reference": "1c42705be2b6c1de5904f8afacef5895cab44bf8" + "reference": "11336f6f84e16a720dae9d8e6ed5019efa85a0f9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/theseer/tokenizer/zipball/1c42705be2b6c1de5904f8afacef5895cab44bf8", - "reference": "1c42705be2b6c1de5904f8afacef5895cab44bf8", + "url": "https://api.github.com/repos/theseer/tokenizer/zipball/11336f6f84e16a720dae9d8e6ed5019efa85a0f9", + "reference": "11336f6f84e16a720dae9d8e6ed5019efa85a0f9", "shasum": "" }, "require": { @@ -7538,7 +7352,7 @@ } ], "description": "A small library for converting tokenized PHP source code into XML and potentially other formats", - "time": "2019-04-04T09:56:43+00:00" + "time": "2019-06-13T22:48:21+00:00" }, { "name": "tightenco/mailthief", diff --git a/config/app.php b/config/app.php index 84920b9e..a8cb9af5 100644 --- a/config/app.php +++ b/config/app.php @@ -185,7 +185,6 @@ return [ GrahamCampbell\Security\SecurityServiceProvider::class, Jenssegers\Date\DateServiceProvider::class, Laravel\Tinker\TinkerServiceProvider::class, - Laravolt\Avatar\ServiceProvider::class, McCool\LaravelAutoPresenter\AutoPresenterServiceProvider::class, PragmaRX\Google2FA\Vendor\Laravel\ServiceProvider::class, diff --git a/resources/views/dashboard/partials/sidebar.blade.php b/resources/views/dashboard/partials/sidebar.blade.php index 7a4fabf7..f94cb5b7 100644 --- a/resources/views/dashboard/partials/sidebar.blade.php +++ b/resources/views/dashboard/partials/sidebar.blade.php @@ -2,10 +2,7 @@
- - - -

{{ $currentUser->username }}

+

{{ $currentUser->username }}
diff --git a/resources/views/dashboard/team/index.blade.php b/resources/views/dashboard/team/index.blade.php index c3bd565c..dfa753dc 100644 --- a/resources/views/dashboard/team/index.blade.php +++ b/resources/views/dashboard/team/index.blade.php @@ -27,13 +27,12 @@
@foreach($teamMembers as $member) -
- - - -
{{ $member->username }}
- -
+ +
+
{{ $member->username }}
+ +
+ @endforeach
From 88570b226f3ad277b6ab55821279e2019e77d8b0 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 24 Jun 2019 05:40:47 +0000 Subject: [PATCH 40/54] Bump bugsnag/bugsnag-laravel from 2.15.2 to 2.16.0 Bumps [bugsnag/bugsnag-laravel](https://github.com/bugsnag/bugsnag-laravel) from 2.15.2 to 2.16.0. - [Release notes](https://github.com/bugsnag/bugsnag-laravel/releases) - [Changelog](https://github.com/bugsnag/bugsnag-laravel/blob/master/CHANGELOG.md) - [Commits](https://github.com/bugsnag/bugsnag-laravel/compare/v2.15.2...v2.16.0) Signed-off-by: dependabot-preview[bot] --- composer.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/composer.lock b/composer.lock index c8a56afb..2392cb60 100644 --- a/composer.lock +++ b/composer.lock @@ -5415,20 +5415,20 @@ }, { "name": "bugsnag/bugsnag-laravel", - "version": "v2.15.2", + "version": "v2.16.0", "source": { "type": "git", "url": "https://github.com/bugsnag/bugsnag-laravel.git", - "reference": "bc5f3c5ea9dc31455b7be04a714ac6faf3c4fdec" + "reference": "a9922063076eabb0ad8be73fc2999f4105b71d7a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/bugsnag/bugsnag-laravel/zipball/bc5f3c5ea9dc31455b7be04a714ac6faf3c4fdec", - "reference": "bc5f3c5ea9dc31455b7be04a714ac6faf3c4fdec", + "url": "https://api.github.com/repos/bugsnag/bugsnag-laravel/zipball/a9922063076eabb0ad8be73fc2999f4105b71d7a", + "reference": "a9922063076eabb0ad8be73fc2999f4105b71d7a", "shasum": "" }, "require": { - "bugsnag/bugsnag": "^3.15.0", + "bugsnag/bugsnag": "^3.17.0", "bugsnag/bugsnag-psr-logger": "^1.4", "illuminate/contracts": "^5.0", "illuminate/support": "^5.0", @@ -5471,7 +5471,7 @@ "logging", "tracking" ], - "time": "2019-01-23T18:18:44+00:00" + "time": "2019-06-14T15:07:24+00:00" }, { "name": "bugsnag/bugsnag-psr-logger", From 4137a59dd091e55918da1faa560f22bfa9e80e6f Mon Sep 17 00:00:00 2001 From: Chris Forrence Date: Sat, 29 Jun 2019 12:49:00 -0400 Subject: [PATCH 41/54] Update installation.md --- docs/setup/installation.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/setup/installation.md b/docs/setup/installation.md index e194aa6b..139cfe90 100644 --- a/docs/setup/installation.md +++ b/docs/setup/installation.md @@ -71,7 +71,7 @@ Cachet comes with an installation command that will: - Run seeders (of which there are none) ```bash -php artisan app:install +php artisan cachet:install ``` > Never change the `APP_KEY` after installation on production environment. From 49a7303fa03457eba0cca1200f4477bc2ce669d4 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 1 Jul 2019 06:23:09 +0000 Subject: [PATCH 42/54] Bump alt-three/testbench from 4.0.2 to 4.0.3 Bumps [alt-three/testbench](https://github.com/AltThree/TestBench) from 4.0.2 to 4.0.3. - [Release notes](https://github.com/AltThree/TestBench/releases) - [Commits](https://github.com/AltThree/TestBench/compare/v4.0.2...v4.0.3) Signed-off-by: dependabot-preview[bot] --- composer.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/composer.lock b/composer.lock index 2392cb60..eb8be3c0 100644 --- a/composer.lock +++ b/composer.lock @@ -5234,16 +5234,16 @@ "packages-dev": [ { "name": "alt-three/testbench", - "version": "v4.0.2", + "version": "v4.0.3", "source": { "type": "git", "url": "https://github.com/AltThree/TestBench.git", - "reference": "d59f8207f0c444cb2c1c7e889aa8e2f5b334e704" + "reference": "fa6ee363fff09aa3ce6446293d6ccd9738172c06" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/AltThree/TestBench/zipball/d59f8207f0c444cb2c1c7e889aa8e2f5b334e704", - "reference": "d59f8207f0c444cb2c1c7e889aa8e2f5b334e704", + "url": "https://api.github.com/repos/AltThree/TestBench/zipball/fa6ee363fff09aa3ce6446293d6ccd9738172c06", + "reference": "fa6ee363fff09aa3ce6446293d6ccd9738172c06", "shasum": "" }, "require": { @@ -5278,13 +5278,13 @@ "email": "support@alt-three.com" } ], - "description": "Provides Some Testing Traits For Apps", + "description": "Provides some testing traits for apps", "keywords": [ "Alt Three", "TestBench", "app" ], - "time": "2019-05-12T11:36:21+00:00" + "time": "2019-06-30T15:22:06+00:00" }, { "name": "barryvdh/laravel-debugbar", From 5e3f431139930e3e067a37d10e9bec1774ff5010 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 1 Jul 2019 06:24:50 +0000 Subject: [PATCH 43/54] Bump alt-three/bus from 4.2.0 to 4.2.1 Bumps [alt-three/bus](https://github.com/AltThree/Bus) from 4.2.0 to 4.2.1. - [Release notes](https://github.com/AltThree/Bus/releases) - [Commits](https://github.com/AltThree/Bus/compare/v4.2.0...v4.2.1) Signed-off-by: dependabot-preview[bot] --- composer.lock | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/composer.lock b/composer.lock index 2392cb60..5d2c0fcd 100644 --- a/composer.lock +++ b/composer.lock @@ -69,16 +69,16 @@ }, { "name": "alt-three/bus", - "version": "v4.2.0", + "version": "v4.2.1", "source": { "type": "git", "url": "https://github.com/AltThree/Bus.git", - "reference": "90b43e1e48348dbd7687ca65152816bdb8ed033d" + "reference": "393907e8d6324ee1c9c296b762c668771c8906b1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/AltThree/Bus/zipball/90b43e1e48348dbd7687ca65152816bdb8ed033d", - "reference": "90b43e1e48348dbd7687ca65152816bdb8ed033d", + "url": "https://api.github.com/repos/AltThree/Bus/zipball/393907e8d6324ee1c9c296b762c668771c8906b1", + "reference": "393907e8d6324ee1c9c296b762c668771c8906b1", "shasum": "" }, "require": { @@ -124,7 +124,7 @@ "command bus", "job" ], - "time": "2019-05-12T11:37:17+00:00" + "time": "2019-06-30T15:18:27+00:00" }, { "name": "alt-three/emoji", From c7b2496f13852e644fd09fc70f4d16805f40d504 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 1 Jul 2019 06:26:29 +0000 Subject: [PATCH 44/54] Bump graham-campbell/markdown from 10.3.0 to 10.3.1 Bumps [graham-campbell/markdown](https://github.com/GrahamCampbell/Laravel-Markdown) from 10.3.0 to 10.3.1. - [Release notes](https://github.com/GrahamCampbell/Laravel-Markdown/releases) - [Changelog](https://github.com/GrahamCampbell/Laravel-Markdown/blob/master/CHANGELOG.md) - [Commits](https://github.com/GrahamCampbell/Laravel-Markdown/compare/v10.3.0...v10.3.1) Signed-off-by: dependabot-preview[bot] --- composer.lock | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/composer.lock b/composer.lock index 2392cb60..15632a9d 100644 --- a/composer.lock +++ b/composer.lock @@ -1404,16 +1404,16 @@ }, { "name": "graham-campbell/markdown", - "version": "v10.3.0", + "version": "v10.3.1", "source": { "type": "git", "url": "https://github.com/GrahamCampbell/Laravel-Markdown.git", - "reference": "e076ed4bc8e98f0444b996acdd6042f6f45fe7c2" + "reference": "c9978137be1e6896d9a2ca39aa3d2c62d0700ca1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/GrahamCampbell/Laravel-Markdown/zipball/e076ed4bc8e98f0444b996acdd6042f6f45fe7c2", - "reference": "e076ed4bc8e98f0444b996acdd6042f6f45fe7c2", + "url": "https://api.github.com/repos/GrahamCampbell/Laravel-Markdown/zipball/c9978137be1e6896d9a2ca39aa3d2c62d0700ca1", + "reference": "c9978137be1e6896d9a2ca39aa3d2c62d0700ca1", "shasum": "" }, "require": { @@ -1468,7 +1468,7 @@ "laravel", "markdown" ], - "time": "2019-02-17T19:48:19+00:00" + "time": "2019-06-30T22:39:31+00:00" }, { "name": "graham-campbell/security", From 5c5fa28667505c2b0aa6cc51775e7df17fa9e92d Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 1 Jul 2019 06:29:37 +0000 Subject: [PATCH 45/54] Bump alt-three/validator from 4.2.0 to 4.2.1 Bumps [alt-three/validator](https://github.com/AltThree/Validator) from 4.2.0 to 4.2.1. - [Release notes](https://github.com/AltThree/Validator/releases) - [Commits](https://github.com/AltThree/Validator/compare/v4.2.0...v4.2.1) Signed-off-by: dependabot-preview[bot] --- composer.lock | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/composer.lock b/composer.lock index 2392cb60..89970d55 100644 --- a/composer.lock +++ b/composer.lock @@ -253,16 +253,16 @@ }, { "name": "alt-three/validator", - "version": "v4.2.0", + "version": "v4.2.1", "source": { "type": "git", "url": "https://github.com/AltThree/Validator.git", - "reference": "1ea2a482c69f1c568e77c62d19633c3c5b84cc91" + "reference": "651fb56c92e5ac80f4840f9596391f72b00f0282" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/AltThree/Validator/zipball/1ea2a482c69f1c568e77c62d19633c3c5b84cc91", - "reference": "1ea2a482c69f1c568e77c62d19633c3c5b84cc91", + "url": "https://api.github.com/repos/AltThree/Validator/zipball/651fb56c92e5ac80f4840f9596391f72b00f0282", + "reference": "651fb56c92e5ac80f4840f9596391f72b00f0282", "shasum": "" }, "require": { @@ -296,13 +296,13 @@ "email": "support@alt-three.com" } ], - "description": "A Validation Wrapper For Laravel 5", + "description": "A validation wrapper for Laravel 5", "keywords": [ "Alt Three", - "logging", + "validation", "validator" ], - "time": "2019-05-12T11:59:28+00:00" + "time": "2019-06-30T15:22:35+00:00" }, { "name": "asm89/stack-cors", From 65d0c08a66ed02cefdfdd8ce17b72fcd615e1660 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 1 Jul 2019 06:31:32 +0000 Subject: [PATCH 46/54] Bump mccool/laravel-auto-presenter from 7.2.0 to 7.2.1 Bumps [mccool/laravel-auto-presenter](https://github.com/laravel-auto-presenter/laravel-auto-presenter) from 7.2.0 to 7.2.1. - [Release notes](https://github.com/laravel-auto-presenter/laravel-auto-presenter/releases) - [Commits](https://github.com/laravel-auto-presenter/laravel-auto-presenter/compare/7.2.0...7.2.1) Signed-off-by: dependabot-preview[bot] --- composer.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/composer.lock b/composer.lock index 2392cb60..3f310a27 100644 --- a/composer.lock +++ b/composer.lock @@ -2503,16 +2503,16 @@ }, { "name": "mccool/laravel-auto-presenter", - "version": "7.2.0", + "version": "7.2.1", "source": { "type": "git", "url": "https://github.com/laravel-auto-presenter/laravel-auto-presenter.git", - "reference": "45270a0054b4d3ae0550cf826bbeeb5c540afac1" + "reference": "0afed6721bf8b8dbbf82803dcd84d2a49addf75d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel-auto-presenter/laravel-auto-presenter/zipball/45270a0054b4d3ae0550cf826bbeeb5c540afac1", - "reference": "45270a0054b4d3ae0550cf826bbeeb5c540afac1", + "url": "https://api.github.com/repos/laravel-auto-presenter/laravel-auto-presenter/zipball/0afed6721bf8b8dbbf82803dcd84d2a49addf75d", + "reference": "0afed6721bf8b8dbbf82803dcd84d2a49addf75d", "shasum": "" }, "require": { @@ -2528,7 +2528,7 @@ "graham-campbell/analyzer": "^2.1", "graham-campbell/testbench": "^5.2", "mockery/mockery": "^1.0", - "phpunit/phpunit": "^6.5|^7.0" + "phpunit/phpunit": "^6.5|^7.0|^8.0" }, "type": "library", "extra": { @@ -2567,7 +2567,7 @@ "lpm", "presenter" ], - "time": "2019-01-27T21:47:32+00:00" + "time": "2019-06-28T09:09:41+00:00" }, { "name": "monolog/monolog", From 9f825e4dc25363c0d2c418c664d2be6bfe6fd4f7 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 1 Jul 2019 06:33:09 +0000 Subject: [PATCH 47/54] Bump graham-campbell/analyzer from 2.2.0 to 2.2.1 Bumps [graham-campbell/analyzer](https://github.com/GrahamCampbell/Analyzer) from 2.2.0 to 2.2.1. - [Release notes](https://github.com/GrahamCampbell/Analyzer/releases) - [Changelog](https://github.com/GrahamCampbell/Analyzer/blob/master/CHANGELOG.md) - [Commits](https://github.com/GrahamCampbell/Analyzer/compare/v2.2.0...v2.2.1) Signed-off-by: dependabot-preview[bot] --- composer.lock | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/composer.lock b/composer.lock index 2392cb60..83b86249 100644 --- a/composer.lock +++ b/composer.lock @@ -5756,16 +5756,16 @@ }, { "name": "graham-campbell/analyzer", - "version": "v2.2.0", + "version": "v2.2.1", "source": { "type": "git", "url": "https://github.com/GrahamCampbell/Analyzer.git", - "reference": "0ed700f993fc4b37f67a7aca9dcc2b6d0abe600c" + "reference": "e7ce54cf4761f5f1182af3a69bcf88e1ff82abb0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/GrahamCampbell/Analyzer/zipball/0ed700f993fc4b37f67a7aca9dcc2b6d0abe600c", - "reference": "0ed700f993fc4b37f67a7aca9dcc2b6d0abe600c", + "url": "https://api.github.com/repos/GrahamCampbell/Analyzer/zipball/e7ce54cf4761f5f1182af3a69bcf88e1ff82abb0", + "reference": "e7ce54cf4761f5f1182af3a69bcf88e1ff82abb0", "shasum": "" }, "require": { @@ -5810,7 +5810,7 @@ "classes", "testing" ], - "time": "2019-05-22T12:04:22+00:00" + "time": "2019-06-30T12:44:22+00:00" }, { "name": "graham-campbell/testbench-core", From b8a51494dc54e0cfc5b62c7b82dd49b5d65fb6cb Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 1 Jul 2019 06:35:06 +0000 Subject: [PATCH 48/54] Bump graham-campbell/binput from 6.1.0 to 6.1.1 Bumps [graham-campbell/binput](https://github.com/GrahamCampbell/Laravel-Binput) from 6.1.0 to 6.1.1. - [Release notes](https://github.com/GrahamCampbell/Laravel-Binput/releases) - [Changelog](https://github.com/GrahamCampbell/Laravel-Binput/blob/master/CHANGELOG.md) - [Commits](https://github.com/GrahamCampbell/Laravel-Binput/compare/v6.1.0...v6.1.1) Signed-off-by: dependabot-preview[bot] --- composer.lock | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/composer.lock b/composer.lock index 2392cb60..87526ac0 100644 --- a/composer.lock +++ b/composer.lock @@ -1206,16 +1206,16 @@ }, { "name": "graham-campbell/binput", - "version": "v6.1.0", + "version": "v6.1.1", "source": { "type": "git", "url": "https://github.com/GrahamCampbell/Laravel-Binput.git", - "reference": "986973e1a9697a903d9850d63ed60eb8658753a2" + "reference": "99210ef689cfd2e32918db79f9b6115405cb4226" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/GrahamCampbell/Laravel-Binput/zipball/986973e1a9697a903d9850d63ed60eb8658753a2", - "reference": "986973e1a9697a903d9850d63ed60eb8658753a2", + "url": "https://api.github.com/repos/GrahamCampbell/Laravel-Binput/zipball/99210ef689cfd2e32918db79f9b6115405cb4226", + "reference": "99210ef689cfd2e32918db79f9b6115405cb4226", "shasum": "" }, "require": { @@ -1271,7 +1271,7 @@ "laravel", "security" ], - "time": "2019-02-17T19:48:09+00:00" + "time": "2019-06-30T14:24:05+00:00" }, { "name": "graham-campbell/exceptions", @@ -1536,16 +1536,16 @@ }, { "name": "graham-campbell/security-core", - "version": "v1.0.0", + "version": "v1.0.1", "source": { "type": "git", "url": "https://github.com/GrahamCampbell/Security-Core.git", - "reference": "6873cee667e415d0b429adc807b8e1ee450e0f5f" + "reference": "2dc183b6be8ef71b4db72849ceb0d2322d0e1ef8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/GrahamCampbell/Security-Core/zipball/6873cee667e415d0b429adc807b8e1ee450e0f5f", - "reference": "6873cee667e415d0b429adc807b8e1ee450e0f5f", + "url": "https://api.github.com/repos/GrahamCampbell/Security-Core/zipball/2dc183b6be8ef71b4db72849ceb0d2322d0e1ef8", + "reference": "2dc183b6be8ef71b4db72849ceb0d2322d0e1ef8", "shasum": "" }, "require": { @@ -1553,7 +1553,7 @@ }, "require-dev": { "graham-campbell/analyzer": "^2.1", - "phpunit/phpunit": "^6.5|^7.0" + "phpunit/phpunit": "^6.5|^7.0|^8.0" }, "type": "library", "extra": { @@ -1587,7 +1587,7 @@ "laravel", "security" ], - "time": "2018-12-30T01:50:43+00:00" + "time": "2019-06-30T13:39:38+00:00" }, { "name": "guzzlehttp/guzzle", From 49833c8655f9123eb60b8a4b3fcfdf3d9d92174f Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 1 Jul 2019 07:59:15 +0000 Subject: [PATCH 49/54] Bump axios from 0.18.1 to 0.19.0 Bumps [axios](https://github.com/axios/axios) from 0.18.1 to 0.19.0. - [Release notes](https://github.com/axios/axios/releases) - [Changelog](https://github.com/axios/axios/blob/master/CHANGELOG.md) - [Commits](https://github.com/axios/axios/compare/v0.18.1...v0.19.0) Signed-off-by: dependabot-preview[bot] --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 55fd73b0..b9945dfd 100644 --- a/package.json +++ b/package.json @@ -11,7 +11,7 @@ }, "devDependencies": { "animate-sass": "^0.8.2", - "axios": "^0.18", + "axios": "^0.19", "bootstrap-sass": "^3.4.1", "chart.js": "^2.8.0", "cross-env": "^5.1", diff --git a/yarn.lock b/yarn.lock index edc728a6..3bf3da80 100644 --- a/yarn.lock +++ b/yarn.lock @@ -319,10 +319,10 @@ aws4@^1.8.0: resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.8.0.tgz#f0e003d9ca9e7f59c7a508945d7b2ef9a04a542f" integrity sha512-ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ== -axios@^0.18: - version "0.18.1" - resolved "https://registry.yarnpkg.com/axios/-/axios-0.18.1.tgz#ff3f0de2e7b5d180e757ad98000f1081b87bcea3" - integrity sha512-0BfJq4NSfQXd+SkFdrvFbG7addhYSBA2mQwISr46pD6E5iqkWg02RAs8vyTT/j0RTnoYmeXauBuSv1qKwR179g== +axios@^0.19: + version "0.19.0" + resolved "https://registry.yarnpkg.com/axios/-/axios-0.19.0.tgz#8e09bff3d9122e133f7b8101c8fbdd00ed3d2ab8" + integrity sha512-1uvKqKQta3KBxIz14F2v06AEHZ/dIoeKfbTRkK1E5oqjDnuEerLmYTgJB5AiQZHJcljpg1TuRzdjDR06qNk0DQ== dependencies: follow-redirects "1.5.10" is-buffer "^2.0.2" From 657e18d35f384c9170cdcb89802934e7aedf7a46 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 8 Jul 2019 05:52:52 +0000 Subject: [PATCH 50/54] Bump aws/aws-sdk-php from 3.100.9 to 3.104.1 Bumps [aws/aws-sdk-php](https://github.com/aws/aws-sdk-php) from 3.100.9 to 3.104.1. - [Release notes](https://github.com/aws/aws-sdk-php/releases) - [Changelog](https://github.com/aws/aws-sdk-php/blob/master/CHANGELOG.md) - [Commits](https://github.com/aws/aws-sdk-php/compare/3.100.9...3.104.1) Signed-off-by: dependabot-preview[bot] --- composer.lock | 44 ++++++++++++++++++++++++-------------------- 1 file changed, 24 insertions(+), 20 deletions(-) diff --git a/composer.lock b/composer.lock index 2392cb60..9459c970 100644 --- a/composer.lock +++ b/composer.lock @@ -358,16 +358,16 @@ }, { "name": "aws/aws-sdk-php", - "version": "3.100.9", + "version": "3.104.1", "source": { "type": "git", "url": "https://github.com/aws/aws-sdk-php.git", - "reference": "858a3566f6bce79bb6449a9faff45ab3d8f75a3a" + "reference": "295706ab2134bf842837fa0b0162ff3aef8b0aa4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/858a3566f6bce79bb6449a9faff45ab3d8f75a3a", - "reference": "858a3566f6bce79bb6449a9faff45ab3d8f75a3a", + "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/295706ab2134bf842837fa0b0162ff3aef8b0aa4", + "reference": "295706ab2134bf842837fa0b0162ff3aef8b0aa4", "shasum": "" }, "require": { @@ -437,7 +437,7 @@ "s3", "sdk" ], - "time": "2019-06-21T18:12:55+00:00" + "time": "2019-07-03T18:08:50+00:00" }, { "name": "bacon/bacon-qr-code", @@ -1707,33 +1707,37 @@ }, { "name": "guzzlehttp/psr7", - "version": "1.5.2", + "version": "1.6.1", "source": { "type": "git", "url": "https://github.com/guzzle/psr7.git", - "reference": "9f83dded91781a01c63574e387eaa769be769115" + "reference": "239400de7a173fe9901b9ac7c06497751f00727a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/psr7/zipball/9f83dded91781a01c63574e387eaa769be769115", - "reference": "9f83dded91781a01c63574e387eaa769be769115", + "url": "https://api.github.com/repos/guzzle/psr7/zipball/239400de7a173fe9901b9ac7c06497751f00727a", + "reference": "239400de7a173fe9901b9ac7c06497751f00727a", "shasum": "" }, "require": { "php": ">=5.4.0", "psr/http-message": "~1.0", - "ralouphie/getallheaders": "^2.0.5" + "ralouphie/getallheaders": "^2.0.5 || ^3.0.0" }, "provide": { "psr/http-message-implementation": "1.0" }, "require-dev": { + "ext-zlib": "*", "phpunit/phpunit": "~4.8.36 || ^5.7.27 || ^6.5.8" }, + "suggest": { + "zendframework/zend-httphandlerrunner": "Emit PSR-7 responses" + }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.5-dev" + "dev-master": "1.6-dev" } }, "autoload": { @@ -1770,7 +1774,7 @@ "uri", "url" ], - "time": "2018-12-04T20:46:45+00:00" + "time": "2019-07-01T23:21:34+00:00" }, { "name": "jakub-onderka/php-console-color", @@ -3515,24 +3519,24 @@ }, { "name": "ralouphie/getallheaders", - "version": "2.0.5", + "version": "3.0.3", "source": { "type": "git", "url": "https://github.com/ralouphie/getallheaders.git", - "reference": "5601c8a83fbba7ef674a7369456d12f1e0d0eafa" + "reference": "120b605dfeb996808c31b6477290a714d356e822" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/ralouphie/getallheaders/zipball/5601c8a83fbba7ef674a7369456d12f1e0d0eafa", - "reference": "5601c8a83fbba7ef674a7369456d12f1e0d0eafa", + "url": "https://api.github.com/repos/ralouphie/getallheaders/zipball/120b605dfeb996808c31b6477290a714d356e822", + "reference": "120b605dfeb996808c31b6477290a714d356e822", "shasum": "" }, "require": { - "php": ">=5.3" + "php": ">=5.6" }, "require-dev": { - "phpunit/phpunit": "~3.7.0", - "satooshi/php-coveralls": ">=1.0" + "php-coveralls/php-coveralls": "^2.1", + "phpunit/phpunit": "^5 || ^6.5" }, "type": "library", "autoload": { @@ -3551,7 +3555,7 @@ } ], "description": "A polyfill for getallheaders.", - "time": "2016-02-11T07:05:27+00:00" + "time": "2019-03-08T08:55:37+00:00" }, { "name": "ramsey/uuid", From d57ddca02199c37cae7ad68f62b4a564bf333c60 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Thu, 11 Jul 2019 01:11:01 +0000 Subject: [PATCH 51/54] [Security] Bump lodash from 4.17.11 to 4.17.13 Bumps [lodash](https://github.com/lodash/lodash) from 4.17.11 to 4.17.13. **This update includes security fixes.** - [Release notes](https://github.com/lodash/lodash/releases) - [Commits](https://github.com/lodash/lodash/compare/4.17.11...4.17.13) Signed-off-by: dependabot-preview[bot] --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index b9945dfd..e65091ec 100644 --- a/package.json +++ b/package.json @@ -26,7 +26,7 @@ "laravel-mix": "^2.1", "laravel-mix-purgecss": "^3.0.0", "livestamp": "git+https://github.com/mattbradley/livestampjs.git#develop", - "lodash": "^4.17.11", + "lodash": "^4.17.13", "messenger": "git+https://github.com/HubSpot/messenger.git", "moment": "^2.24.0", "promise": "^7.3.1", diff --git a/yarn.lock b/yarn.lock index 3bf3da80..b3b1b381 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3865,10 +3865,10 @@ lodash.uniq@^4.5.0: resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773" integrity sha1-0CJTc662Uq3BvILklFM5qEJ1R3M= -lodash@^4.0.0, lodash@^4.17.11, lodash@^4.17.4, lodash@^4.17.5, lodash@~4.17.10: - version "4.17.11" - resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.11.tgz#b39ea6229ef607ecd89e2c8df12536891cac9b8d" - integrity sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg== +lodash@^4.0.0, lodash@^4.17.11, lodash@^4.17.13, lodash@^4.17.4, lodash@^4.17.5, lodash@~4.17.10: + version "4.17.13" + resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.13.tgz#0bdc3a6adc873d2f4e0c4bac285df91b64fc7b93" + integrity sha512-vm3/XWXfWtRua0FkUyEHBZy8kCPjErNBT9fJx8Zvs+U6zjqPbTUOpkaoum3O5uiA8sm+yNMHXfYkTUHFoMxFNA== loglevel@^1.4.1: version "1.6.1" From 2800a47cea79abd779a20950401a06aab57c22fc Mon Sep 17 00:00:00 2001 From: James Brooks Date: Thu, 11 Jul 2019 08:25:58 +0100 Subject: [PATCH 52/54] Remove unused TestbenchCore package --- composer.json | 1 - composer.lock | 182 +++++++++++++++++++++++++------------------------- 2 files changed, 91 insertions(+), 92 deletions(-) diff --git a/composer.json b/composer.json index 4629aa57..bfcd4ba3 100644 --- a/composer.json +++ b/composer.json @@ -63,7 +63,6 @@ "filp/whoops": "^2.3", "fzaninotto/faker": "^1.8", "graham-campbell/analyzer": "^2.1", - "graham-campbell/testbench-core": "^3.0", "mockery/mockery": "^1.2", "phpunit/phpunit": "^7.4", "tightenco/mailthief": "^0.3.14" diff --git a/composer.lock b/composer.lock index 6ce52b21..4ff5a27c 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "256b508cf308e596a15b1e4625e3e932", + "content-hash": "0bb0a073b8972260345c7a83eebb9243", "packages": [ { "name": "alt-three/badger", @@ -358,16 +358,16 @@ }, { "name": "aws/aws-sdk-php", - "version": "3.104.1", + "version": "3.106.1", "source": { "type": "git", "url": "https://github.com/aws/aws-sdk-php.git", - "reference": "295706ab2134bf842837fa0b0162ff3aef8b0aa4" + "reference": "ed3bd17b8a6caa5c99ed5fe559d061a1f9fc2c8c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/295706ab2134bf842837fa0b0162ff3aef8b0aa4", - "reference": "295706ab2134bf842837fa0b0162ff3aef8b0aa4", + "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/ed3bd17b8a6caa5c99ed5fe559d061a1f9fc2c8c", + "reference": "ed3bd17b8a6caa5c99ed5fe559d061a1f9fc2c8c", "shasum": "" }, "require": { @@ -437,7 +437,7 @@ "s3", "sdk" ], - "time": "2019-07-03T18:08:50+00:00" + "time": "2019-07-10T18:29:49+00:00" }, { "name": "bacon/bacon-qr-code", @@ -1350,16 +1350,16 @@ }, { "name": "graham-campbell/guzzle-factory", - "version": "v3.0.0", + "version": "v3.0.1", "source": { "type": "git", "url": "https://github.com/GrahamCampbell/Guzzle-Factory.git", - "reference": "ce3b6e4c6761537e977833e949aa3e4333075a0d" + "reference": "5953039c541533647110f8c8f48cbc428d51beb1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/GrahamCampbell/Guzzle-Factory/zipball/ce3b6e4c6761537e977833e949aa3e4333075a0d", - "reference": "ce3b6e4c6761537e977833e949aa3e4333075a0d", + "url": "https://api.github.com/repos/GrahamCampbell/Guzzle-Factory/zipball/5953039c541533647110f8c8f48cbc428d51beb1", + "reference": "5953039c541533647110f8c8f48cbc428d51beb1", "shasum": "" }, "require": { @@ -1367,8 +1367,8 @@ "php": "^7.0" }, "require-dev": { - "graham-campbell/analyzer": "^2.0", - "phpunit/phpunit": "^6.5" + "graham-campbell/analyzer": "^2.1", + "phpunit/phpunit": "^6.5|^7.0|^8.0" }, "type": "library", "extra": { @@ -1400,7 +1400,7 @@ "Guzzle-Factory", "http" ], - "time": "2017-12-27T23:12:00+00:00" + "time": "2019-06-30T12:48:08+00:00" }, { "name": "graham-campbell/markdown", @@ -2708,16 +2708,16 @@ }, { "name": "nesbot/carbon", - "version": "1.38.4", + "version": "1.39.0", "source": { "type": "git", "url": "https://github.com/briannesbitt/Carbon.git", - "reference": "8dd4172bfe1784952c4d58c4db725d183b1c23ad" + "reference": "dd62a58af4e0775a45ea5f99d0363d81b7d9a1e0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/8dd4172bfe1784952c4d58c4db725d183b1c23ad", - "reference": "8dd4172bfe1784952c4d58c4db725d183b1c23ad", + "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/dd62a58af4e0775a45ea5f99d0363d81b7d9a1e0", + "reference": "dd62a58af4e0775a45ea5f99d0363d81b7d9a1e0", "shasum": "" }, "require": { @@ -2765,7 +2765,7 @@ "datetime", "time" ], - "time": "2019-06-03T15:41:40+00:00" + "time": "2019-06-11T09:07:59+00:00" }, { "name": "nexmo/client", @@ -2868,16 +2868,16 @@ }, { "name": "opis/closure", - "version": "3.3.0", + "version": "3.3.1", "source": { "type": "git", "url": "https://github.com/opis/closure.git", - "reference": "f846725591203098246276b2e7b9e8b7814c4965" + "reference": "92927e26d7fc3f271efe1f55bdbb073fbb2f0722" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/opis/closure/zipball/f846725591203098246276b2e7b9e8b7814c4965", - "reference": "f846725591203098246276b2e7b9e8b7814c4965", + "url": "https://api.github.com/repos/opis/closure/zipball/92927e26d7fc3f271efe1f55bdbb073fbb2f0722", + "reference": "92927e26d7fc3f271efe1f55bdbb073fbb2f0722", "shasum": "" }, "require": { @@ -2925,7 +2925,7 @@ "serialization", "serialize" ], - "time": "2019-05-31T20:04:32+00:00" + "time": "2019-07-09T21:58:11+00:00" }, { "name": "php-http/guzzle6-adapter", @@ -3754,16 +3754,16 @@ }, { "name": "symfony/console", - "version": "v4.3.1", + "version": "v4.3.2", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "d50bbeeb0e17e6dd4124ea391eff235e932cbf64" + "reference": "b592b26a24265a35172d8a2094d8b10f22b7cc39" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/d50bbeeb0e17e6dd4124ea391eff235e932cbf64", - "reference": "d50bbeeb0e17e6dd4124ea391eff235e932cbf64", + "url": "https://api.github.com/repos/symfony/console/zipball/b592b26a24265a35172d8a2094d8b10f22b7cc39", + "reference": "b592b26a24265a35172d8a2094d8b10f22b7cc39", "shasum": "" }, "require": { @@ -3825,11 +3825,11 @@ ], "description": "Symfony Console Component", "homepage": "https://symfony.com", - "time": "2019-06-05T13:25:51+00:00" + "time": "2019-06-13T11:03:18+00:00" }, { "name": "symfony/css-selector", - "version": "v4.3.1", + "version": "v4.3.2", "source": { "type": "git", "url": "https://github.com/symfony/css-selector.git", @@ -3882,16 +3882,16 @@ }, { "name": "symfony/debug", - "version": "v4.3.1", + "version": "v4.3.2", "source": { "type": "git", "url": "https://github.com/symfony/debug.git", - "reference": "4e025104f1f9adb1f7a2d14fb102c9986d6e97c6" + "reference": "d8f4fb38152e0eb6a433705e5f661d25b32c5fcd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/debug/zipball/4e025104f1f9adb1f7a2d14fb102c9986d6e97c6", - "reference": "4e025104f1f9adb1f7a2d14fb102c9986d6e97c6", + "url": "https://api.github.com/repos/symfony/debug/zipball/d8f4fb38152e0eb6a433705e5f661d25b32c5fcd", + "reference": "d8f4fb38152e0eb6a433705e5f661d25b32c5fcd", "shasum": "" }, "require": { @@ -3934,20 +3934,20 @@ ], "description": "Symfony Debug Component", "homepage": "https://symfony.com", - "time": "2019-05-30T16:10:05+00:00" + "time": "2019-06-19T15:27:09+00:00" }, { "name": "symfony/event-dispatcher", - "version": "v4.3.1", + "version": "v4.3.2", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher.git", - "reference": "4e6c670af81c4fb0b6c08b035530a9915d0b691f" + "reference": "d257021c1ab28d48d24a16de79dfab445ce93398" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/4e6c670af81c4fb0b6c08b035530a9915d0b691f", - "reference": "4e6c670af81c4fb0b6c08b035530a9915d0b691f", + "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/d257021c1ab28d48d24a16de79dfab445ce93398", + "reference": "d257021c1ab28d48d24a16de79dfab445ce93398", "shasum": "" }, "require": { @@ -4004,7 +4004,7 @@ ], "description": "Symfony EventDispatcher Component", "homepage": "https://symfony.com", - "time": "2019-05-30T16:10:05+00:00" + "time": "2019-06-13T11:03:18+00:00" }, { "name": "symfony/event-dispatcher-contracts", @@ -4066,16 +4066,16 @@ }, { "name": "symfony/finder", - "version": "v4.3.1", + "version": "v4.3.2", "source": { "type": "git", "url": "https://github.com/symfony/finder.git", - "reference": "b3d4f4c0e4eadfdd8b296af9ca637cfbf51d8176" + "reference": "33c21f7d5d3dc8a140c282854a7e13aeb5d0f91a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/finder/zipball/b3d4f4c0e4eadfdd8b296af9ca637cfbf51d8176", - "reference": "b3d4f4c0e4eadfdd8b296af9ca637cfbf51d8176", + "url": "https://api.github.com/repos/symfony/finder/zipball/33c21f7d5d3dc8a140c282854a7e13aeb5d0f91a", + "reference": "33c21f7d5d3dc8a140c282854a7e13aeb5d0f91a", "shasum": "" }, "require": { @@ -4111,20 +4111,20 @@ ], "description": "Symfony Finder Component", "homepage": "https://symfony.com", - "time": "2019-05-26T20:47:49+00:00" + "time": "2019-06-13T11:03:18+00:00" }, { "name": "symfony/http-foundation", - "version": "v4.3.1", + "version": "v4.3.2", "source": { "type": "git", "url": "https://github.com/symfony/http-foundation.git", - "reference": "b7e4945dd9b277cd24e93566e4da0a87956392a9" + "reference": "e1b507fcfa4e87d192281774b5ecd4265370180d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-foundation/zipball/b7e4945dd9b277cd24e93566e4da0a87956392a9", - "reference": "b7e4945dd9b277cd24e93566e4da0a87956392a9", + "url": "https://api.github.com/repos/symfony/http-foundation/zipball/e1b507fcfa4e87d192281774b5ecd4265370180d", + "reference": "e1b507fcfa4e87d192281774b5ecd4265370180d", "shasum": "" }, "require": { @@ -4166,20 +4166,20 @@ ], "description": "Symfony HttpFoundation Component", "homepage": "https://symfony.com", - "time": "2019-06-06T10:05:02+00:00" + "time": "2019-06-26T09:25:00+00:00" }, { "name": "symfony/http-kernel", - "version": "v4.3.1", + "version": "v4.3.2", "source": { "type": "git", "url": "https://github.com/symfony/http-kernel.git", - "reference": "738ad561cd6a8d1c44ee1da941b2e628e264c429" + "reference": "4150f71e27ed37a74700561b77e3dbd754cbb44d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-kernel/zipball/738ad561cd6a8d1c44ee1da941b2e628e264c429", - "reference": "738ad561cd6a8d1c44ee1da941b2e628e264c429", + "url": "https://api.github.com/repos/symfony/http-kernel/zipball/4150f71e27ed37a74700561b77e3dbd754cbb44d", + "reference": "4150f71e27ed37a74700561b77e3dbd754cbb44d", "shasum": "" }, "require": { @@ -4258,11 +4258,11 @@ ], "description": "Symfony HttpKernel Component", "homepage": "https://symfony.com", - "time": "2019-06-06T13:23:34+00:00" + "time": "2019-06-26T14:26:16+00:00" }, { "name": "symfony/mime", - "version": "v4.3.1", + "version": "v4.3.2", "source": { "type": "git", "url": "https://github.com/symfony/mime.git", @@ -4613,7 +4613,7 @@ }, { "name": "symfony/process", - "version": "v4.3.1", + "version": "v4.3.2", "source": { "type": "git", "url": "https://github.com/symfony/process.git", @@ -4662,16 +4662,16 @@ }, { "name": "symfony/routing", - "version": "v4.3.1", + "version": "v4.3.2", "source": { "type": "git", "url": "https://github.com/symfony/routing.git", - "reference": "9b31cd24f6ad2cebde6845f6daa9c6d69efe2465" + "reference": "2ef809021d72071c611b218c47a3bf3b17b7325e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/routing/zipball/9b31cd24f6ad2cebde6845f6daa9c6d69efe2465", - "reference": "9b31cd24f6ad2cebde6845f6daa9c6d69efe2465", + "url": "https://api.github.com/repos/symfony/routing/zipball/2ef809021d72071c611b218c47a3bf3b17b7325e", + "reference": "2ef809021d72071c611b218c47a3bf3b17b7325e", "shasum": "" }, "require": { @@ -4734,7 +4734,7 @@ "uri", "url" ], - "time": "2019-06-05T09:16:20+00:00" + "time": "2019-06-26T13:54:39+00:00" }, { "name": "symfony/service-contracts", @@ -4796,16 +4796,16 @@ }, { "name": "symfony/translation", - "version": "v4.3.1", + "version": "v4.3.2", "source": { "type": "git", "url": "https://github.com/symfony/translation.git", - "reference": "5dda505e5f65d759741dfaf4e54b36010a4b57aa" + "reference": "934ab1d18545149e012aa898cf02e9f23790f7a0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/translation/zipball/5dda505e5f65d759741dfaf4e54b36010a4b57aa", - "reference": "5dda505e5f65d759741dfaf4e54b36010a4b57aa", + "url": "https://api.github.com/repos/symfony/translation/zipball/934ab1d18545149e012aa898cf02e9f23790f7a0", + "reference": "934ab1d18545149e012aa898cf02e9f23790f7a0", "shasum": "" }, "require": { @@ -4868,7 +4868,7 @@ ], "description": "Symfony Translation Component", "homepage": "https://symfony.com", - "time": "2019-06-03T20:27:40+00:00" + "time": "2019-06-13T11:03:18+00:00" }, { "name": "symfony/translation-contracts", @@ -4929,16 +4929,16 @@ }, { "name": "symfony/var-dumper", - "version": "v4.3.1", + "version": "v4.3.2", "source": { "type": "git", "url": "https://github.com/symfony/var-dumper.git", - "reference": "f974f448154928d2b5fb7c412bd23b81d063f34b" + "reference": "45d6ef73671995aca565a1aa3d9a432a3ea63f91" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-dumper/zipball/f974f448154928d2b5fb7c412bd23b81d063f34b", - "reference": "f974f448154928d2b5fb7c412bd23b81d063f34b", + "url": "https://api.github.com/repos/symfony/var-dumper/zipball/45d6ef73671995aca565a1aa3d9a432a3ea63f91", + "reference": "45d6ef73671995aca565a1aa3d9a432a3ea63f91", "shasum": "" }, "require": { @@ -5001,7 +5001,7 @@ "debug", "dump" ], - "time": "2019-06-05T02:08:12+00:00" + "time": "2019-06-17T17:37:00+00:00" }, { "name": "tijsverkoyen/css-to-inline-styles", @@ -5170,16 +5170,16 @@ }, { "name": "zendframework/zend-diactoros", - "version": "2.1.2", + "version": "2.1.3", "source": { "type": "git", "url": "https://github.com/zendframework/zend-diactoros.git", - "reference": "37bf68b428850ee26ed7c3be6c26236dd95a95f1" + "reference": "279723778c40164bcf984a2df12ff2c6ec5e61c1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zendframework/zend-diactoros/zipball/37bf68b428850ee26ed7c3be6c26236dd95a95f1", - "reference": "37bf68b428850ee26ed7c3be6c26236dd95a95f1", + "url": "https://api.github.com/repos/zendframework/zend-diactoros/zipball/279723778c40164bcf984a2df12ff2c6ec5e61c1", + "reference": "279723778c40164bcf984a2df12ff2c6ec5e61c1", "shasum": "" }, "require": { @@ -5232,7 +5232,7 @@ "psr", "psr-7" ], - "time": "2019-04-29T21:11:00+00:00" + "time": "2019-07-10T16:13:25+00:00" } ], "packages-dev": [ @@ -5649,16 +5649,16 @@ }, { "name": "filp/whoops", - "version": "2.4.0", + "version": "2.4.1", "source": { "type": "git", "url": "https://github.com/filp/whoops.git", - "reference": "1a1a1044ad00e285bd2825fac4c3a0443d90ad33" + "reference": "6fb502c23885701a991b0bba974b1a8eb6673577" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/filp/whoops/zipball/1a1a1044ad00e285bd2825fac4c3a0443d90ad33", - "reference": "1a1a1044ad00e285bd2825fac4c3a0443d90ad33", + "url": "https://api.github.com/repos/filp/whoops/zipball/6fb502c23885701a991b0bba974b1a8eb6673577", + "reference": "6fb502c23885701a991b0bba974b1a8eb6673577", "shasum": "" }, "require": { @@ -5706,7 +5706,7 @@ "throwable", "whoops" ], - "time": "2019-06-23T09:00:00+00:00" + "time": "2019-07-04T09:00:00+00:00" }, { "name": "fzaninotto/faker", @@ -5818,16 +5818,16 @@ }, { "name": "graham-campbell/testbench-core", - "version": "v3.0.2", + "version": "v3.0.3", "source": { "type": "git", "url": "https://github.com/GrahamCampbell/Laravel-TestBench-Core.git", - "reference": "138218735a65f4532d6c4242a44ffa6c591bca09" + "reference": "436b97fe9327ba15b847ae2f5f1fb2bd5a28d400" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/GrahamCampbell/Laravel-TestBench-Core/zipball/138218735a65f4532d6c4242a44ffa6c591bca09", - "reference": "138218735a65f4532d6c4242a44ffa6c591bca09", + "url": "https://api.github.com/repos/GrahamCampbell/Laravel-TestBench-Core/zipball/436b97fe9327ba15b847ae2f5f1fb2bd5a28d400", + "reference": "436b97fe9327ba15b847ae2f5f1fb2bd5a28d400", "shasum": "" }, "require": { @@ -5875,7 +5875,7 @@ "testbench-core", "testing" ], - "time": "2019-02-16T13:26:40+00:00" + "time": "2019-06-30T23:05:29+00:00" }, { "name": "hamcrest/hamcrest-php", @@ -6621,16 +6621,16 @@ }, { "name": "phpunit/php-token-stream", - "version": "3.0.1", + "version": "3.0.2", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-token-stream.git", - "reference": "c99e3be9d3e85f60646f152f9002d46ed7770d18" + "reference": "c4a66b97f040e3e20b3aa2a243230a1c3a9f7c8c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/c99e3be9d3e85f60646f152f9002d46ed7770d18", - "reference": "c99e3be9d3e85f60646f152f9002d46ed7770d18", + "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/c4a66b97f040e3e20b3aa2a243230a1c3a9f7c8c", + "reference": "c4a66b97f040e3e20b3aa2a243230a1c3a9f7c8c", "shasum": "" }, "require": { @@ -6666,7 +6666,7 @@ "keywords": [ "tokenizer" ], - "time": "2018-10-30T05:52:18+00:00" + "time": "2019-07-08T05:24:54+00:00" }, { "name": "phpunit/phpunit", From 045c68e5078e0bbe38206de150ed90e5061adb96 Mon Sep 17 00:00:00 2001 From: James Brooks Date: Thu, 11 Jul 2019 12:53:11 +0100 Subject: [PATCH 53/54] Update deps --- composer.lock | 180 +++++++++++++++++++++++++------------------------- 1 file changed, 90 insertions(+), 90 deletions(-) diff --git a/composer.lock b/composer.lock index 6ce52b21..36ee999f 100644 --- a/composer.lock +++ b/composer.lock @@ -358,16 +358,16 @@ }, { "name": "aws/aws-sdk-php", - "version": "3.104.1", + "version": "3.106.1", "source": { "type": "git", "url": "https://github.com/aws/aws-sdk-php.git", - "reference": "295706ab2134bf842837fa0b0162ff3aef8b0aa4" + "reference": "ed3bd17b8a6caa5c99ed5fe559d061a1f9fc2c8c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/295706ab2134bf842837fa0b0162ff3aef8b0aa4", - "reference": "295706ab2134bf842837fa0b0162ff3aef8b0aa4", + "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/ed3bd17b8a6caa5c99ed5fe559d061a1f9fc2c8c", + "reference": "ed3bd17b8a6caa5c99ed5fe559d061a1f9fc2c8c", "shasum": "" }, "require": { @@ -437,7 +437,7 @@ "s3", "sdk" ], - "time": "2019-07-03T18:08:50+00:00" + "time": "2019-07-10T18:29:49+00:00" }, { "name": "bacon/bacon-qr-code", @@ -1350,16 +1350,16 @@ }, { "name": "graham-campbell/guzzle-factory", - "version": "v3.0.0", + "version": "v3.0.1", "source": { "type": "git", "url": "https://github.com/GrahamCampbell/Guzzle-Factory.git", - "reference": "ce3b6e4c6761537e977833e949aa3e4333075a0d" + "reference": "5953039c541533647110f8c8f48cbc428d51beb1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/GrahamCampbell/Guzzle-Factory/zipball/ce3b6e4c6761537e977833e949aa3e4333075a0d", - "reference": "ce3b6e4c6761537e977833e949aa3e4333075a0d", + "url": "https://api.github.com/repos/GrahamCampbell/Guzzle-Factory/zipball/5953039c541533647110f8c8f48cbc428d51beb1", + "reference": "5953039c541533647110f8c8f48cbc428d51beb1", "shasum": "" }, "require": { @@ -1367,8 +1367,8 @@ "php": "^7.0" }, "require-dev": { - "graham-campbell/analyzer": "^2.0", - "phpunit/phpunit": "^6.5" + "graham-campbell/analyzer": "^2.1", + "phpunit/phpunit": "^6.5|^7.0|^8.0" }, "type": "library", "extra": { @@ -1400,7 +1400,7 @@ "Guzzle-Factory", "http" ], - "time": "2017-12-27T23:12:00+00:00" + "time": "2019-06-30T12:48:08+00:00" }, { "name": "graham-campbell/markdown", @@ -2708,16 +2708,16 @@ }, { "name": "nesbot/carbon", - "version": "1.38.4", + "version": "1.39.0", "source": { "type": "git", "url": "https://github.com/briannesbitt/Carbon.git", - "reference": "8dd4172bfe1784952c4d58c4db725d183b1c23ad" + "reference": "dd62a58af4e0775a45ea5f99d0363d81b7d9a1e0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/8dd4172bfe1784952c4d58c4db725d183b1c23ad", - "reference": "8dd4172bfe1784952c4d58c4db725d183b1c23ad", + "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/dd62a58af4e0775a45ea5f99d0363d81b7d9a1e0", + "reference": "dd62a58af4e0775a45ea5f99d0363d81b7d9a1e0", "shasum": "" }, "require": { @@ -2765,7 +2765,7 @@ "datetime", "time" ], - "time": "2019-06-03T15:41:40+00:00" + "time": "2019-06-11T09:07:59+00:00" }, { "name": "nexmo/client", @@ -2868,16 +2868,16 @@ }, { "name": "opis/closure", - "version": "3.3.0", + "version": "3.3.1", "source": { "type": "git", "url": "https://github.com/opis/closure.git", - "reference": "f846725591203098246276b2e7b9e8b7814c4965" + "reference": "92927e26d7fc3f271efe1f55bdbb073fbb2f0722" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/opis/closure/zipball/f846725591203098246276b2e7b9e8b7814c4965", - "reference": "f846725591203098246276b2e7b9e8b7814c4965", + "url": "https://api.github.com/repos/opis/closure/zipball/92927e26d7fc3f271efe1f55bdbb073fbb2f0722", + "reference": "92927e26d7fc3f271efe1f55bdbb073fbb2f0722", "shasum": "" }, "require": { @@ -2925,7 +2925,7 @@ "serialization", "serialize" ], - "time": "2019-05-31T20:04:32+00:00" + "time": "2019-07-09T21:58:11+00:00" }, { "name": "php-http/guzzle6-adapter", @@ -3754,16 +3754,16 @@ }, { "name": "symfony/console", - "version": "v4.3.1", + "version": "v4.3.2", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "d50bbeeb0e17e6dd4124ea391eff235e932cbf64" + "reference": "b592b26a24265a35172d8a2094d8b10f22b7cc39" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/d50bbeeb0e17e6dd4124ea391eff235e932cbf64", - "reference": "d50bbeeb0e17e6dd4124ea391eff235e932cbf64", + "url": "https://api.github.com/repos/symfony/console/zipball/b592b26a24265a35172d8a2094d8b10f22b7cc39", + "reference": "b592b26a24265a35172d8a2094d8b10f22b7cc39", "shasum": "" }, "require": { @@ -3825,11 +3825,11 @@ ], "description": "Symfony Console Component", "homepage": "https://symfony.com", - "time": "2019-06-05T13:25:51+00:00" + "time": "2019-06-13T11:03:18+00:00" }, { "name": "symfony/css-selector", - "version": "v4.3.1", + "version": "v4.3.2", "source": { "type": "git", "url": "https://github.com/symfony/css-selector.git", @@ -3882,16 +3882,16 @@ }, { "name": "symfony/debug", - "version": "v4.3.1", + "version": "v4.3.2", "source": { "type": "git", "url": "https://github.com/symfony/debug.git", - "reference": "4e025104f1f9adb1f7a2d14fb102c9986d6e97c6" + "reference": "d8f4fb38152e0eb6a433705e5f661d25b32c5fcd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/debug/zipball/4e025104f1f9adb1f7a2d14fb102c9986d6e97c6", - "reference": "4e025104f1f9adb1f7a2d14fb102c9986d6e97c6", + "url": "https://api.github.com/repos/symfony/debug/zipball/d8f4fb38152e0eb6a433705e5f661d25b32c5fcd", + "reference": "d8f4fb38152e0eb6a433705e5f661d25b32c5fcd", "shasum": "" }, "require": { @@ -3934,20 +3934,20 @@ ], "description": "Symfony Debug Component", "homepage": "https://symfony.com", - "time": "2019-05-30T16:10:05+00:00" + "time": "2019-06-19T15:27:09+00:00" }, { "name": "symfony/event-dispatcher", - "version": "v4.3.1", + "version": "v4.3.2", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher.git", - "reference": "4e6c670af81c4fb0b6c08b035530a9915d0b691f" + "reference": "d257021c1ab28d48d24a16de79dfab445ce93398" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/4e6c670af81c4fb0b6c08b035530a9915d0b691f", - "reference": "4e6c670af81c4fb0b6c08b035530a9915d0b691f", + "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/d257021c1ab28d48d24a16de79dfab445ce93398", + "reference": "d257021c1ab28d48d24a16de79dfab445ce93398", "shasum": "" }, "require": { @@ -4004,7 +4004,7 @@ ], "description": "Symfony EventDispatcher Component", "homepage": "https://symfony.com", - "time": "2019-05-30T16:10:05+00:00" + "time": "2019-06-13T11:03:18+00:00" }, { "name": "symfony/event-dispatcher-contracts", @@ -4066,16 +4066,16 @@ }, { "name": "symfony/finder", - "version": "v4.3.1", + "version": "v4.3.2", "source": { "type": "git", "url": "https://github.com/symfony/finder.git", - "reference": "b3d4f4c0e4eadfdd8b296af9ca637cfbf51d8176" + "reference": "33c21f7d5d3dc8a140c282854a7e13aeb5d0f91a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/finder/zipball/b3d4f4c0e4eadfdd8b296af9ca637cfbf51d8176", - "reference": "b3d4f4c0e4eadfdd8b296af9ca637cfbf51d8176", + "url": "https://api.github.com/repos/symfony/finder/zipball/33c21f7d5d3dc8a140c282854a7e13aeb5d0f91a", + "reference": "33c21f7d5d3dc8a140c282854a7e13aeb5d0f91a", "shasum": "" }, "require": { @@ -4111,20 +4111,20 @@ ], "description": "Symfony Finder Component", "homepage": "https://symfony.com", - "time": "2019-05-26T20:47:49+00:00" + "time": "2019-06-13T11:03:18+00:00" }, { "name": "symfony/http-foundation", - "version": "v4.3.1", + "version": "v4.3.2", "source": { "type": "git", "url": "https://github.com/symfony/http-foundation.git", - "reference": "b7e4945dd9b277cd24e93566e4da0a87956392a9" + "reference": "e1b507fcfa4e87d192281774b5ecd4265370180d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-foundation/zipball/b7e4945dd9b277cd24e93566e4da0a87956392a9", - "reference": "b7e4945dd9b277cd24e93566e4da0a87956392a9", + "url": "https://api.github.com/repos/symfony/http-foundation/zipball/e1b507fcfa4e87d192281774b5ecd4265370180d", + "reference": "e1b507fcfa4e87d192281774b5ecd4265370180d", "shasum": "" }, "require": { @@ -4166,20 +4166,20 @@ ], "description": "Symfony HttpFoundation Component", "homepage": "https://symfony.com", - "time": "2019-06-06T10:05:02+00:00" + "time": "2019-06-26T09:25:00+00:00" }, { "name": "symfony/http-kernel", - "version": "v4.3.1", + "version": "v4.3.2", "source": { "type": "git", "url": "https://github.com/symfony/http-kernel.git", - "reference": "738ad561cd6a8d1c44ee1da941b2e628e264c429" + "reference": "4150f71e27ed37a74700561b77e3dbd754cbb44d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-kernel/zipball/738ad561cd6a8d1c44ee1da941b2e628e264c429", - "reference": "738ad561cd6a8d1c44ee1da941b2e628e264c429", + "url": "https://api.github.com/repos/symfony/http-kernel/zipball/4150f71e27ed37a74700561b77e3dbd754cbb44d", + "reference": "4150f71e27ed37a74700561b77e3dbd754cbb44d", "shasum": "" }, "require": { @@ -4258,11 +4258,11 @@ ], "description": "Symfony HttpKernel Component", "homepage": "https://symfony.com", - "time": "2019-06-06T13:23:34+00:00" + "time": "2019-06-26T14:26:16+00:00" }, { "name": "symfony/mime", - "version": "v4.3.1", + "version": "v4.3.2", "source": { "type": "git", "url": "https://github.com/symfony/mime.git", @@ -4613,7 +4613,7 @@ }, { "name": "symfony/process", - "version": "v4.3.1", + "version": "v4.3.2", "source": { "type": "git", "url": "https://github.com/symfony/process.git", @@ -4662,16 +4662,16 @@ }, { "name": "symfony/routing", - "version": "v4.3.1", + "version": "v4.3.2", "source": { "type": "git", "url": "https://github.com/symfony/routing.git", - "reference": "9b31cd24f6ad2cebde6845f6daa9c6d69efe2465" + "reference": "2ef809021d72071c611b218c47a3bf3b17b7325e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/routing/zipball/9b31cd24f6ad2cebde6845f6daa9c6d69efe2465", - "reference": "9b31cd24f6ad2cebde6845f6daa9c6d69efe2465", + "url": "https://api.github.com/repos/symfony/routing/zipball/2ef809021d72071c611b218c47a3bf3b17b7325e", + "reference": "2ef809021d72071c611b218c47a3bf3b17b7325e", "shasum": "" }, "require": { @@ -4734,7 +4734,7 @@ "uri", "url" ], - "time": "2019-06-05T09:16:20+00:00" + "time": "2019-06-26T13:54:39+00:00" }, { "name": "symfony/service-contracts", @@ -4796,16 +4796,16 @@ }, { "name": "symfony/translation", - "version": "v4.3.1", + "version": "v4.3.2", "source": { "type": "git", "url": "https://github.com/symfony/translation.git", - "reference": "5dda505e5f65d759741dfaf4e54b36010a4b57aa" + "reference": "934ab1d18545149e012aa898cf02e9f23790f7a0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/translation/zipball/5dda505e5f65d759741dfaf4e54b36010a4b57aa", - "reference": "5dda505e5f65d759741dfaf4e54b36010a4b57aa", + "url": "https://api.github.com/repos/symfony/translation/zipball/934ab1d18545149e012aa898cf02e9f23790f7a0", + "reference": "934ab1d18545149e012aa898cf02e9f23790f7a0", "shasum": "" }, "require": { @@ -4868,7 +4868,7 @@ ], "description": "Symfony Translation Component", "homepage": "https://symfony.com", - "time": "2019-06-03T20:27:40+00:00" + "time": "2019-06-13T11:03:18+00:00" }, { "name": "symfony/translation-contracts", @@ -4929,16 +4929,16 @@ }, { "name": "symfony/var-dumper", - "version": "v4.3.1", + "version": "v4.3.2", "source": { "type": "git", "url": "https://github.com/symfony/var-dumper.git", - "reference": "f974f448154928d2b5fb7c412bd23b81d063f34b" + "reference": "45d6ef73671995aca565a1aa3d9a432a3ea63f91" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-dumper/zipball/f974f448154928d2b5fb7c412bd23b81d063f34b", - "reference": "f974f448154928d2b5fb7c412bd23b81d063f34b", + "url": "https://api.github.com/repos/symfony/var-dumper/zipball/45d6ef73671995aca565a1aa3d9a432a3ea63f91", + "reference": "45d6ef73671995aca565a1aa3d9a432a3ea63f91", "shasum": "" }, "require": { @@ -5001,7 +5001,7 @@ "debug", "dump" ], - "time": "2019-06-05T02:08:12+00:00" + "time": "2019-06-17T17:37:00+00:00" }, { "name": "tijsverkoyen/css-to-inline-styles", @@ -5170,16 +5170,16 @@ }, { "name": "zendframework/zend-diactoros", - "version": "2.1.2", + "version": "2.1.3", "source": { "type": "git", "url": "https://github.com/zendframework/zend-diactoros.git", - "reference": "37bf68b428850ee26ed7c3be6c26236dd95a95f1" + "reference": "279723778c40164bcf984a2df12ff2c6ec5e61c1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zendframework/zend-diactoros/zipball/37bf68b428850ee26ed7c3be6c26236dd95a95f1", - "reference": "37bf68b428850ee26ed7c3be6c26236dd95a95f1", + "url": "https://api.github.com/repos/zendframework/zend-diactoros/zipball/279723778c40164bcf984a2df12ff2c6ec5e61c1", + "reference": "279723778c40164bcf984a2df12ff2c6ec5e61c1", "shasum": "" }, "require": { @@ -5232,7 +5232,7 @@ "psr", "psr-7" ], - "time": "2019-04-29T21:11:00+00:00" + "time": "2019-07-10T16:13:25+00:00" } ], "packages-dev": [ @@ -5649,16 +5649,16 @@ }, { "name": "filp/whoops", - "version": "2.4.0", + "version": "2.4.1", "source": { "type": "git", "url": "https://github.com/filp/whoops.git", - "reference": "1a1a1044ad00e285bd2825fac4c3a0443d90ad33" + "reference": "6fb502c23885701a991b0bba974b1a8eb6673577" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/filp/whoops/zipball/1a1a1044ad00e285bd2825fac4c3a0443d90ad33", - "reference": "1a1a1044ad00e285bd2825fac4c3a0443d90ad33", + "url": "https://api.github.com/repos/filp/whoops/zipball/6fb502c23885701a991b0bba974b1a8eb6673577", + "reference": "6fb502c23885701a991b0bba974b1a8eb6673577", "shasum": "" }, "require": { @@ -5706,7 +5706,7 @@ "throwable", "whoops" ], - "time": "2019-06-23T09:00:00+00:00" + "time": "2019-07-04T09:00:00+00:00" }, { "name": "fzaninotto/faker", @@ -5818,16 +5818,16 @@ }, { "name": "graham-campbell/testbench-core", - "version": "v3.0.2", + "version": "v3.0.3", "source": { "type": "git", "url": "https://github.com/GrahamCampbell/Laravel-TestBench-Core.git", - "reference": "138218735a65f4532d6c4242a44ffa6c591bca09" + "reference": "436b97fe9327ba15b847ae2f5f1fb2bd5a28d400" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/GrahamCampbell/Laravel-TestBench-Core/zipball/138218735a65f4532d6c4242a44ffa6c591bca09", - "reference": "138218735a65f4532d6c4242a44ffa6c591bca09", + "url": "https://api.github.com/repos/GrahamCampbell/Laravel-TestBench-Core/zipball/436b97fe9327ba15b847ae2f5f1fb2bd5a28d400", + "reference": "436b97fe9327ba15b847ae2f5f1fb2bd5a28d400", "shasum": "" }, "require": { @@ -5875,7 +5875,7 @@ "testbench-core", "testing" ], - "time": "2019-02-16T13:26:40+00:00" + "time": "2019-06-30T23:05:29+00:00" }, { "name": "hamcrest/hamcrest-php", @@ -6621,16 +6621,16 @@ }, { "name": "phpunit/php-token-stream", - "version": "3.0.1", + "version": "3.0.2", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-token-stream.git", - "reference": "c99e3be9d3e85f60646f152f9002d46ed7770d18" + "reference": "c4a66b97f040e3e20b3aa2a243230a1c3a9f7c8c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/c99e3be9d3e85f60646f152f9002d46ed7770d18", - "reference": "c99e3be9d3e85f60646f152f9002d46ed7770d18", + "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/c4a66b97f040e3e20b3aa2a243230a1c3a9f7c8c", + "reference": "c4a66b97f040e3e20b3aa2a243230a1c3a9f7c8c", "shasum": "" }, "require": { @@ -6666,7 +6666,7 @@ "keywords": [ "tokenizer" ], - "time": "2018-10-30T05:52:18+00:00" + "time": "2019-07-08T05:24:54+00:00" }, { "name": "phpunit/phpunit", From 9f98683affa01af9c8f97dbde3a3fe38ec05b3ad Mon Sep 17 00:00:00 2001 From: James Brooks Date: Thu, 11 Jul 2019 13:14:16 +0100 Subject: [PATCH 54/54] Fixes #3668 --- resources/views/dashboard/components/index.blade.php | 2 +- resources/views/dashboard/incidents/add.blade.php | 4 ++-- resources/views/dashboard/partials/component.blade.php | 2 +- resources/views/partials/component.blade.php | 4 ++-- resources/views/partials/component_input.blade.php | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/resources/views/dashboard/components/index.blade.php b/resources/views/dashboard/components/index.blade.php index 393501bd..5835a477 100644 --- a/resources/views/dashboard/components/index.blade.php +++ b/resources/views/dashboard/components/index.blade.php @@ -23,7 +23,7 @@ @if($components->count() > 1) @endif - {{ $component->name }} {{ $component->human_status }} + {!! $component->name !!} {{ $component->human_status }} @if($component->group)

{{ trans('dashboard.components.listed_group', ['name' => $component->group->name]) }}

diff --git a/resources/views/dashboard/incidents/add.blade.php b/resources/views/dashboard/incidents/add.blade.php index edc98744..39531c91 100644 --- a/resources/views/dashboard/incidents/add.blade.php +++ b/resources/views/dashboard/incidents/add.blade.php @@ -83,12 +83,12 @@ @foreach($componentsInGroups as $group) @foreach($group->components as $component) - + @endforeach @endforeach @foreach($componentsOutGroups as $component) - + @endforeach
diff --git a/resources/views/dashboard/partials/component.blade.php b/resources/views/dashboard/partials/component.blade.php index 9a8f019c..fdf6e28a 100644 --- a/resources/views/dashboard/partials/component.blade.php +++ b/resources/views/dashboard/partials/component.blade.php @@ -2,7 +2,7 @@
-
{{ $component->name }}
+
{!! $component->name !!}
@foreach(trans('cachet.components.status') as $statusID => $status) diff --git a/resources/views/partials/component.blade.php b/resources/views/partials/component.blade.php index d05bc6fc..9e15f2b5 100644 --- a/resources/views/partials/component.blade.php +++ b/resources/views/partials/component.blade.php @@ -1,8 +1,8 @@
  • @if($component->link) - {{ $component->name }} + {!! $component->name !!} @else - {{ $component->name }} + {!! $component->name !!} @endif @if($component->description) diff --git a/resources/views/partials/component_input.blade.php b/resources/views/partials/component_input.blade.php index 628f2288..0ffdc50f 100644 --- a/resources/views/partials/component_input.blade.php +++ b/resources/views/partials/component_input.blade.php @@ -8,7 +8,7 @@ @if (in_array($component->id, $subscriptions) || $subscriber->global) checked="checked" @endif /> - {{ $component->name }} + {!! $component->name !!} @if($component->description)