From 129030daaf60d850ce38a769b0fb29730e54f548 Mon Sep 17 00:00:00 2001 From: Nico Stapelbroek Date: Tue, 6 Mar 2018 19:38:52 +0100 Subject: [PATCH 001/179] Save a SEO title and description when creating an incident --- .../Commands/Incident/CreateIncidentCommandHandler.php | 4 ++++ app/Http/Controllers/Dashboard/IncidentController.php | 3 ++- resources/views/dashboard/incidents/add.blade.php | 8 ++++++++ 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/app/Bus/Handlers/Commands/Incident/CreateIncidentCommandHandler.php b/app/Bus/Handlers/Commands/Incident/CreateIncidentCommandHandler.php index 4504d905..7cba6f40 100644 --- a/app/Bus/Handlers/Commands/Incident/CreateIncidentCommandHandler.php +++ b/app/Bus/Handlers/Commands/Incident/CreateIncidentCommandHandler.php @@ -104,6 +104,10 @@ class CreateIncidentCommandHandler // Store any meta? if ($meta = $command->meta) { foreach ($meta as $key => $value) { + if (empty($value)) { + continue; + } + Meta::create([ 'key' => $key, 'value' => $value, diff --git a/app/Http/Controllers/Dashboard/IncidentController.php b/app/Http/Controllers/Dashboard/IncidentController.php index cc03457d..d77e881d 100644 --- a/app/Http/Controllers/Dashboard/IncidentController.php +++ b/app/Http/Controllers/Dashboard/IncidentController.php @@ -131,7 +131,8 @@ class IncidentController extends Controller Binput::get('stickied', false), Binput::get('occurred_at'), null, - [] + [], + ['seo' => Binput::get('seo', [])] )); } catch (ValidationException $e) { return cachet_redirect('dashboard.incidents.create') diff --git a/resources/views/dashboard/incidents/add.blade.php b/resources/views/dashboard/incidents/add.blade.php index eb758484..ad931928 100644 --- a/resources/views/dashboard/incidents/add.blade.php +++ b/resources/views/dashboard/incidents/add.blade.php @@ -129,6 +129,14 @@ @endif +
+ {{ trans('forms.optional') }} + +
+
+ {{ trans('forms.optional') }} + +
From b71c61ce7d837486bbd54c2e264c70ef6ab9af34 Mon Sep 17 00:00:00 2001 From: Nico Stapelbroek Date: Tue, 6 Mar 2018 20:04:07 +0100 Subject: [PATCH 002/179] Update a SEO title and description in the incident meta --- .../Incident/UpdateIncidentCommand.php | 12 +++++- .../Incident/CreateIncidentCommandHandler.php | 16 ++------ .../Incident/UpdateIncidentCommandHandler.php | 8 ++++ app/Bus/Handlers/Traits/StoresMeta.php | 40 +++++++++++++++++++ .../Dashboard/IncidentController.php | 3 +- .../views/dashboard/incidents/edit.blade.php | 8 ++++ 6 files changed, 73 insertions(+), 14 deletions(-) create mode 100644 app/Bus/Handlers/Traits/StoresMeta.php diff --git a/app/Bus/Commands/Incident/UpdateIncidentCommand.php b/app/Bus/Commands/Incident/UpdateIncidentCommand.php index 36036e6d..d9e13cb8 100644 --- a/app/Bus/Commands/Incident/UpdateIncidentCommand.php +++ b/app/Bus/Commands/Incident/UpdateIncidentCommand.php @@ -106,6 +106,13 @@ final class UpdateIncidentCommand */ public $template_vars; + /** + * Meta key/value pairs. + * + * @var array + */ + public $meta = []; + /** * The validation rules. * @@ -122,6 +129,7 @@ final class UpdateIncidentCommand 'stickied' => 'nullable|bool', 'occurred_at' => 'nullable|string', 'template' => 'nullable|string', + 'meta' => 'nullable|array', ]; /** @@ -139,10 +147,11 @@ final class UpdateIncidentCommand * @param string|null $occurred_at * @param string|null $template * @param array $template_vars + * @param array $meta * * @return void */ - public function __construct(Incident $incident, $name, $status, $message, $visible, $component_id, $component_status, $notify, $stickied, $occurred_at, $template, array $template_vars = []) + public function __construct(Incident $incident, $name, $status, $message, $visible, $component_id, $component_status, $notify, $stickied, $occurred_at, $template, array $template_vars = [], $meta = []) { $this->incident = $incident; $this->name = $name; @@ -156,5 +165,6 @@ final class UpdateIncidentCommand $this->occurred_at = $occurred_at; $this->template = $template; $this->template_vars = $template_vars; + $this->meta = $meta; } } diff --git a/app/Bus/Handlers/Commands/Incident/CreateIncidentCommandHandler.php b/app/Bus/Handlers/Commands/Incident/CreateIncidentCommandHandler.php index 7cba6f40..76128d9b 100644 --- a/app/Bus/Handlers/Commands/Incident/CreateIncidentCommandHandler.php +++ b/app/Bus/Handlers/Commands/Incident/CreateIncidentCommandHandler.php @@ -15,6 +15,7 @@ use CachetHQ\Cachet\Bus\Commands\Component\UpdateComponentCommand; use CachetHQ\Cachet\Bus\Commands\Incident\CreateIncidentCommand; use CachetHQ\Cachet\Bus\Events\Incident\IncidentWasCreatedEvent; use CachetHQ\Cachet\Bus\Exceptions\Incident\InvalidIncidentTimestampException; +use CachetHQ\Cachet\Bus\Handlers\Traits\StoresMeta; use CachetHQ\Cachet\Models\Component; use CachetHQ\Cachet\Models\Incident; use CachetHQ\Cachet\Models\IncidentTemplate; @@ -32,6 +33,8 @@ use Twig_Loader_Array; */ class CreateIncidentCommandHandler { + use StoresMeta; + /** * The authentication guard instance. * @@ -103,18 +106,7 @@ class CreateIncidentCommandHandler // Store any meta? if ($meta = $command->meta) { - foreach ($meta as $key => $value) { - if (empty($value)) { - continue; - } - - Meta::create([ - 'key' => $key, - 'value' => $value, - 'meta_type' => 'incidents', - 'meta_id' => $incident->id, - ]); - } + $this->storeMeta($command->meta, 'incidents', $incident->id); } // Update the component. diff --git a/app/Bus/Handlers/Commands/Incident/UpdateIncidentCommandHandler.php b/app/Bus/Handlers/Commands/Incident/UpdateIncidentCommandHandler.php index 00bf9f8d..935e1d99 100644 --- a/app/Bus/Handlers/Commands/Incident/UpdateIncidentCommandHandler.php +++ b/app/Bus/Handlers/Commands/Incident/UpdateIncidentCommandHandler.php @@ -15,6 +15,7 @@ use CachetHQ\Cachet\Bus\Commands\Component\UpdateComponentCommand; use CachetHQ\Cachet\Bus\Commands\Incident\UpdateIncidentCommand; use CachetHQ\Cachet\Bus\Events\Incident\IncidentWasUpdatedEvent; use CachetHQ\Cachet\Bus\Exceptions\Incident\InvalidIncidentTimestampException; +use CachetHQ\Cachet\Bus\Handlers\Traits\StoresMeta; use CachetHQ\Cachet\Models\Component; use CachetHQ\Cachet\Models\Incident; use CachetHQ\Cachet\Models\IncidentTemplate; @@ -30,6 +31,8 @@ use Twig_Loader_Array; */ class UpdateIncidentCommandHandler { + use StoresMeta; + /** * The authentication guard instance. * @@ -86,6 +89,11 @@ class UpdateIncidentCommandHandler // Rather than making lots of updates, just fill and save. $incident->save(); + // Store any meta? + if ($meta = $command->meta) { + $this->storeMeta($command->meta, 'incidents', $incident->id); + } + // Update the component. if ($component = Component::find($command->component_id)) { dispatch(new UpdateComponentCommand( diff --git a/app/Bus/Handlers/Traits/StoresMeta.php b/app/Bus/Handlers/Traits/StoresMeta.php new file mode 100644 index 00000000..b41f0045 --- /dev/null +++ b/app/Bus/Handlers/Traits/StoresMeta.php @@ -0,0 +1,40 @@ + $value) { + if (empty($value)) { + continue; + } + + $meta = Meta::firstOrNew([ + 'key' => $key, + 'meta_type' => $type, + 'meta_id' => $id, + ]); + + $meta->value = $value; + + $meta->save(); + } + + } +} \ No newline at end of file diff --git a/app/Http/Controllers/Dashboard/IncidentController.php b/app/Http/Controllers/Dashboard/IncidentController.php index d77e881d..4d75ff7f 100644 --- a/app/Http/Controllers/Dashboard/IncidentController.php +++ b/app/Http/Controllers/Dashboard/IncidentController.php @@ -262,7 +262,8 @@ class IncidentController extends Controller Binput::get('stickied', false), Binput::get('occurred_at'), null, - [] + [], + ['seo' => Binput::get('seo', [])] )); } catch (ValidationException $e) { return cachet_redirect('dashboard.incidents.edit', ['id' => $incident->id]) diff --git a/resources/views/dashboard/incidents/edit.blade.php b/resources/views/dashboard/incidents/edit.blade.php index 6cb199f4..02d4a1fa 100644 --- a/resources/views/dashboard/incidents/edit.blade.php +++ b/resources/views/dashboard/incidents/edit.blade.php @@ -111,6 +111,14 @@ {{ trans('forms.optional') }}
+
+ {{ trans('forms.optional') }} + +
+
+ {{ trans('forms.optional') }} + +
From a42c2bb017d2434c12e96ae51b5248d44da454f7 Mon Sep 17 00:00:00 2001 From: Nico Stapelbroek Date: Tue, 6 Mar 2018 20:11:13 +0100 Subject: [PATCH 003/179] Use the custom SEO title and descriptions in the frontend --- resources/views/single-incident.blade.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/views/single-incident.blade.php b/resources/views/single-incident.blade.php index 59d88dc1..e3443eaf 100644 --- a/resources/views/single-incident.blade.php +++ b/resources/views/single-incident.blade.php @@ -1,8 +1,8 @@ @extends('layout.master') -@section('title', $incident->name.' | '.$site_title) +@section('title', array_get($incident->meta, 'seo.title', $incident->name).' | '.$site_title) -@section('description', trans('cachet.meta.description.incident', ['name' => $incident->name, 'date' => $incident->occurred_at_formatted])) +@section('description', array_get($incident->meta, 'seo.description', trans('cachet.meta.description.incident', ['name' => $incident->name, 'date' => $incident->occurred_at_formatted]))) @section('bodyClass', 'no-padding') From da4d036883102cfbbd144828790d0d800bed5261 Mon Sep 17 00:00:00 2001 From: Nico Stapelbroek Date: Tue, 6 Mar 2018 20:17:43 +0100 Subject: [PATCH 004/179] Add translations --- resources/lang/en/forms.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/resources/lang/en/forms.php b/resources/lang/en/forms.php index cb1ed400..73924820 100644 --- a/resources/lang/en/forms.php +++ b/resources/lang/en/forms.php @@ -226,6 +226,11 @@ return [ 'timezone' => 'Select Timezone', ], + 'seo' => [ + 'title' => 'SEO title', + 'description' => 'SEO description', + ], + // Buttons 'add' => 'Add', 'save' => 'Save', From f4f77b1f1bd0ce185356d1f249ed9ad6690f3af7 Mon Sep 17 00:00:00 2001 From: Nico Stapelbroek Date: Tue, 6 Mar 2018 20:28:32 +0100 Subject: [PATCH 005/179] Fix CodeStyle --- app/Bus/Handlers/Traits/StoresMeta.php | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/app/Bus/Handlers/Traits/StoresMeta.php b/app/Bus/Handlers/Traits/StoresMeta.php index b41f0045..d22a75df 100644 --- a/app/Bus/Handlers/Traits/StoresMeta.php +++ b/app/Bus/Handlers/Traits/StoresMeta.php @@ -1,5 +1,14 @@ $key, + 'key' => $key, 'meta_type' => $type, - 'meta_id' => $id, + 'meta_id' => $id, ]); $meta->value = $value; $meta->save(); } - } -} \ No newline at end of file +} From 95a76a77b7276474ace01ee60a7af82eca70a52f Mon Sep 17 00:00:00 2001 From: Nico Stapelbroek Date: Mon, 19 Mar 2018 07:22:45 +0100 Subject: [PATCH 006/179] Typehint the meta argument on the create and update incident commands --- app/Bus/Commands/Incident/CreateIncidentCommand.php | 2 +- app/Bus/Commands/Incident/UpdateIncidentCommand.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Bus/Commands/Incident/CreateIncidentCommand.php b/app/Bus/Commands/Incident/CreateIncidentCommand.php index dde666b7..4f94f2f8 100644 --- a/app/Bus/Commands/Incident/CreateIncidentCommand.php +++ b/app/Bus/Commands/Incident/CreateIncidentCommand.php @@ -140,7 +140,7 @@ final class CreateIncidentCommand * * @return void */ - public function __construct($name, $status, $message, $visible, $component_id, $component_status, $notify, $stickied, $occurred_at, $template, array $template_vars = [], $meta = []) + public function __construct($name, $status, $message, $visible, $component_id, $component_status, $notify, $stickied, $occurred_at, $template, array $template_vars = [], array $meta = []) { $this->name = $name; $this->status = $status; diff --git a/app/Bus/Commands/Incident/UpdateIncidentCommand.php b/app/Bus/Commands/Incident/UpdateIncidentCommand.php index d9e13cb8..1328b37c 100644 --- a/app/Bus/Commands/Incident/UpdateIncidentCommand.php +++ b/app/Bus/Commands/Incident/UpdateIncidentCommand.php @@ -151,7 +151,7 @@ final class UpdateIncidentCommand * * @return void */ - public function __construct(Incident $incident, $name, $status, $message, $visible, $component_id, $component_status, $notify, $stickied, $occurred_at, $template, array $template_vars = [], $meta = []) + public function __construct(Incident $incident, $name, $status, $message, $visible, $component_id, $component_status, $notify, $stickied, $occurred_at, $template, array $template_vars = [], array $meta = []) { $this->incident = $incident; $this->name = $name; From 7bb23b6108050de7251bf22ae5ec71da31d89932 Mon Sep 17 00:00:00 2001 From: Nico Stapelbroek Date: Mon, 19 Mar 2018 07:32:53 +0100 Subject: [PATCH 007/179] Remove an meta model if the corresponding value is considered empty --- app/Bus/Handlers/Traits/StoresMeta.php | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/app/Bus/Handlers/Traits/StoresMeta.php b/app/Bus/Handlers/Traits/StoresMeta.php index d22a75df..30eedf8b 100644 --- a/app/Bus/Handlers/Traits/StoresMeta.php +++ b/app/Bus/Handlers/Traits/StoresMeta.php @@ -21,6 +21,10 @@ trait StoresMeta * @param $meta * @param $type * @param $id + * + * @return void + * + * @throws \Exception */ public function storeMeta($meta, $type, $id) { @@ -30,19 +34,22 @@ trait StoresMeta } foreach ($meta as $key => $value) { - if (empty($value)) { - continue; - } - $meta = Meta::firstOrNew([ 'key' => $key, 'meta_type' => $type, 'meta_id' => $id, ]); - $meta->value = $value; + if (!empty($value)) { + $meta->value = $value; + $meta->save(); + continue; + } - $meta->save(); + // The value is empty, remove the row + if($meta->exists) { + $meta->delete(); + } } } } From 5e655e645ae7f620299a2426556281835b2c9980 Mon Sep 17 00:00:00 2001 From: Nico Stapelbroek Date: Mon, 19 Mar 2018 07:39:58 +0100 Subject: [PATCH 008/179] Capitalize Seo Title and Description --- resources/lang/en/forms.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/lang/en/forms.php b/resources/lang/en/forms.php index 73924820..a654a51c 100644 --- a/resources/lang/en/forms.php +++ b/resources/lang/en/forms.php @@ -227,8 +227,8 @@ return [ ], 'seo' => [ - 'title' => 'SEO title', - 'description' => 'SEO description', + 'title' => 'SEO Title', + 'description' => 'SEO Description', ], // Buttons From 7982e474fcbfa88984365f1e0dfbd2096781c95c Mon Sep 17 00:00:00 2001 From: Nico Stapelbroek Date: Mon, 19 Mar 2018 07:40:18 +0100 Subject: [PATCH 009/179] Also use the custom title in the og:title meta attribute --- 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 413bfd34..dd36f66c 100644 --- a/resources/views/layout/master.blade.php +++ b/resources/views/layout/master.blade.php @@ -18,7 +18,7 @@ - + From 8d8d196aac4fea034fcc9f3b3f3cc236f4e87ccc Mon Sep 17 00:00:00 2001 From: Nico Stapelbroek Date: Mon, 19 Mar 2018 09:28:03 +0100 Subject: [PATCH 010/179] Add tests for the MetaSeo fields --- app/Bus/Handlers/Traits/StoresMeta.php | 6 +- tests/Functional/Incident/MetaSeoTest.php | 184 ++++++++++++++++++++++ 2 files changed, 187 insertions(+), 3 deletions(-) create mode 100644 tests/Functional/Incident/MetaSeoTest.php diff --git a/app/Bus/Handlers/Traits/StoresMeta.php b/app/Bus/Handlers/Traits/StoresMeta.php index 30eedf8b..0c4a4c2f 100644 --- a/app/Bus/Handlers/Traits/StoresMeta.php +++ b/app/Bus/Handlers/Traits/StoresMeta.php @@ -22,9 +22,9 @@ trait StoresMeta * @param $type * @param $id * - * @return void - * * @throws \Exception + * + * @return void */ public function storeMeta($meta, $type, $id) { @@ -47,7 +47,7 @@ trait StoresMeta } // The value is empty, remove the row - if($meta->exists) { + if ($meta->exists) { $meta->delete(); } } diff --git a/tests/Functional/Incident/MetaSeoTest.php b/tests/Functional/Incident/MetaSeoTest.php new file mode 100644 index 00000000..10d375c6 --- /dev/null +++ b/tests/Functional/Incident/MetaSeoTest.php @@ -0,0 +1,184 @@ + + * @author Graham Campbell + */ +class MetaSeoTest extends AbstractTestCase +{ + use DatabaseMigrations; + + /** + * @var \Faker\Generator + */ + protected $fakerFactory; + + /** + * @var string + */ + protected $appName; + + /** + * CreateIncidentCommandTest constructor. + * + * @param null $name + * @param array $data + */ + public function __construct($name = null, array $data = [], $dataName = '') + { + parent::__construct($name, $data, $dataName); + $this->fakerFactory = \Faker\Factory::create(); + $this->appName = 'MetaSeoTest'; + } + + /** + * Setup the application. + */ + public function setUp() + { + parent::setUp(); + $this->app->make(SettingsRepository::class)->set('app_name', $this->appName); + } + + /** + * When using a custom meta description in an incident it will be + * showed in two meta tags on the incident details page. + */ + public function testCustomSeoDescriptionOnIncidentPage() + { + $description = $this->fakerFactory->sentence; + + $incident = $this->createIncidentWithMeta(['seo' => ['description' => $description]]); + $page = $this->get(sprintf('/incidents/%d', $incident->id))->response; + + $this->assertContains( + sprintf('', $description), + $page->content() + ); + $this->assertContains( + sprintf('', $description), + $page->content() + ); + } + + /** + * When using a custom meta title in an incident it will be + * showed in two meta tags on the incident details page. + */ + public function testCustomSeoTitleOnIncidentPage() + { + $title = $this->fakerFactory->title; + + $incident = $this->createIncidentWithMeta(['seo' => ['title' => $title]]); + $page = $this->get(sprintf('/incidents/%d', $incident->id))->response; + + $this->assertContains( + sprintf('', $title, $this->appName), + $page->content() + ); + $this->assertContains( + sprintf('%s | %s', $title, $this->appName), + $page->content() + ); + } + + /** + * When using no custom meta description in an incident, the application + * default generated description will be used on the incident details page. + */ + public function testNoCustomSeoDescriptionOnIncidentPage() + { + $incident = $this->createIncidentWithMeta([]); + $presenter = $this->app->make(IncidentPresenter::class); + $presenter->setWrappedObject($incident); + + $expectedDescription = sprintf( + 'Details and updates about the %s incident that occurred on %s', + $incident->name, + $presenter->occurred_at_formatted + ); + + $page = $this->get(sprintf('/incidents/%d', $incident->id))->response; + + $this->assertContains( + sprintf('', $expectedDescription), + $page->content() + ); + $this->assertContains( + sprintf('', $expectedDescription), + $page->content() + ); + } + + /** + * When using no custom meta description in an incident, the application + * default generated description will be used on the incident details page. + */ + public function testNoCustomSeoTitleOnIncidentPage() + { + $incident = $this->createIncidentWithMeta([]); + $expectedTitle = sprintf('%s | %s', $incident->name, $this->appName); + + $page = $this->get(sprintf('/incidents/%d', $incident->id))->response; + + $this->assertContains( + sprintf('', $expectedTitle), + $page->content() + ); + $this->assertContains(sprintf('%s', $expectedTitle), $page->content()); + } + + /** + * @param array $meta + * + * @return \Illuminate\Database\Eloquent\Model|static + */ + protected function createIncidentWithMeta(array $meta) + { + $user = factory(User::class)->create(); + $user->save(); + + Auth::login($user); + $name = $this->fakerFactory->name; + $message = $this->fakerFactory->sentence; + + dispatch(new CreateIncidentCommand( + $name, + $this->fakerFactory->numberBetween(0, 3), + $message, + $this->fakerFactory->boolean, + null, + null, + false, + $this->fakerFactory->boolean, + $this->fakerFactory->date('Y-m-d H:i'), + null, + [], + $meta + )); + + return Incident::where('name', '=', $name)->where('message', '=', $message)->firstOrFail(); + } +} From abf0a0ac9c4982afda598579e3626cdaa422b8a7 Mon Sep 17 00:00:00 2001 From: Nico Stapelbroek Date: Mon, 19 Mar 2018 23:47:06 +0100 Subject: [PATCH 011/179] Add tests for the StoresMeta Trait and fix the Functional MetaSeo tests --- app/Bus/Handlers/Traits/StoresMeta.php | 60 +++++++--- tests/Bus/Traits/StoresMetaTest.php | 133 ++++++++++++++++++++++ tests/Functional/Incident/MetaSeoTest.php | 15 +-- 3 files changed, 182 insertions(+), 26 deletions(-) create mode 100644 tests/Bus/Traits/StoresMetaTest.php diff --git a/app/Bus/Handlers/Traits/StoresMeta.php b/app/Bus/Handlers/Traits/StoresMeta.php index 0c4a4c2f..b308c657 100644 --- a/app/Bus/Handlers/Traits/StoresMeta.php +++ b/app/Bus/Handlers/Traits/StoresMeta.php @@ -18,38 +18,64 @@ trait StoresMeta /** * Stores all Meta values of a model. * - * @param $meta - * @param $type - * @param $id - * - * @throws \Exception + * @param array $metaData + * @param string $metaType + * @param string|int $metaId + * @param string $metaModel * * @return void */ - public function storeMeta($meta, $type, $id) + public function storeMeta($metaData, $metaType, $metaId, $metaModel = Meta::class) { // Validation required instead of type hinting because it could be passed as false or NULL - if (!is_array($meta)) { + if (!is_array($metaData)) { return; } - foreach ($meta as $key => $value) { - $meta = Meta::firstOrNew([ - 'key' => $key, - 'meta_type' => $type, - 'meta_id' => $id, - ]); + foreach ($metaData as $key => $value) { + $modelInstance = call_user_func( + [$metaModel, 'firstOrNew'], + [ + 'key' => $key, + 'meta_type' => $metaType, + 'meta_id' => $metaId, + ] + ); + $value = $this->removeEmptyValues($value); if (!empty($value)) { - $meta->value = $value; - $meta->save(); + $modelInstance->setAttribute('value', $value); + $modelInstance->save(); continue; } // The value is empty, remove the row - if ($meta->exists) { - $meta->delete(); + if ($modelInstance->exists) { + $modelInstance->delete(); } } } + + /** + * Determine if a Value is empty. + * + * @param $values + * + * @return array|mixed + */ + protected function removeEmptyValues($values) + { + if (!is_array($values)) { + return empty($values) ? null : $values; + } + + foreach ($values as $key => $value) { + if (!empty($value)) { + continue; + } + unset($values[$key]); + } + + return $values; + } } diff --git a/tests/Bus/Traits/StoresMetaTest.php b/tests/Bus/Traits/StoresMetaTest.php new file mode 100644 index 00000000..641878f8 --- /dev/null +++ b/tests/Bus/Traits/StoresMetaTest.php @@ -0,0 +1,133 @@ +markTestSkipped('This test requires Mockery'); + } + + $this->metaModel = Mockery::mock(Meta::class)->makePartial(); + $this->app->instance(Meta::class, $this->metaModel); + } + + /** + * Our Mockery expectations should count as assertions to prevent warnings from PHPUnit. + */ + public function tearDown() + { + $this->addToAssertionCount(Mockery::getContainer()->mockery_getExpectationCount()); + parent::tearDown(); + } + + /** + * Each array value passed to the MetaValues should result in a new model instance. + */ + public function testStoresMetaWithSimpleMultipleArrays() + { + $mock = $this->getMockForTrait(StoresMeta::class); + $metaData = [ + 'somekey1' => 'somevalue', + 'somekey2' => 'somevalue', + 'somekey3' => 'somevalue', + ]; + + $this->metaModel->shouldReceive('firstOrNew')->times(3)->andReturn($this->metaModel); + $this->metaModel->shouldReceive('save')->times(3); + $this->metaModel->shouldReceive('setAttribute')->times(3)->andReturnUsing(function ($key, $value) { + $this->assertEquals('value', $key); + $this->assertEquals('somevalue', $value); + + return $this->metaModel; + }); + + $mock->storeMeta($metaData, 'some_class', 1, $this->metaModel); + } + + /** + * It will pass nested arrays to the value property of the Meta model. + */ + public function testStoresNestedArraysAsSingleValue() + { + $mock = $this->getMockForTrait(StoresMeta::class); + $metaData = ['somekey1' => ['subkey' => ['second' => 'key']]]; + + $this->metaModel->shouldReceive('firstOrNew')->once()->andReturn($this->metaModel); + $this->metaModel->shouldReceive('save')->once(); + $this->metaModel->shouldReceive('setAttribute')->once()->andReturnUsing(function ($key, $value) { + $this->assertEquals('value', $key); + $this->assertEquals(['subkey' => ['second' => 'key']], $value); + + return $this->metaModel; + }); + + $mock->storeMeta($metaData, 'some_class', 1, $this->metaModel); + } + + /** + * If a value is empty or null it will be removed. + */ + public function testEmptyValuesWillBeDeleted() + { + $mock = $this->getMockForTrait(StoresMeta::class); + $metaData = ['somekey1' => '']; + + $this->metaModel->exists = true; + $this->metaModel->shouldReceive('firstOrNew')->once()->andReturn($this->metaModel); + $this->metaModel->shouldReceive('delete')->once(); + $this->metaModel->shouldReceive('setAttribute')->never(); + $this->metaModel->shouldReceive('save')->never(); + + $mock->storeMeta($metaData, 'some_class', 1, $this->metaModel); + } + + /** + * If a value is empty or null in a nested array it will be removed. + */ + public function testEmptyNestedArrayKeysAreRemoved() + { + $mock = $this->getMockForTrait(StoresMeta::class); + $metaData = ['somekey1' => ['keyWithValue' => 'value123', 'keyWithoutValue' => null]]; + + $this->metaModel->exists = true; + $this->metaModel->shouldReceive('firstOrNew')->once()->andReturn($this->metaModel); + $this->metaModel->shouldReceive('setAttribute')->once()->andReturnUsing(function ($key, $value) { + $this->assertEquals('value', $key); + $this->assertEquals(['keyWithValue' => 'value123'], $value); + + return $this->metaModel; + }); + $this->metaModel->shouldReceive('save')->once(); + $this->metaModel->shouldReceive('delete')->never(); + + $mock->storeMeta($metaData, 'some_class', 1, $this->metaModel); + } +} diff --git a/tests/Functional/Incident/MetaSeoTest.php b/tests/Functional/Incident/MetaSeoTest.php index 10d375c6..c6f6cd38 100644 --- a/tests/Functional/Incident/MetaSeoTest.php +++ b/tests/Functional/Incident/MetaSeoTest.php @@ -13,12 +13,10 @@ namespace CachetHQ\Tests\Cachet\Functional\Bus\Commands\Incident; use CachetHQ\Cachet\Bus\Commands\Incident\CreateIncidentCommand; use CachetHQ\Cachet\Models\Incident; -use CachetHQ\Cachet\Models\User; use CachetHQ\Cachet\Presenters\IncidentPresenter; use CachetHQ\Cachet\Settings\Repository as SettingsRepository; use CachetHQ\Tests\Cachet\AbstractTestCase; use Illuminate\Foundation\Testing\DatabaseMigrations; -use Illuminate\Support\Facades\Auth; /** * This is the create incident command test class. @@ -43,8 +41,9 @@ class MetaSeoTest extends AbstractTestCase /** * CreateIncidentCommandTest constructor. * - * @param null $name - * @param array $data + * @param null $name + * @param array $data + * @param string $dataName */ public function __construct($name = null, array $data = [], $dataName = '') { @@ -60,6 +59,7 @@ class MetaSeoTest extends AbstractTestCase { parent::setUp(); $this->app->make(SettingsRepository::class)->set('app_name', $this->appName); + $this->app->config->set('setting.app_name', $this->appName); } /** @@ -153,14 +153,11 @@ class MetaSeoTest extends AbstractTestCase /** * @param array $meta * - * @return \Illuminate\Database\Eloquent\Model|static + * @return Incident */ protected function createIncidentWithMeta(array $meta) { - $user = factory(User::class)->create(); - $user->save(); - - Auth::login($user); + $this->signIn(); $name = $this->fakerFactory->name; $message = $this->fakerFactory->sentence; From a6af6ada01a78b645bd644b9d472c5fc949c390f Mon Sep 17 00:00:00 2001 From: Nico Stapelbroek Date: Mon, 19 Mar 2018 23:55:38 +0100 Subject: [PATCH 012/179] Use htmlspecialchars in the assertion to match the blade escaping --- tests/Functional/Incident/MetaSeoTest.php | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/tests/Functional/Incident/MetaSeoTest.php b/tests/Functional/Incident/MetaSeoTest.php index c6f6cd38..c1ea4761 100644 --- a/tests/Functional/Incident/MetaSeoTest.php +++ b/tests/Functional/Incident/MetaSeoTest.php @@ -68,17 +68,17 @@ class MetaSeoTest extends AbstractTestCase */ public function testCustomSeoDescriptionOnIncidentPage() { - $description = $this->fakerFactory->sentence; + $expectedDescription = htmlspecialchars($this->fakerFactory->sentence); - $incident = $this->createIncidentWithMeta(['seo' => ['description' => $description]]); + $incident = $this->createIncidentWithMeta(['seo' => ['description' => $expectedDescription]]); $page = $this->get(sprintf('/incidents/%d', $incident->id))->response; $this->assertContains( - sprintf('', $description), + sprintf('', $expectedDescription), $page->content() ); $this->assertContains( - sprintf('', $description), + sprintf('', $expectedDescription), $page->content() ); } @@ -89,7 +89,7 @@ class MetaSeoTest extends AbstractTestCase */ public function testCustomSeoTitleOnIncidentPage() { - $title = $this->fakerFactory->title; + $title = htmlspecialchars($this->fakerFactory->title); $incident = $this->createIncidentWithMeta(['seo' => ['title' => $title]]); $page = $this->get(sprintf('/incidents/%d', $incident->id))->response; @@ -116,7 +116,7 @@ class MetaSeoTest extends AbstractTestCase $expectedDescription = sprintf( 'Details and updates about the %s incident that occurred on %s', - $incident->name, + htmlspecialchars($incident->name), $presenter->occurred_at_formatted ); @@ -139,7 +139,7 @@ class MetaSeoTest extends AbstractTestCase public function testNoCustomSeoTitleOnIncidentPage() { $incident = $this->createIncidentWithMeta([]); - $expectedTitle = sprintf('%s | %s', $incident->name, $this->appName); + $expectedTitle = sprintf('%s | %s', htmlspecialchars($incident->name), $this->appName); $page = $this->get(sprintf('/incidents/%d', $incident->id))->response; From 0fe924d8681ed8517ea9c275ddf3a53f35c3ea20 Mon Sep 17 00:00:00 2001 From: Nico Stapelbroek Date: Wed, 4 Apr 2018 18:45:27 +0200 Subject: [PATCH 013/179] Typehint the removeEmptyValues function --- app/Bus/Handlers/Traits/StoresMeta.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Bus/Handlers/Traits/StoresMeta.php b/app/Bus/Handlers/Traits/StoresMeta.php index b308c657..e5272ba5 100644 --- a/app/Bus/Handlers/Traits/StoresMeta.php +++ b/app/Bus/Handlers/Traits/StoresMeta.php @@ -59,7 +59,7 @@ trait StoresMeta /** * Determine if a Value is empty. * - * @param $values + * @param mixed $values * * @return array|mixed */ From 33e5c34f551cbde69a9eedff37145bb2506e5081 Mon Sep 17 00:00:00 2001 From: Nico Stapelbroek Date: Mon, 2 Jul 2018 11:29:22 +0200 Subject: [PATCH 014/179] Fix metaseo tests after updating to Laravel 5.6 --- resources/views/layout/master.blade.php | 2 +- tests/Functional/Incident/MetaSeoTest.php | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/resources/views/layout/master.blade.php b/resources/views/layout/master.blade.php index d94267e6..c63ff42e 100644 --- a/resources/views/layout/master.blade.php +++ b/resources/views/layout/master.blade.php @@ -18,7 +18,7 @@ - + diff --git a/tests/Functional/Incident/MetaSeoTest.php b/tests/Functional/Incident/MetaSeoTest.php index c1ea4761..f61742b4 100644 --- a/tests/Functional/Incident/MetaSeoTest.php +++ b/tests/Functional/Incident/MetaSeoTest.php @@ -71,7 +71,7 @@ class MetaSeoTest extends AbstractTestCase $expectedDescription = htmlspecialchars($this->fakerFactory->sentence); $incident = $this->createIncidentWithMeta(['seo' => ['description' => $expectedDescription]]); - $page = $this->get(sprintf('/incidents/%d', $incident->id))->response; + $page = $this->get(sprintf('/incidents/%d', $incident->id)); $this->assertContains( sprintf('', $expectedDescription), @@ -92,7 +92,7 @@ class MetaSeoTest extends AbstractTestCase $title = htmlspecialchars($this->fakerFactory->title); $incident = $this->createIncidentWithMeta(['seo' => ['title' => $title]]); - $page = $this->get(sprintf('/incidents/%d', $incident->id))->response; + $page = $this->get(sprintf('/incidents/%d', $incident->id)); $this->assertContains( sprintf('', $title, $this->appName), @@ -120,7 +120,7 @@ class MetaSeoTest extends AbstractTestCase $presenter->occurred_at_formatted ); - $page = $this->get(sprintf('/incidents/%d', $incident->id))->response; + $page = $this->get(sprintf('/incidents/%d', $incident->id)); $this->assertContains( sprintf('', $expectedDescription), @@ -141,7 +141,7 @@ class MetaSeoTest extends AbstractTestCase $incident = $this->createIncidentWithMeta([]); $expectedTitle = sprintf('%s | %s', htmlspecialchars($incident->name), $this->appName); - $page = $this->get(sprintf('/incidents/%d', $incident->id))->response; + $page = $this->get(sprintf('/incidents/%d', $incident->id)); $this->assertContains( sprintf('', $expectedTitle), From 8db2b47aabdef152d1204f62510aaf0bba1a3c1e Mon Sep 17 00:00:00 2001 From: Shuichiro MAKIGAKI Date: Wed, 14 Nov 2018 16:06:16 +0900 Subject: [PATCH 015/179] Enable templates in scheduled maintenance dashboard --- .../js/components/dashboard/Dashboard.vue | 1 + .../components/dashboard/ReportSchedule.vue | 30 ++++++ .../views/dashboard/maintenance/add.blade.php | 94 ++++++++++--------- 3 files changed, 79 insertions(+), 46 deletions(-) create mode 100644 resources/assets/js/components/dashboard/ReportSchedule.vue diff --git a/resources/assets/js/components/dashboard/Dashboard.vue b/resources/assets/js/components/dashboard/Dashboard.vue index 6b85c0a1..4754ab97 100644 --- a/resources/assets/js/components/dashboard/Dashboard.vue +++ b/resources/assets/js/components/dashboard/Dashboard.vue @@ -2,6 +2,7 @@ const Vue = require('vue'); Vue.component('report-incident', require('./ReportIncident')); +Vue.component('report-schedule', require('./ReportSchedule')); Vue.component('invite-team', require('./InviteTeam')); module.exports = { diff --git a/resources/assets/js/components/dashboard/ReportSchedule.vue b/resources/assets/js/components/dashboard/ReportSchedule.vue new file mode 100644 index 00000000..406f5a3f --- /dev/null +++ b/resources/assets/js/components/dashboard/ReportSchedule.vue @@ -0,0 +1,30 @@ + diff --git a/resources/views/dashboard/maintenance/add.blade.php b/resources/views/dashboard/maintenance/add.blade.php index 5bdae1b4..99a64bba 100644 --- a/resources/views/dashboard/maintenance/add.blade.php +++ b/resources/views/dashboard/maintenance/add.blade.php @@ -14,56 +14,58 @@
@include('partials.errors') -
- -
- @if($incidentTemplates->count() > 0) -
- - +
+ @if($incidentTemplates->count() > 0) +
+ + +
+ @endif +
+ + +
+
+
+ @foreach(trans('cachet.schedules.status') as $id => $status) + @endforeach - -
- @endif +
+
+ +
+ +
+
+
+ + +
+
+ + +
+
+
- - -
-
-
- @foreach(trans('cachet.schedules.status') as $id => $status) - - @endforeach -
-
- -
- +
+ + {{ trans('forms.cancel') }}
-
- - -
-
- - -
- - -
-
- - {{ trans('forms.cancel') }} -
-
- + +
From 5433e1308fce7c99917f2a00c15f2e0f6f620a1e Mon Sep 17 00:00:00 2001 From: Adrien Poupa Date: Thu, 6 Dec 2018 22:53:33 -0500 Subject: [PATCH 016/179] Improve database performance by removing duplicated queries --- app/Composers/DashboardComposer.php | 45 ++++++++++++++++--- .../Providers/ComposerServiceProvider.php | 2 +- app/Presenters/UserPresenter.php | 3 +- 3 files changed, 43 insertions(+), 7 deletions(-) diff --git a/app/Composers/DashboardComposer.php b/app/Composers/DashboardComposer.php index 1bbdf3ea..06c4609f 100644 --- a/app/Composers/DashboardComposer.php +++ b/app/Composers/DashboardComposer.php @@ -26,6 +26,41 @@ use Illuminate\Contracts\View\View; */ class DashboardComposer { + private $componentCount; + + private $incidentCount; + + private $incidentTemplateCount; + + private $scheduleCount; + + private $subscriberCount; + + /** + * DashboardComposer constructor + */ + public function __construct() { + if (is_null($this->componentCount)) { + $this->componentCount = Component::count(); + } + + if (is_null($this->incidentCount)) { + $this->incidentCount = Incident::count(); + } + + if (is_null($this->incidentTemplateCount)) { + $this->incidentTemplateCount = IncidentTemplate::count(); + } + + if (is_null($this->scheduleCount)) { + $this->scheduleCount = Schedule::count(); + } + + if (is_null($this->subscriberCount)) { + $this->subscriberCount = Subscriber::isVerified()->count(); + } + } + /** * Bind data to the view. * @@ -35,11 +70,11 @@ class DashboardComposer */ public function compose(View $view) { - $view->withComponentCount(Component::count()); - $view->withIncidentCount(Incident::count()); - $view->withIncidentTemplateCount(IncidentTemplate::count()); - $view->withScheduleCount(Schedule::count()); - $view->withSubscriberCount(Subscriber::isVerified()->count()); + $view->withComponentCount($this->componentCount); + $view->withIncidentCount($this->incidentCount); + $view->withIncidentTemplateCount($this->incidentTemplateCount); + $view->withScheduleCount($this->scheduleCount); + $view->withSubscriberCount($this->subscriberCount); $view->withIsWriteable(is_writable(app()->bootstrapPath().'/cachet')); } } diff --git a/app/Foundation/Providers/ComposerServiceProvider.php b/app/Foundation/Providers/ComposerServiceProvider.php index bd762dd4..51f241fc 100644 --- a/app/Foundation/Providers/ComposerServiceProvider.php +++ b/app/Foundation/Providers/ComposerServiceProvider.php @@ -57,6 +57,6 @@ class ComposerServiceProvider extends ServiceProvider */ public function register() { - // + $this->app->singleton(DashboardComposer::class); } } diff --git a/app/Presenters/UserPresenter.php b/app/Presenters/UserPresenter.php index 00aa9b10..b14022d7 100644 --- a/app/Presenters/UserPresenter.php +++ b/app/Presenters/UserPresenter.php @@ -12,6 +12,7 @@ namespace CachetHQ\Cachet\Presenters; use Illuminate\Contracts\Support\Arrayable; +use Illuminate\Support\Facades\Config; use Laravolt\Avatar\Facade as Avatar; use McCool\LaravelAutoPresenter\BasePresenter; @@ -29,7 +30,7 @@ class UserPresenter extends BasePresenter implements Arrayable */ public function avatar() { - if (setting('enable_external_dependencies')) { + if (Config::get('setting.enable_external_dependencies')) { return sprintf('https://www.gravatar.com/avatar/%s?size=%d', md5(strtolower($this->email)), 200); } From cb9d9e4b013862c158a27b9e8faa2efe0bbeee00 Mon Sep 17 00:00:00 2001 From: Adrien Poupa Date: Thu, 6 Dec 2018 22:59:49 -0500 Subject: [PATCH 017/179] StyleCI --- app/Composers/DashboardComposer.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/Composers/DashboardComposer.php b/app/Composers/DashboardComposer.php index 06c4609f..4d7bb3f7 100644 --- a/app/Composers/DashboardComposer.php +++ b/app/Composers/DashboardComposer.php @@ -37,9 +37,10 @@ class DashboardComposer private $subscriberCount; /** - * DashboardComposer constructor + * DashboardComposer constructor. */ - public function __construct() { + public function __construct() + { if (is_null($this->componentCount)) { $this->componentCount = Component::count(); } From 1068d72eea2acc6b5b2b0c64dbb512dafc93e9ed Mon Sep 17 00:00:00 2001 From: Adrien Poupa Date: Thu, 6 Dec 2018 23:20:08 -0500 Subject: [PATCH 018/179] Eager load user on the incident page not to query twice --- app/Http/Controllers/Dashboard/IncidentController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Http/Controllers/Dashboard/IncidentController.php b/app/Http/Controllers/Dashboard/IncidentController.php index a64b361c..f3f0dd9f 100644 --- a/app/Http/Controllers/Dashboard/IncidentController.php +++ b/app/Http/Controllers/Dashboard/IncidentController.php @@ -75,7 +75,7 @@ class IncidentController extends Controller */ public function showIncidents() { - $incidents = Incident::orderBy('created_at', 'desc')->get(); + $incidents = Incident::with('user')->orderBy('created_at', 'desc')->get(); return View::make('dashboard.incidents.index') ->withPageTitle(trans('dashboard.incidents.incidents').' - '.trans('dashboard.dashboard')) From 7fb6384860c8a0ae43870fcf86fb2066b025ec15 Mon Sep 17 00:00:00 2001 From: Adrien Poupa Date: Thu, 6 Dec 2018 23:24:41 -0500 Subject: [PATCH 019/179] Eager load group on the dashboard/components page not to query twice --- app/Http/Controllers/Dashboard/ComponentController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Http/Controllers/Dashboard/ComponentController.php b/app/Http/Controllers/Dashboard/ComponentController.php index 2745cf4b..152e345d 100644 --- a/app/Http/Controllers/Dashboard/ComponentController.php +++ b/app/Http/Controllers/Dashboard/ComponentController.php @@ -73,7 +73,7 @@ class ComponentController extends Controller */ public function showComponents() { - $components = Component::orderBy('order')->orderBy('created_at')->get(); + $components = Component::with('group')->orderBy('order')->orderBy('created_at')->get(); $this->subMenu['components']['active'] = true; From 2c790270f66dc5cc3c93b7b455998478e9749996 Mon Sep 17 00:00:00 2001 From: Adrien Poupa Date: Fri, 7 Dec 2018 00:50:19 -0500 Subject: [PATCH 020/179] Improve database performance by removing duplicated queries --- app/Http/Controllers/StatusPageController.php | 3 ++- app/Presenters/ComponentGroupPresenter.php | 22 ++++++++++++++++--- app/Presenters/IncidentPresenter.php | 8 +++++-- 3 files changed, 27 insertions(+), 6 deletions(-) diff --git a/app/Http/Controllers/StatusPageController.php b/app/Http/Controllers/StatusPageController.php index 87ced74b..cd431b4c 100644 --- a/app/Http/Controllers/StatusPageController.php +++ b/app/Http/Controllers/StatusPageController.php @@ -96,7 +96,8 @@ class StatusPageController extends AbstractApiController $nextDate = $startDate->copy()->addDays($appIncidentDays)->toDateString(); } - $allIncidents = Incident::where('visible', '>=', (int) !Auth::check())->whereBetween('occurred_at', [ + $allIncidents = Incident::with('component')->with('updates.incident') + ->where('visible', '>=', (int) !Auth::check())->whereBetween('occurred_at', [ $endDate->format('Y-m-d').' 00:00:00', $startDate->format('Y-m-d').' 23:59:59', ])->orderBy('occurred_at', 'desc')->get()->groupBy(function (Incident $incident) { diff --git a/app/Presenters/ComponentGroupPresenter.php b/app/Presenters/ComponentGroupPresenter.php index 59756394..2acb112e 100644 --- a/app/Presenters/ComponentGroupPresenter.php +++ b/app/Presenters/ComponentGroupPresenter.php @@ -20,6 +20,8 @@ class ComponentGroupPresenter extends BasePresenter implements Arrayable { use TimestampsTrait; + protected $enabledComponentsLowest = false; + /** * Returns the lowest component status. * @@ -27,7 +29,7 @@ class ComponentGroupPresenter extends BasePresenter implements Arrayable */ public function lowest_status() { - if ($component = $this->wrappedObject->enabled_components_lowest()->first()) { + if ($component = $this->enabled_components_lowest()) { return AutoPresenter::decorate($component)->status; } } @@ -39,7 +41,7 @@ class ComponentGroupPresenter extends BasePresenter implements Arrayable */ public function lowest_human_status() { - if ($component = $this->wrappedObject->enabled_components_lowest()->first()) { + if ($component = $this->enabled_components_lowest()) { return AutoPresenter::decorate($component)->human_status; } } @@ -51,11 +53,25 @@ class ComponentGroupPresenter extends BasePresenter implements Arrayable */ public function lowest_status_color() { - if ($component = $this->wrappedObject->enabled_components_lowest()->first()) { + if ($component = $this->enabled_components_lowest()) { return AutoPresenter::decorate($component)->status_color; } } + /** + * Return the enabled components from the wrapped object, and cache it if need be + * + * @return bool + */ + public function enabled_components_lowest() + { + if (is_bool($this->enabledComponentsLowest)) { + $this->enabledComponentsLowest = $this->wrappedObject->enabled_components_lowest()->first(); + } + + return $this->enabledComponentsLowest; + } + /** * Determine the class for collapsed/uncollapsed groups. * diff --git a/app/Presenters/IncidentPresenter.php b/app/Presenters/IncidentPresenter.php index adab69c1..57d49525 100644 --- a/app/Presenters/IncidentPresenter.php +++ b/app/Presenters/IncidentPresenter.php @@ -29,6 +29,8 @@ class IncidentPresenter extends BasePresenter implements Arrayable */ protected $dates; + protected $latest = false; + /** * Incident icon lookup. * @@ -248,9 +250,11 @@ class IncidentPresenter extends BasePresenter implements Arrayable */ public function latest() { - if ($update = $this->wrappedObject->updates()->orderBy('created_at', 'desc')->first()) { - return $update; + if (is_bool($this->latest)) { + $this->latest = $this->wrappedObject->updates()->orderBy('created_at', 'desc')->first(); } + + return $this->latest; } /** From e5270929b3f13be8f3ae4b8ef7f9eeb15c926115 Mon Sep 17 00:00:00 2001 From: Adrien Poupa Date: Fri, 7 Dec 2018 00:51:03 -0500 Subject: [PATCH 021/179] StyleCI --- app/Presenters/ComponentGroupPresenter.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Presenters/ComponentGroupPresenter.php b/app/Presenters/ComponentGroupPresenter.php index 2acb112e..d6e62a99 100644 --- a/app/Presenters/ComponentGroupPresenter.php +++ b/app/Presenters/ComponentGroupPresenter.php @@ -59,7 +59,7 @@ class ComponentGroupPresenter extends BasePresenter implements Arrayable } /** - * Return the enabled components from the wrapped object, and cache it if need be + * Return the enabled components from the wrapped object, and cache it if need be. * * @return bool */ From f01e999ea070d20bc19dbd33cd777dc4c7081b4e Mon Sep 17 00:00:00 2001 From: Adrien Poupa Date: Sun, 6 Jan 2019 20:09:47 -0500 Subject: [PATCH 022/179] Add documentation --- app/Composers/DashboardComposer.php | 45 +++++++++++++++++----- app/Presenters/ComponentGroupPresenter.php | 5 +++ app/Presenters/IncidentPresenter.php | 5 +++ 3 files changed, 45 insertions(+), 10 deletions(-) diff --git a/app/Composers/DashboardComposer.php b/app/Composers/DashboardComposer.php index 4d7bb3f7..57d44570 100644 --- a/app/Composers/DashboardComposer.php +++ b/app/Composers/DashboardComposer.php @@ -26,18 +26,43 @@ use Illuminate\Contracts\View\View; */ class DashboardComposer { - private $componentCount; - - private $incidentCount; - - private $incidentTemplateCount; - - private $scheduleCount; - - private $subscriberCount; + /** + * The component count. + * + * @var int + */ + protected $componentCount; /** - * DashboardComposer constructor. + * The incident count. + * + * @var int + */ + protected $incidentCount; + + /** + * The incident template count. + * + * @var int + */ + protected $incidentTemplateCount; + + /** + * The schedule count. + * + * @var int + */ + protected $scheduleCount; + + /** + * The subscriber count. + * + * @var int + */ + protected $subscriberCount; + + /** + * Create a new dashboard composer instance. */ public function __construct() { diff --git a/app/Presenters/ComponentGroupPresenter.php b/app/Presenters/ComponentGroupPresenter.php index d6e62a99..554a971f 100644 --- a/app/Presenters/ComponentGroupPresenter.php +++ b/app/Presenters/ComponentGroupPresenter.php @@ -20,6 +20,11 @@ class ComponentGroupPresenter extends BasePresenter implements Arrayable { use TimestampsTrait; + /** + * Flags for the enabled_components_lowest function. + * + * @var bool + */ protected $enabledComponentsLowest = false; /** diff --git a/app/Presenters/IncidentPresenter.php b/app/Presenters/IncidentPresenter.php index 57d49525..139860cb 100644 --- a/app/Presenters/IncidentPresenter.php +++ b/app/Presenters/IncidentPresenter.php @@ -29,6 +29,11 @@ class IncidentPresenter extends BasePresenter implements Arrayable */ protected $dates; + /** + * Flag for the latest function. + * + * @var bool + */ protected $latest = false; /** From 81905080824c3f967cdda839af81a24f508682f5 Mon Sep 17 00:00:00 2001 From: Adrien Poupa Date: Sun, 6 Jan 2019 20:10:41 -0500 Subject: [PATCH 023/179] Improve database performance by removing duplicated queries --- app/Composers/DashboardComposer.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/Composers/DashboardComposer.php b/app/Composers/DashboardComposer.php index 57d44570..c5ccef93 100644 --- a/app/Composers/DashboardComposer.php +++ b/app/Composers/DashboardComposer.php @@ -63,6 +63,8 @@ class DashboardComposer /** * Create a new dashboard composer instance. + * + * @return void */ public function __construct() { From af94758fbf5722f4742d55d750d786d3c239c417 Mon Sep 17 00:00:00 2001 From: Adrien Poupa Date: Sun, 6 Jan 2019 20:11:25 -0500 Subject: [PATCH 024/179] Typo in phpdoc --- app/Presenters/ComponentGroupPresenter.php | 2 +- bootstrap/cache/.gitignore | 2 - composer.lock | 386 ++++++++++++++------- 3 files changed, 253 insertions(+), 137 deletions(-) delete mode 100644 bootstrap/cache/.gitignore diff --git a/app/Presenters/ComponentGroupPresenter.php b/app/Presenters/ComponentGroupPresenter.php index 554a971f..456831a4 100644 --- a/app/Presenters/ComponentGroupPresenter.php +++ b/app/Presenters/ComponentGroupPresenter.php @@ -21,7 +21,7 @@ class ComponentGroupPresenter extends BasePresenter implements Arrayable use TimestampsTrait; /** - * Flags for the enabled_components_lowest function. + * Flag for the enabled_components_lowest function. * * @var bool */ diff --git a/bootstrap/cache/.gitignore b/bootstrap/cache/.gitignore deleted file mode 100644 index d6b7ef32..00000000 --- a/bootstrap/cache/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -* -!.gitignore diff --git a/composer.lock b/composer.lock index 08ab93cd..73d373ae 100644 --- a/composer.lock +++ b/composer.lock @@ -1,7 +1,7 @@ { "_readme": [ "This file locks the dependencies of your project to a known state", - "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", + "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], "content-hash": "6f5c88cf563827bd022f63e23d0bd49e", @@ -409,16 +409,16 @@ }, { "name": "aws/aws-sdk-php", - "version": "3.71.5", + "version": "3.81.2", "source": { "type": "git", "url": "https://github.com/aws/aws-sdk-php.git", - "reference": "ce91558fe7ab0368792c088a573fecf328319deb" + "reference": "1dd023879874ce22a7f8e2b2e014166cd1160b0d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/ce91558fe7ab0368792c088a573fecf328319deb", - "reference": "ce91558fe7ab0368792c088a573fecf328319deb", + "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/1dd023879874ce22a7f8e2b2e014166cd1160b0d", + "reference": "1dd023879874ce22a7f8e2b2e014166cd1160b0d", "shasum": "" }, "require": { @@ -488,7 +488,7 @@ "s3", "sdk" ], - "time": "2018-11-13T21:55:30+00:00" + "time": "2018-12-07T19:55:05+00:00" }, { "name": "bacon/bacon-qr-code", @@ -819,16 +819,16 @@ }, { "name": "doctrine/dbal", - "version": "v2.8.0", + "version": "v2.8.1", "source": { "type": "git", "url": "https://github.com/doctrine/dbal.git", - "reference": "5140a64c08b4b607b9bedaae0cedd26f04a0e621" + "reference": "a9019c1e3232eacace373a6ba957a85b66a255c1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/dbal/zipball/5140a64c08b4b607b9bedaae0cedd26f04a0e621", - "reference": "5140a64c08b4b607b9bedaae0cedd26f04a0e621", + "url": "https://api.github.com/repos/doctrine/dbal/zipball/a9019c1e3232eacace373a6ba957a85b66a255c1", + "reference": "a9019c1e3232eacace373a6ba957a85b66a255c1", "shasum": "" }, "require": { @@ -894,7 +894,7 @@ "persistence", "queryobject" ], - "time": "2018-07-13T03:16:35+00:00" + "time": "2018-12-04T06:44:25+00:00" }, { "name": "doctrine/event-manager", @@ -1142,16 +1142,16 @@ }, { "name": "egulias/email-validator", - "version": "2.1.6", + "version": "2.1.7", "source": { "type": "git", "url": "https://github.com/egulias/EmailValidator.git", - "reference": "0578b32b30b22de3e8664f797cf846fc9246f786" + "reference": "709f21f92707308cdf8f9bcfa1af4cb26586521e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/egulias/EmailValidator/zipball/0578b32b30b22de3e8664f797cf846fc9246f786", - "reference": "0578b32b30b22de3e8664f797cf846fc9246f786", + "url": "https://api.github.com/repos/egulias/EmailValidator/zipball/709f21f92707308cdf8f9bcfa1af4cb26586521e", + "reference": "709f21f92707308cdf8f9bcfa1af4cb26586521e", "shasum": "" }, "require": { @@ -1195,7 +1195,7 @@ "validation", "validator" ], - "time": "2018-09-25T20:47:26+00:00" + "time": "2018-12-04T22:38:24+00:00" }, { "name": "erusev/parsedown", @@ -1744,32 +1744,33 @@ }, { "name": "guzzlehttp/psr7", - "version": "1.4.2", + "version": "1.5.2", "source": { "type": "git", "url": "https://github.com/guzzle/psr7.git", - "reference": "f5b8a8512e2b58b0071a7280e39f14f72e05d87c" + "reference": "9f83dded91781a01c63574e387eaa769be769115" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/psr7/zipball/f5b8a8512e2b58b0071a7280e39f14f72e05d87c", - "reference": "f5b8a8512e2b58b0071a7280e39f14f72e05d87c", + "url": "https://api.github.com/repos/guzzle/psr7/zipball/9f83dded91781a01c63574e387eaa769be769115", + "reference": "9f83dded91781a01c63574e387eaa769be769115", "shasum": "" }, "require": { "php": ">=5.4.0", - "psr/http-message": "~1.0" + "psr/http-message": "~1.0", + "ralouphie/getallheaders": "^2.0.5" }, "provide": { "psr/http-message-implementation": "1.0" }, "require-dev": { - "phpunit/phpunit": "~4.0" + "phpunit/phpunit": "~4.8.36 || ^5.7.27 || ^6.5.8" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.4-dev" + "dev-master": "1.5-dev" } }, "autoload": { @@ -1799,13 +1800,14 @@ "keywords": [ "http", "message", + "psr-7", "request", "response", "stream", "uri", "url" ], - "time": "2017-03-20T17:10:46+00:00" + "time": "2018-12-04T20:46:45+00:00" }, { "name": "intervention/image", @@ -2418,16 +2420,16 @@ }, { "name": "league/flysystem", - "version": "1.0.48", + "version": "1.0.49", "source": { "type": "git", "url": "https://github.com/thephpleague/flysystem.git", - "reference": "a6ded5b2f6055e2db97b4b859fdfca2b952b78aa" + "reference": "a63cc83d8a931b271be45148fa39ba7156782ffd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/a6ded5b2f6055e2db97b4b859fdfca2b952b78aa", - "reference": "a6ded5b2f6055e2db97b4b859fdfca2b952b78aa", + "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/a63cc83d8a931b271be45148fa39ba7156782ffd", + "reference": "a63cc83d8a931b271be45148fa39ba7156782ffd", "shasum": "" }, "require": { @@ -2498,7 +2500,7 @@ "sftp", "storage" ], - "time": "2018-10-15T13:53:10+00:00" + "time": "2018-11-23T23:41:29+00:00" }, { "name": "mccool/laravel-auto-presenter", @@ -3224,16 +3226,16 @@ }, { "name": "psr/log", - "version": "1.0.2", + "version": "1.1.0", "source": { "type": "git", "url": "https://github.com/php-fig/log.git", - "reference": "4ebe3a8bf773a19edfe0a84b6585ba3d401b724d" + "reference": "6c001f1daafa3a3ac1d8ff69ee4db8e799a654dd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/log/zipball/4ebe3a8bf773a19edfe0a84b6585ba3d401b724d", - "reference": "4ebe3a8bf773a19edfe0a84b6585ba3d401b724d", + "url": "https://api.github.com/repos/php-fig/log/zipball/6c001f1daafa3a3ac1d8ff69ee4db8e799a654dd", + "reference": "6c001f1daafa3a3ac1d8ff69ee4db8e799a654dd", "shasum": "" }, "require": { @@ -3267,7 +3269,7 @@ "psr", "psr-3" ], - "time": "2016-10-10T12:19:37+00:00" + "time": "2018-11-20T15:27:04+00:00" }, { "name": "psr/simple-cache", @@ -3391,6 +3393,46 @@ ], "time": "2018-10-13T15:16:03+00:00" }, + { + "name": "ralouphie/getallheaders", + "version": "2.0.5", + "source": { + "type": "git", + "url": "https://github.com/ralouphie/getallheaders.git", + "reference": "5601c8a83fbba7ef674a7369456d12f1e0d0eafa" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/ralouphie/getallheaders/zipball/5601c8a83fbba7ef674a7369456d12f1e0d0eafa", + "reference": "5601c8a83fbba7ef674a7369456d12f1e0d0eafa", + "shasum": "" + }, + "require": { + "php": ">=5.3" + }, + "require-dev": { + "phpunit/phpunit": "~3.7.0", + "satooshi/php-coveralls": ">=1.0" + }, + "type": "library", + "autoload": { + "files": [ + "src/getallheaders.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Ralph Khattar", + "email": "ralph.khattar@gmail.com" + } + ], + "description": "A polyfill for getallheaders.", + "time": "2016-02-11T07:05:27+00:00" + }, { "name": "ramsey/uuid", "version": "3.8.0", @@ -3646,20 +3688,21 @@ }, { "name": "symfony/console", - "version": "v4.1.7", + "version": "v4.2.1", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "432122af37d8cd52fba1b294b11976e0d20df595" + "reference": "4dff24e5d01e713818805c1862d2e3f901ee7dd0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/432122af37d8cd52fba1b294b11976e0d20df595", - "reference": "432122af37d8cd52fba1b294b11976e0d20df595", + "url": "https://api.github.com/repos/symfony/console/zipball/4dff24e5d01e713818805c1862d2e3f901ee7dd0", + "reference": "4dff24e5d01e713818805c1862d2e3f901ee7dd0", "shasum": "" }, "require": { "php": "^7.1.3", + "symfony/contracts": "^1.0", "symfony/polyfill-mbstring": "~1.0" }, "conflict": { @@ -3683,7 +3726,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "4.1-dev" + "dev-master": "4.2-dev" } }, "autoload": { @@ -3710,20 +3753,88 @@ ], "description": "Symfony Console Component", "homepage": "https://symfony.com", - "time": "2018-10-31T09:30:44+00:00" + "time": "2018-11-27T07:40:44+00:00" }, { - "name": "symfony/css-selector", - "version": "v4.1.7", + "name": "symfony/contracts", + "version": "v1.0.2", "source": { "type": "git", - "url": "https://github.com/symfony/css-selector.git", - "reference": "d67de79a70a27d93c92c47f37ece958bf8de4d8a" + "url": "https://github.com/symfony/contracts.git", + "reference": "1aa7ab2429c3d594dd70689604b5cf7421254cdf" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/css-selector/zipball/d67de79a70a27d93c92c47f37ece958bf8de4d8a", - "reference": "d67de79a70a27d93c92c47f37ece958bf8de4d8a", + "url": "https://api.github.com/repos/symfony/contracts/zipball/1aa7ab2429c3d594dd70689604b5cf7421254cdf", + "reference": "1aa7ab2429c3d594dd70689604b5cf7421254cdf", + "shasum": "" + }, + "require": { + "php": "^7.1.3" + }, + "require-dev": { + "psr/cache": "^1.0", + "psr/container": "^1.0" + }, + "suggest": { + "psr/cache": "When using the Cache contracts", + "psr/container": "When using the Service contracts", + "symfony/cache-contracts-implementation": "", + "symfony/service-contracts-implementation": "", + "symfony/translation-contracts-implementation": "" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0-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": "2018-12-05T08:06:11+00:00" + }, + { + "name": "symfony/css-selector", + "version": "v4.2.1", + "source": { + "type": "git", + "url": "https://github.com/symfony/css-selector.git", + "reference": "aa9fa526ba1b2ec087ffdfb32753803d999fcfcd" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/css-selector/zipball/aa9fa526ba1b2ec087ffdfb32753803d999fcfcd", + "reference": "aa9fa526ba1b2ec087ffdfb32753803d999fcfcd", "shasum": "" }, "require": { @@ -3732,7 +3843,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "4.1-dev" + "dev-master": "4.2-dev" } }, "autoload": { @@ -3763,20 +3874,20 @@ ], "description": "Symfony CssSelector Component", "homepage": "https://symfony.com", - "time": "2018-10-02T16:36:10+00:00" + "time": "2018-11-11T19:52:12+00:00" }, { "name": "symfony/debug", - "version": "v4.1.7", + "version": "v4.2.1", "source": { "type": "git", "url": "https://github.com/symfony/debug.git", - "reference": "19090917b848a799cbae4800abf740fe4eb71c1d" + "reference": "e0a2b92ee0b5b934f973d90c2f58e18af109d276" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/debug/zipball/19090917b848a799cbae4800abf740fe4eb71c1d", - "reference": "19090917b848a799cbae4800abf740fe4eb71c1d", + "url": "https://api.github.com/repos/symfony/debug/zipball/e0a2b92ee0b5b934f973d90c2f58e18af109d276", + "reference": "e0a2b92ee0b5b934f973d90c2f58e18af109d276", "shasum": "" }, "require": { @@ -3792,7 +3903,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "4.1-dev" + "dev-master": "4.2-dev" } }, "autoload": { @@ -3819,24 +3930,25 @@ ], "description": "Symfony Debug Component", "homepage": "https://symfony.com", - "time": "2018-10-31T09:09:42+00:00" + "time": "2018-11-28T18:24:18+00:00" }, { "name": "symfony/event-dispatcher", - "version": "v4.1.7", + "version": "v4.2.1", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher.git", - "reference": "552541dad078c85d9414b09c041ede488b456cd5" + "reference": "921f49c3158a276d27c0d770a5a347a3b718b328" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/552541dad078c85d9414b09c041ede488b456cd5", - "reference": "552541dad078c85d9414b09c041ede488b456cd5", + "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/921f49c3158a276d27c0d770a5a347a3b718b328", + "reference": "921f49c3158a276d27c0d770a5a347a3b718b328", "shasum": "" }, "require": { - "php": "^7.1.3" + "php": "^7.1.3", + "symfony/contracts": "^1.0" }, "conflict": { "symfony/dependency-injection": "<3.4" @@ -3855,7 +3967,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "4.1-dev" + "dev-master": "4.2-dev" } }, "autoload": { @@ -3882,20 +3994,20 @@ ], "description": "Symfony EventDispatcher Component", "homepage": "https://symfony.com", - "time": "2018-10-10T13:52:42+00:00" + "time": "2018-12-01T08:52:38+00:00" }, { "name": "symfony/finder", - "version": "v4.1.7", + "version": "v4.2.1", "source": { "type": "git", "url": "https://github.com/symfony/finder.git", - "reference": "1f17195b44543017a9c9b2d437c670627e96ad06" + "reference": "e53d477d7b5c4982d0e1bfd2298dbee63d01441d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/finder/zipball/1f17195b44543017a9c9b2d437c670627e96ad06", - "reference": "1f17195b44543017a9c9b2d437c670627e96ad06", + "url": "https://api.github.com/repos/symfony/finder/zipball/e53d477d7b5c4982d0e1bfd2298dbee63d01441d", + "reference": "e53d477d7b5c4982d0e1bfd2298dbee63d01441d", "shasum": "" }, "require": { @@ -3904,7 +4016,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "4.1-dev" + "dev-master": "4.2-dev" } }, "autoload": { @@ -3931,20 +4043,20 @@ ], "description": "Symfony Finder Component", "homepage": "https://symfony.com", - "time": "2018-10-03T08:47:56+00:00" + "time": "2018-11-11T19:52:12+00:00" }, { "name": "symfony/http-foundation", - "version": "v4.1.7", + "version": "v4.2.1", "source": { "type": "git", "url": "https://github.com/symfony/http-foundation.git", - "reference": "82d494c1492b0dd24bbc5c2d963fb02eb44491af" + "reference": "1b31f3017fadd8cb05cf2c8aebdbf3b12a943851" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-foundation/zipball/82d494c1492b0dd24bbc5c2d963fb02eb44491af", - "reference": "82d494c1492b0dd24bbc5c2d963fb02eb44491af", + "url": "https://api.github.com/repos/symfony/http-foundation/zipball/1b31f3017fadd8cb05cf2c8aebdbf3b12a943851", + "reference": "1b31f3017fadd8cb05cf2c8aebdbf3b12a943851", "shasum": "" }, "require": { @@ -3958,7 +4070,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "4.1-dev" + "dev-master": "4.2-dev" } }, "autoload": { @@ -3985,25 +4097,26 @@ ], "description": "Symfony HttpFoundation Component", "homepage": "https://symfony.com", - "time": "2018-10-31T09:09:42+00:00" + "time": "2018-11-26T10:55:26+00:00" }, { "name": "symfony/http-kernel", - "version": "v4.1.7", + "version": "v4.2.1", "source": { "type": "git", "url": "https://github.com/symfony/http-kernel.git", - "reference": "958be64ab13b65172ad646ef5ae20364c2305fae" + "reference": "b39ceffc0388232c309cbde3a7c3685f2ec0a624" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-kernel/zipball/958be64ab13b65172ad646ef5ae20364c2305fae", - "reference": "958be64ab13b65172ad646ef5ae20364c2305fae", + "url": "https://api.github.com/repos/symfony/http-kernel/zipball/b39ceffc0388232c309cbde3a7c3685f2ec0a624", + "reference": "b39ceffc0388232c309cbde3a7c3685f2ec0a624", "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/http-foundation": "^4.1.1", @@ -4011,7 +4124,8 @@ }, "conflict": { "symfony/config": "<3.4", - "symfony/dependency-injection": "<4.1", + "symfony/dependency-injection": "<4.2", + "symfony/translation": "<4.2", "symfony/var-dumper": "<4.1.1", "twig/twig": "<1.34|<2.4,>=2" }, @@ -4024,7 +4138,7 @@ "symfony/config": "~3.4|~4.0", "symfony/console": "~3.4|~4.0", "symfony/css-selector": "~3.4|~4.0", - "symfony/dependency-injection": "^4.1", + "symfony/dependency-injection": "^4.2", "symfony/dom-crawler": "~3.4|~4.0", "symfony/expression-language": "~3.4|~4.0", "symfony/finder": "~3.4|~4.0", @@ -4032,7 +4146,7 @@ "symfony/routing": "~3.4|~4.0", "symfony/stopwatch": "~3.4|~4.0", "symfony/templating": "~3.4|~4.0", - "symfony/translation": "~3.4|~4.0", + "symfony/translation": "~4.2", "symfony/var-dumper": "^4.1.1" }, "suggest": { @@ -4045,7 +4159,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "4.1-dev" + "dev-master": "4.2-dev" } }, "autoload": { @@ -4072,7 +4186,7 @@ ], "description": "Symfony HttpKernel Component", "homepage": "https://symfony.com", - "time": "2018-11-03T11:11:23+00:00" + "time": "2018-12-06T17:39:52+00:00" }, { "name": "symfony/polyfill-ctype", @@ -4189,16 +4303,16 @@ }, { "name": "symfony/process", - "version": "v4.1.7", + "version": "v4.2.1", "source": { "type": "git", "url": "https://github.com/symfony/process.git", - "reference": "3e83acef94d979b1de946599ef86b3a352abcdc9" + "reference": "2b341009ccec76837a7f46f59641b431e4d4c2b0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/process/zipball/3e83acef94d979b1de946599ef86b3a352abcdc9", - "reference": "3e83acef94d979b1de946599ef86b3a352abcdc9", + "url": "https://api.github.com/repos/symfony/process/zipball/2b341009ccec76837a7f46f59641b431e4d4c2b0", + "reference": "2b341009ccec76837a7f46f59641b431e4d4c2b0", "shasum": "" }, "require": { @@ -4207,7 +4321,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "4.1-dev" + "dev-master": "4.2-dev" } }, "autoload": { @@ -4234,34 +4348,34 @@ ], "description": "Symfony Process Component", "homepage": "https://symfony.com", - "time": "2018-10-14T20:48:13+00:00" + "time": "2018-11-20T16:22:05+00:00" }, { "name": "symfony/routing", - "version": "v4.1.7", + "version": "v4.2.1", "source": { "type": "git", "url": "https://github.com/symfony/routing.git", - "reference": "d4a3c14cfbe6b9c05a1d6e948654022d4d1ad3fd" + "reference": "649460207e77da6c545326c7f53618d23ad2c866" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/routing/zipball/d4a3c14cfbe6b9c05a1d6e948654022d4d1ad3fd", - "reference": "d4a3c14cfbe6b9c05a1d6e948654022d4d1ad3fd", + "url": "https://api.github.com/repos/symfony/routing/zipball/649460207e77da6c545326c7f53618d23ad2c866", + "reference": "649460207e77da6c545326c7f53618d23ad2c866", "shasum": "" }, "require": { "php": "^7.1.3" }, "conflict": { - "symfony/config": "<3.4", + "symfony/config": "<4.2", "symfony/dependency-injection": "<3.4", "symfony/yaml": "<3.4" }, "require-dev": { "doctrine/annotations": "~1.0", "psr/log": "~1.0", - "symfony/config": "~3.4|~4.0", + "symfony/config": "~4.2", "symfony/dependency-injection": "~3.4|~4.0", "symfony/expression-language": "~3.4|~4.0", "symfony/http-foundation": "~3.4|~4.0", @@ -4278,7 +4392,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "4.1-dev" + "dev-master": "4.2-dev" } }, "autoload": { @@ -4311,24 +4425,25 @@ "uri", "url" ], - "time": "2018-10-28T18:38:52+00:00" + "time": "2018-12-03T22:08:12+00:00" }, { "name": "symfony/translation", - "version": "v4.1.7", + "version": "v4.2.1", "source": { "type": "git", "url": "https://github.com/symfony/translation.git", - "reference": "aa04dc1c75b7d3da7bd7003104cd0cfc5dff635c" + "reference": "c0e2191e9bed845946ab3d99767513b56ca7dcd6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/translation/zipball/aa04dc1c75b7d3da7bd7003104cd0cfc5dff635c", - "reference": "aa04dc1c75b7d3da7bd7003104cd0cfc5dff635c", + "url": "https://api.github.com/repos/symfony/translation/zipball/c0e2191e9bed845946ab3d99767513b56ca7dcd6", + "reference": "c0e2191e9bed845946ab3d99767513b56ca7dcd6", "shasum": "" }, "require": { "php": "^7.1.3", + "symfony/contracts": "^1.0.2", "symfony/polyfill-mbstring": "~1.0" }, "conflict": { @@ -4336,6 +4451,9 @@ "symfony/dependency-injection": "<3.4", "symfony/yaml": "<3.4" }, + "provide": { + "symfony/translation-contracts-implementation": "1.0" + }, "require-dev": { "psr/log": "~1.0", "symfony/config": "~3.4|~4.0", @@ -4353,7 +4471,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "4.1-dev" + "dev-master": "4.2-dev" } }, "autoload": { @@ -4380,20 +4498,20 @@ ], "description": "Symfony Translation Component", "homepage": "https://symfony.com", - "time": "2018-10-28T18:38:52+00:00" + "time": "2018-12-06T10:45:32+00:00" }, { "name": "symfony/var-dumper", - "version": "v4.1.7", + "version": "v4.2.1", "source": { "type": "git", "url": "https://github.com/symfony/var-dumper.git", - "reference": "60319b45653580b0cdacca499344577d87732f16" + "reference": "db61258540350725f4beb6b84006e32398acd120" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-dumper/zipball/60319b45653580b0cdacca499344577d87732f16", - "reference": "60319b45653580b0cdacca499344577d87732f16", + "url": "https://api.github.com/repos/symfony/var-dumper/zipball/db61258540350725f4beb6b84006e32398acd120", + "reference": "db61258540350725f4beb6b84006e32398acd120", "shasum": "" }, "require": { @@ -4421,7 +4539,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "4.1-dev" + "dev-master": "4.2-dev" } }, "autoload": { @@ -4455,7 +4573,7 @@ "debug", "dump" ], - "time": "2018-10-02T16:36:10+00:00" + "time": "2018-11-25T12:50:42+00:00" }, { "name": "tijsverkoyen/css-to-inline-styles", @@ -4742,16 +4860,16 @@ }, { "name": "barryvdh/laravel-debugbar", - "version": "v3.2.0", + "version": "v3.2.1", "source": { "type": "git", "url": "https://github.com/barryvdh/laravel-debugbar.git", - "reference": "5b68f3972083a7eeec0d6f161962fcda71a127c0" + "reference": "9d5caf43c5f3a3aea2178942f281054805872e7c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/barryvdh/laravel-debugbar/zipball/5b68f3972083a7eeec0d6f161962fcda71a127c0", - "reference": "5b68f3972083a7eeec0d6f161962fcda71a127c0", + "url": "https://api.github.com/repos/barryvdh/laravel-debugbar/zipball/9d5caf43c5f3a3aea2178942f281054805872e7c", + "reference": "9d5caf43c5f3a3aea2178942f281054805872e7c", "shasum": "" }, "require": { @@ -4806,7 +4924,7 @@ "profiler", "webprofiler" ], - "time": "2018-08-22T11:06:19+00:00" + "time": "2018-11-09T08:37:55+00:00" }, { "name": "doctrine/instantiator", @@ -5885,16 +6003,16 @@ }, { "name": "phpunit/phpunit", - "version": "7.4.4", + "version": "7.5.0", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "b1be2c8530c4c29c3519a052c9fb6cee55053bbd" + "reference": "520723129e2b3fc1dc4c0953e43c9d40e1ecb352" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/b1be2c8530c4c29c3519a052c9fb6cee55053bbd", - "reference": "b1be2c8530c4c29c3519a052c9fb6cee55053bbd", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/520723129e2b3fc1dc4c0953e43c9d40e1ecb352", + "reference": "520723129e2b3fc1dc4c0953e43c9d40e1ecb352", "shasum": "" }, "require": { @@ -5915,7 +6033,7 @@ "phpunit/php-timer": "^2.0", "sebastian/comparator": "^3.0", "sebastian/diff": "^3.0", - "sebastian/environment": "^3.1 || ^4.0", + "sebastian/environment": "^4.0", "sebastian/exporter": "^3.1", "sebastian/global-state": "^2.0", "sebastian/object-enumerator": "^3.0.3", @@ -5939,7 +6057,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "7.4-dev" + "dev-master": "7.5-dev" } }, "autoload": { @@ -5965,7 +6083,7 @@ "testing", "xunit" ], - "time": "2018-11-14T16:52:02+00:00" + "time": "2018-12-07T07:08:12+00:00" }, { "name": "sebastian/code-unit-reverse-lookup", @@ -6134,28 +6252,28 @@ }, { "name": "sebastian/environment", - "version": "3.1.0", + "version": "4.0.1", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/environment.git", - "reference": "cd0871b3975fb7fc44d11314fd1ee20925fce4f5" + "reference": "febd209a219cea7b56ad799b30ebbea34b71eb8f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/cd0871b3975fb7fc44d11314fd1ee20925fce4f5", - "reference": "cd0871b3975fb7fc44d11314fd1ee20925fce4f5", + "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/febd209a219cea7b56ad799b30ebbea34b71eb8f", + "reference": "febd209a219cea7b56ad799b30ebbea34b71eb8f", "shasum": "" }, "require": { - "php": "^7.0" + "php": "^7.1" }, "require-dev": { - "phpunit/phpunit": "^6.1" + "phpunit/phpunit": "^7.4" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "3.1.x-dev" + "dev-master": "4.0-dev" } }, "autoload": { @@ -6180,7 +6298,7 @@ "environment", "hhvm" ], - "time": "2017-07-01T08:51:00+00:00" + "time": "2018-11-25T09:31:21+00:00" }, { "name": "sebastian/exporter", @@ -6532,16 +6650,16 @@ }, { "name": "symfony/dom-crawler", - "version": "v4.1.7", + "version": "v4.2.1", "source": { "type": "git", "url": "https://github.com/symfony/dom-crawler.git", - "reference": "80e60271bb288de2a2259662cff125cff4f93f95" + "reference": "7438a32108fdd555295f443605d6de2cce473159" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/80e60271bb288de2a2259662cff125cff4f93f95", - "reference": "80e60271bb288de2a2259662cff125cff4f93f95", + "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/7438a32108fdd555295f443605d6de2cce473159", + "reference": "7438a32108fdd555295f443605d6de2cce473159", "shasum": "" }, "require": { @@ -6558,7 +6676,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "4.1-dev" + "dev-master": "4.2-dev" } }, "autoload": { @@ -6585,7 +6703,7 @@ ], "description": "Symfony DomCrawler Component", "homepage": "https://symfony.com", - "time": "2018-10-02T12:40:59+00:00" + "time": "2018-11-26T10:55:26+00:00" }, { "name": "theseer/tokenizer", From 7d5704b92eefe771e2f53ce49823e9952d91b1a2 Mon Sep 17 00:00:00 2001 From: Adrien Poupa Date: Sun, 6 Jan 2019 20:17:58 -0500 Subject: [PATCH 025/179] Revert "Typo in phpdoc" This reverts commit af94758fbf5722f4742d55d750d786d3c239c417. --- app/Presenters/ComponentGroupPresenter.php | 2 +- bootstrap/cache/.gitignore | 2 + composer.lock | 382 +++++++-------------- 3 files changed, 135 insertions(+), 251 deletions(-) create mode 100644 bootstrap/cache/.gitignore diff --git a/app/Presenters/ComponentGroupPresenter.php b/app/Presenters/ComponentGroupPresenter.php index 456831a4..554a971f 100644 --- a/app/Presenters/ComponentGroupPresenter.php +++ b/app/Presenters/ComponentGroupPresenter.php @@ -21,7 +21,7 @@ class ComponentGroupPresenter extends BasePresenter implements Arrayable use TimestampsTrait; /** - * Flag for the enabled_components_lowest function. + * Flags for the enabled_components_lowest function. * * @var bool */ diff --git a/bootstrap/cache/.gitignore b/bootstrap/cache/.gitignore new file mode 100644 index 00000000..d6b7ef32 --- /dev/null +++ b/bootstrap/cache/.gitignore @@ -0,0 +1,2 @@ +* +!.gitignore diff --git a/composer.lock b/composer.lock index 73d373ae..08ab93cd 100644 --- a/composer.lock +++ b/composer.lock @@ -1,7 +1,7 @@ { "_readme": [ "This file locks the dependencies of your project to a known state", - "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", + "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], "content-hash": "6f5c88cf563827bd022f63e23d0bd49e", @@ -409,16 +409,16 @@ }, { "name": "aws/aws-sdk-php", - "version": "3.81.2", + "version": "3.71.5", "source": { "type": "git", "url": "https://github.com/aws/aws-sdk-php.git", - "reference": "1dd023879874ce22a7f8e2b2e014166cd1160b0d" + "reference": "ce91558fe7ab0368792c088a573fecf328319deb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/1dd023879874ce22a7f8e2b2e014166cd1160b0d", - "reference": "1dd023879874ce22a7f8e2b2e014166cd1160b0d", + "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/ce91558fe7ab0368792c088a573fecf328319deb", + "reference": "ce91558fe7ab0368792c088a573fecf328319deb", "shasum": "" }, "require": { @@ -488,7 +488,7 @@ "s3", "sdk" ], - "time": "2018-12-07T19:55:05+00:00" + "time": "2018-11-13T21:55:30+00:00" }, { "name": "bacon/bacon-qr-code", @@ -819,16 +819,16 @@ }, { "name": "doctrine/dbal", - "version": "v2.8.1", + "version": "v2.8.0", "source": { "type": "git", "url": "https://github.com/doctrine/dbal.git", - "reference": "a9019c1e3232eacace373a6ba957a85b66a255c1" + "reference": "5140a64c08b4b607b9bedaae0cedd26f04a0e621" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/dbal/zipball/a9019c1e3232eacace373a6ba957a85b66a255c1", - "reference": "a9019c1e3232eacace373a6ba957a85b66a255c1", + "url": "https://api.github.com/repos/doctrine/dbal/zipball/5140a64c08b4b607b9bedaae0cedd26f04a0e621", + "reference": "5140a64c08b4b607b9bedaae0cedd26f04a0e621", "shasum": "" }, "require": { @@ -894,7 +894,7 @@ "persistence", "queryobject" ], - "time": "2018-12-04T06:44:25+00:00" + "time": "2018-07-13T03:16:35+00:00" }, { "name": "doctrine/event-manager", @@ -1142,16 +1142,16 @@ }, { "name": "egulias/email-validator", - "version": "2.1.7", + "version": "2.1.6", "source": { "type": "git", "url": "https://github.com/egulias/EmailValidator.git", - "reference": "709f21f92707308cdf8f9bcfa1af4cb26586521e" + "reference": "0578b32b30b22de3e8664f797cf846fc9246f786" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/egulias/EmailValidator/zipball/709f21f92707308cdf8f9bcfa1af4cb26586521e", - "reference": "709f21f92707308cdf8f9bcfa1af4cb26586521e", + "url": "https://api.github.com/repos/egulias/EmailValidator/zipball/0578b32b30b22de3e8664f797cf846fc9246f786", + "reference": "0578b32b30b22de3e8664f797cf846fc9246f786", "shasum": "" }, "require": { @@ -1195,7 +1195,7 @@ "validation", "validator" ], - "time": "2018-12-04T22:38:24+00:00" + "time": "2018-09-25T20:47:26+00:00" }, { "name": "erusev/parsedown", @@ -1744,33 +1744,32 @@ }, { "name": "guzzlehttp/psr7", - "version": "1.5.2", + "version": "1.4.2", "source": { "type": "git", "url": "https://github.com/guzzle/psr7.git", - "reference": "9f83dded91781a01c63574e387eaa769be769115" + "reference": "f5b8a8512e2b58b0071a7280e39f14f72e05d87c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/psr7/zipball/9f83dded91781a01c63574e387eaa769be769115", - "reference": "9f83dded91781a01c63574e387eaa769be769115", + "url": "https://api.github.com/repos/guzzle/psr7/zipball/f5b8a8512e2b58b0071a7280e39f14f72e05d87c", + "reference": "f5b8a8512e2b58b0071a7280e39f14f72e05d87c", "shasum": "" }, "require": { "php": ">=5.4.0", - "psr/http-message": "~1.0", - "ralouphie/getallheaders": "^2.0.5" + "psr/http-message": "~1.0" }, "provide": { "psr/http-message-implementation": "1.0" }, "require-dev": { - "phpunit/phpunit": "~4.8.36 || ^5.7.27 || ^6.5.8" + "phpunit/phpunit": "~4.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.5-dev" + "dev-master": "1.4-dev" } }, "autoload": { @@ -1800,14 +1799,13 @@ "keywords": [ "http", "message", - "psr-7", "request", "response", "stream", "uri", "url" ], - "time": "2018-12-04T20:46:45+00:00" + "time": "2017-03-20T17:10:46+00:00" }, { "name": "intervention/image", @@ -2420,16 +2418,16 @@ }, { "name": "league/flysystem", - "version": "1.0.49", + "version": "1.0.48", "source": { "type": "git", "url": "https://github.com/thephpleague/flysystem.git", - "reference": "a63cc83d8a931b271be45148fa39ba7156782ffd" + "reference": "a6ded5b2f6055e2db97b4b859fdfca2b952b78aa" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/a63cc83d8a931b271be45148fa39ba7156782ffd", - "reference": "a63cc83d8a931b271be45148fa39ba7156782ffd", + "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/a6ded5b2f6055e2db97b4b859fdfca2b952b78aa", + "reference": "a6ded5b2f6055e2db97b4b859fdfca2b952b78aa", "shasum": "" }, "require": { @@ -2500,7 +2498,7 @@ "sftp", "storage" ], - "time": "2018-11-23T23:41:29+00:00" + "time": "2018-10-15T13:53:10+00:00" }, { "name": "mccool/laravel-auto-presenter", @@ -3226,16 +3224,16 @@ }, { "name": "psr/log", - "version": "1.1.0", + "version": "1.0.2", "source": { "type": "git", "url": "https://github.com/php-fig/log.git", - "reference": "6c001f1daafa3a3ac1d8ff69ee4db8e799a654dd" + "reference": "4ebe3a8bf773a19edfe0a84b6585ba3d401b724d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/log/zipball/6c001f1daafa3a3ac1d8ff69ee4db8e799a654dd", - "reference": "6c001f1daafa3a3ac1d8ff69ee4db8e799a654dd", + "url": "https://api.github.com/repos/php-fig/log/zipball/4ebe3a8bf773a19edfe0a84b6585ba3d401b724d", + "reference": "4ebe3a8bf773a19edfe0a84b6585ba3d401b724d", "shasum": "" }, "require": { @@ -3269,7 +3267,7 @@ "psr", "psr-3" ], - "time": "2018-11-20T15:27:04+00:00" + "time": "2016-10-10T12:19:37+00:00" }, { "name": "psr/simple-cache", @@ -3393,46 +3391,6 @@ ], "time": "2018-10-13T15:16:03+00:00" }, - { - "name": "ralouphie/getallheaders", - "version": "2.0.5", - "source": { - "type": "git", - "url": "https://github.com/ralouphie/getallheaders.git", - "reference": "5601c8a83fbba7ef674a7369456d12f1e0d0eafa" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/ralouphie/getallheaders/zipball/5601c8a83fbba7ef674a7369456d12f1e0d0eafa", - "reference": "5601c8a83fbba7ef674a7369456d12f1e0d0eafa", - "shasum": "" - }, - "require": { - "php": ">=5.3" - }, - "require-dev": { - "phpunit/phpunit": "~3.7.0", - "satooshi/php-coveralls": ">=1.0" - }, - "type": "library", - "autoload": { - "files": [ - "src/getallheaders.php" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Ralph Khattar", - "email": "ralph.khattar@gmail.com" - } - ], - "description": "A polyfill for getallheaders.", - "time": "2016-02-11T07:05:27+00:00" - }, { "name": "ramsey/uuid", "version": "3.8.0", @@ -3688,21 +3646,20 @@ }, { "name": "symfony/console", - "version": "v4.2.1", + "version": "v4.1.7", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "4dff24e5d01e713818805c1862d2e3f901ee7dd0" + "reference": "432122af37d8cd52fba1b294b11976e0d20df595" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/4dff24e5d01e713818805c1862d2e3f901ee7dd0", - "reference": "4dff24e5d01e713818805c1862d2e3f901ee7dd0", + "url": "https://api.github.com/repos/symfony/console/zipball/432122af37d8cd52fba1b294b11976e0d20df595", + "reference": "432122af37d8cd52fba1b294b11976e0d20df595", "shasum": "" }, "require": { "php": "^7.1.3", - "symfony/contracts": "^1.0", "symfony/polyfill-mbstring": "~1.0" }, "conflict": { @@ -3726,7 +3683,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "4.2-dev" + "dev-master": "4.1-dev" } }, "autoload": { @@ -3753,88 +3710,20 @@ ], "description": "Symfony Console Component", "homepage": "https://symfony.com", - "time": "2018-11-27T07:40:44+00:00" - }, - { - "name": "symfony/contracts", - "version": "v1.0.2", - "source": { - "type": "git", - "url": "https://github.com/symfony/contracts.git", - "reference": "1aa7ab2429c3d594dd70689604b5cf7421254cdf" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/contracts/zipball/1aa7ab2429c3d594dd70689604b5cf7421254cdf", - "reference": "1aa7ab2429c3d594dd70689604b5cf7421254cdf", - "shasum": "" - }, - "require": { - "php": "^7.1.3" - }, - "require-dev": { - "psr/cache": "^1.0", - "psr/container": "^1.0" - }, - "suggest": { - "psr/cache": "When using the Cache contracts", - "psr/container": "When using the Service contracts", - "symfony/cache-contracts-implementation": "", - "symfony/service-contracts-implementation": "", - "symfony/translation-contracts-implementation": "" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.0-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": "2018-12-05T08:06:11+00:00" + "time": "2018-10-31T09:30:44+00:00" }, { "name": "symfony/css-selector", - "version": "v4.2.1", + "version": "v4.1.7", "source": { "type": "git", "url": "https://github.com/symfony/css-selector.git", - "reference": "aa9fa526ba1b2ec087ffdfb32753803d999fcfcd" + "reference": "d67de79a70a27d93c92c47f37ece958bf8de4d8a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/css-selector/zipball/aa9fa526ba1b2ec087ffdfb32753803d999fcfcd", - "reference": "aa9fa526ba1b2ec087ffdfb32753803d999fcfcd", + "url": "https://api.github.com/repos/symfony/css-selector/zipball/d67de79a70a27d93c92c47f37ece958bf8de4d8a", + "reference": "d67de79a70a27d93c92c47f37ece958bf8de4d8a", "shasum": "" }, "require": { @@ -3843,7 +3732,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "4.2-dev" + "dev-master": "4.1-dev" } }, "autoload": { @@ -3874,20 +3763,20 @@ ], "description": "Symfony CssSelector Component", "homepage": "https://symfony.com", - "time": "2018-11-11T19:52:12+00:00" + "time": "2018-10-02T16:36:10+00:00" }, { "name": "symfony/debug", - "version": "v4.2.1", + "version": "v4.1.7", "source": { "type": "git", "url": "https://github.com/symfony/debug.git", - "reference": "e0a2b92ee0b5b934f973d90c2f58e18af109d276" + "reference": "19090917b848a799cbae4800abf740fe4eb71c1d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/debug/zipball/e0a2b92ee0b5b934f973d90c2f58e18af109d276", - "reference": "e0a2b92ee0b5b934f973d90c2f58e18af109d276", + "url": "https://api.github.com/repos/symfony/debug/zipball/19090917b848a799cbae4800abf740fe4eb71c1d", + "reference": "19090917b848a799cbae4800abf740fe4eb71c1d", "shasum": "" }, "require": { @@ -3903,7 +3792,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "4.2-dev" + "dev-master": "4.1-dev" } }, "autoload": { @@ -3930,25 +3819,24 @@ ], "description": "Symfony Debug Component", "homepage": "https://symfony.com", - "time": "2018-11-28T18:24:18+00:00" + "time": "2018-10-31T09:09:42+00:00" }, { "name": "symfony/event-dispatcher", - "version": "v4.2.1", + "version": "v4.1.7", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher.git", - "reference": "921f49c3158a276d27c0d770a5a347a3b718b328" + "reference": "552541dad078c85d9414b09c041ede488b456cd5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/921f49c3158a276d27c0d770a5a347a3b718b328", - "reference": "921f49c3158a276d27c0d770a5a347a3b718b328", + "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/552541dad078c85d9414b09c041ede488b456cd5", + "reference": "552541dad078c85d9414b09c041ede488b456cd5", "shasum": "" }, "require": { - "php": "^7.1.3", - "symfony/contracts": "^1.0" + "php": "^7.1.3" }, "conflict": { "symfony/dependency-injection": "<3.4" @@ -3967,7 +3855,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "4.2-dev" + "dev-master": "4.1-dev" } }, "autoload": { @@ -3994,20 +3882,20 @@ ], "description": "Symfony EventDispatcher Component", "homepage": "https://symfony.com", - "time": "2018-12-01T08:52:38+00:00" + "time": "2018-10-10T13:52:42+00:00" }, { "name": "symfony/finder", - "version": "v4.2.1", + "version": "v4.1.7", "source": { "type": "git", "url": "https://github.com/symfony/finder.git", - "reference": "e53d477d7b5c4982d0e1bfd2298dbee63d01441d" + "reference": "1f17195b44543017a9c9b2d437c670627e96ad06" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/finder/zipball/e53d477d7b5c4982d0e1bfd2298dbee63d01441d", - "reference": "e53d477d7b5c4982d0e1bfd2298dbee63d01441d", + "url": "https://api.github.com/repos/symfony/finder/zipball/1f17195b44543017a9c9b2d437c670627e96ad06", + "reference": "1f17195b44543017a9c9b2d437c670627e96ad06", "shasum": "" }, "require": { @@ -4016,7 +3904,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "4.2-dev" + "dev-master": "4.1-dev" } }, "autoload": { @@ -4043,20 +3931,20 @@ ], "description": "Symfony Finder Component", "homepage": "https://symfony.com", - "time": "2018-11-11T19:52:12+00:00" + "time": "2018-10-03T08:47:56+00:00" }, { "name": "symfony/http-foundation", - "version": "v4.2.1", + "version": "v4.1.7", "source": { "type": "git", "url": "https://github.com/symfony/http-foundation.git", - "reference": "1b31f3017fadd8cb05cf2c8aebdbf3b12a943851" + "reference": "82d494c1492b0dd24bbc5c2d963fb02eb44491af" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-foundation/zipball/1b31f3017fadd8cb05cf2c8aebdbf3b12a943851", - "reference": "1b31f3017fadd8cb05cf2c8aebdbf3b12a943851", + "url": "https://api.github.com/repos/symfony/http-foundation/zipball/82d494c1492b0dd24bbc5c2d963fb02eb44491af", + "reference": "82d494c1492b0dd24bbc5c2d963fb02eb44491af", "shasum": "" }, "require": { @@ -4070,7 +3958,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "4.2-dev" + "dev-master": "4.1-dev" } }, "autoload": { @@ -4097,26 +3985,25 @@ ], "description": "Symfony HttpFoundation Component", "homepage": "https://symfony.com", - "time": "2018-11-26T10:55:26+00:00" + "time": "2018-10-31T09:09:42+00:00" }, { "name": "symfony/http-kernel", - "version": "v4.2.1", + "version": "v4.1.7", "source": { "type": "git", "url": "https://github.com/symfony/http-kernel.git", - "reference": "b39ceffc0388232c309cbde3a7c3685f2ec0a624" + "reference": "958be64ab13b65172ad646ef5ae20364c2305fae" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-kernel/zipball/b39ceffc0388232c309cbde3a7c3685f2ec0a624", - "reference": "b39ceffc0388232c309cbde3a7c3685f2ec0a624", + "url": "https://api.github.com/repos/symfony/http-kernel/zipball/958be64ab13b65172ad646ef5ae20364c2305fae", + "reference": "958be64ab13b65172ad646ef5ae20364c2305fae", "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/http-foundation": "^4.1.1", @@ -4124,8 +4011,7 @@ }, "conflict": { "symfony/config": "<3.4", - "symfony/dependency-injection": "<4.2", - "symfony/translation": "<4.2", + "symfony/dependency-injection": "<4.1", "symfony/var-dumper": "<4.1.1", "twig/twig": "<1.34|<2.4,>=2" }, @@ -4138,7 +4024,7 @@ "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.1", "symfony/dom-crawler": "~3.4|~4.0", "symfony/expression-language": "~3.4|~4.0", "symfony/finder": "~3.4|~4.0", @@ -4146,7 +4032,7 @@ "symfony/routing": "~3.4|~4.0", "symfony/stopwatch": "~3.4|~4.0", "symfony/templating": "~3.4|~4.0", - "symfony/translation": "~4.2", + "symfony/translation": "~3.4|~4.0", "symfony/var-dumper": "^4.1.1" }, "suggest": { @@ -4159,7 +4045,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "4.2-dev" + "dev-master": "4.1-dev" } }, "autoload": { @@ -4186,7 +4072,7 @@ ], "description": "Symfony HttpKernel Component", "homepage": "https://symfony.com", - "time": "2018-12-06T17:39:52+00:00" + "time": "2018-11-03T11:11:23+00:00" }, { "name": "symfony/polyfill-ctype", @@ -4303,16 +4189,16 @@ }, { "name": "symfony/process", - "version": "v4.2.1", + "version": "v4.1.7", "source": { "type": "git", "url": "https://github.com/symfony/process.git", - "reference": "2b341009ccec76837a7f46f59641b431e4d4c2b0" + "reference": "3e83acef94d979b1de946599ef86b3a352abcdc9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/process/zipball/2b341009ccec76837a7f46f59641b431e4d4c2b0", - "reference": "2b341009ccec76837a7f46f59641b431e4d4c2b0", + "url": "https://api.github.com/repos/symfony/process/zipball/3e83acef94d979b1de946599ef86b3a352abcdc9", + "reference": "3e83acef94d979b1de946599ef86b3a352abcdc9", "shasum": "" }, "require": { @@ -4321,7 +4207,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "4.2-dev" + "dev-master": "4.1-dev" } }, "autoload": { @@ -4348,34 +4234,34 @@ ], "description": "Symfony Process Component", "homepage": "https://symfony.com", - "time": "2018-11-20T16:22:05+00:00" + "time": "2018-10-14T20:48:13+00:00" }, { "name": "symfony/routing", - "version": "v4.2.1", + "version": "v4.1.7", "source": { "type": "git", "url": "https://github.com/symfony/routing.git", - "reference": "649460207e77da6c545326c7f53618d23ad2c866" + "reference": "d4a3c14cfbe6b9c05a1d6e948654022d4d1ad3fd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/routing/zipball/649460207e77da6c545326c7f53618d23ad2c866", - "reference": "649460207e77da6c545326c7f53618d23ad2c866", + "url": "https://api.github.com/repos/symfony/routing/zipball/d4a3c14cfbe6b9c05a1d6e948654022d4d1ad3fd", + "reference": "d4a3c14cfbe6b9c05a1d6e948654022d4d1ad3fd", "shasum": "" }, "require": { "php": "^7.1.3" }, "conflict": { - "symfony/config": "<4.2", + "symfony/config": "<3.4", "symfony/dependency-injection": "<3.4", "symfony/yaml": "<3.4" }, "require-dev": { "doctrine/annotations": "~1.0", "psr/log": "~1.0", - "symfony/config": "~4.2", + "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", @@ -4392,7 +4278,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "4.2-dev" + "dev-master": "4.1-dev" } }, "autoload": { @@ -4425,25 +4311,24 @@ "uri", "url" ], - "time": "2018-12-03T22:08:12+00:00" + "time": "2018-10-28T18:38:52+00:00" }, { "name": "symfony/translation", - "version": "v4.2.1", + "version": "v4.1.7", "source": { "type": "git", "url": "https://github.com/symfony/translation.git", - "reference": "c0e2191e9bed845946ab3d99767513b56ca7dcd6" + "reference": "aa04dc1c75b7d3da7bd7003104cd0cfc5dff635c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/translation/zipball/c0e2191e9bed845946ab3d99767513b56ca7dcd6", - "reference": "c0e2191e9bed845946ab3d99767513b56ca7dcd6", + "url": "https://api.github.com/repos/symfony/translation/zipball/aa04dc1c75b7d3da7bd7003104cd0cfc5dff635c", + "reference": "aa04dc1c75b7d3da7bd7003104cd0cfc5dff635c", "shasum": "" }, "require": { "php": "^7.1.3", - "symfony/contracts": "^1.0.2", "symfony/polyfill-mbstring": "~1.0" }, "conflict": { @@ -4451,9 +4336,6 @@ "symfony/dependency-injection": "<3.4", "symfony/yaml": "<3.4" }, - "provide": { - "symfony/translation-contracts-implementation": "1.0" - }, "require-dev": { "psr/log": "~1.0", "symfony/config": "~3.4|~4.0", @@ -4471,7 +4353,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "4.2-dev" + "dev-master": "4.1-dev" } }, "autoload": { @@ -4498,20 +4380,20 @@ ], "description": "Symfony Translation Component", "homepage": "https://symfony.com", - "time": "2018-12-06T10:45:32+00:00" + "time": "2018-10-28T18:38:52+00:00" }, { "name": "symfony/var-dumper", - "version": "v4.2.1", + "version": "v4.1.7", "source": { "type": "git", "url": "https://github.com/symfony/var-dumper.git", - "reference": "db61258540350725f4beb6b84006e32398acd120" + "reference": "60319b45653580b0cdacca499344577d87732f16" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-dumper/zipball/db61258540350725f4beb6b84006e32398acd120", - "reference": "db61258540350725f4beb6b84006e32398acd120", + "url": "https://api.github.com/repos/symfony/var-dumper/zipball/60319b45653580b0cdacca499344577d87732f16", + "reference": "60319b45653580b0cdacca499344577d87732f16", "shasum": "" }, "require": { @@ -4539,7 +4421,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "4.2-dev" + "dev-master": "4.1-dev" } }, "autoload": { @@ -4573,7 +4455,7 @@ "debug", "dump" ], - "time": "2018-11-25T12:50:42+00:00" + "time": "2018-10-02T16:36:10+00:00" }, { "name": "tijsverkoyen/css-to-inline-styles", @@ -4860,16 +4742,16 @@ }, { "name": "barryvdh/laravel-debugbar", - "version": "v3.2.1", + "version": "v3.2.0", "source": { "type": "git", "url": "https://github.com/barryvdh/laravel-debugbar.git", - "reference": "9d5caf43c5f3a3aea2178942f281054805872e7c" + "reference": "5b68f3972083a7eeec0d6f161962fcda71a127c0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/barryvdh/laravel-debugbar/zipball/9d5caf43c5f3a3aea2178942f281054805872e7c", - "reference": "9d5caf43c5f3a3aea2178942f281054805872e7c", + "url": "https://api.github.com/repos/barryvdh/laravel-debugbar/zipball/5b68f3972083a7eeec0d6f161962fcda71a127c0", + "reference": "5b68f3972083a7eeec0d6f161962fcda71a127c0", "shasum": "" }, "require": { @@ -4924,7 +4806,7 @@ "profiler", "webprofiler" ], - "time": "2018-11-09T08:37:55+00:00" + "time": "2018-08-22T11:06:19+00:00" }, { "name": "doctrine/instantiator", @@ -6003,16 +5885,16 @@ }, { "name": "phpunit/phpunit", - "version": "7.5.0", + "version": "7.4.4", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "520723129e2b3fc1dc4c0953e43c9d40e1ecb352" + "reference": "b1be2c8530c4c29c3519a052c9fb6cee55053bbd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/520723129e2b3fc1dc4c0953e43c9d40e1ecb352", - "reference": "520723129e2b3fc1dc4c0953e43c9d40e1ecb352", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/b1be2c8530c4c29c3519a052c9fb6cee55053bbd", + "reference": "b1be2c8530c4c29c3519a052c9fb6cee55053bbd", "shasum": "" }, "require": { @@ -6033,7 +5915,7 @@ "phpunit/php-timer": "^2.0", "sebastian/comparator": "^3.0", "sebastian/diff": "^3.0", - "sebastian/environment": "^4.0", + "sebastian/environment": "^3.1 || ^4.0", "sebastian/exporter": "^3.1", "sebastian/global-state": "^2.0", "sebastian/object-enumerator": "^3.0.3", @@ -6057,7 +5939,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "7.5-dev" + "dev-master": "7.4-dev" } }, "autoload": { @@ -6083,7 +5965,7 @@ "testing", "xunit" ], - "time": "2018-12-07T07:08:12+00:00" + "time": "2018-11-14T16:52:02+00:00" }, { "name": "sebastian/code-unit-reverse-lookup", @@ -6252,28 +6134,28 @@ }, { "name": "sebastian/environment", - "version": "4.0.1", + "version": "3.1.0", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/environment.git", - "reference": "febd209a219cea7b56ad799b30ebbea34b71eb8f" + "reference": "cd0871b3975fb7fc44d11314fd1ee20925fce4f5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/febd209a219cea7b56ad799b30ebbea34b71eb8f", - "reference": "febd209a219cea7b56ad799b30ebbea34b71eb8f", + "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/cd0871b3975fb7fc44d11314fd1ee20925fce4f5", + "reference": "cd0871b3975fb7fc44d11314fd1ee20925fce4f5", "shasum": "" }, "require": { - "php": "^7.1" + "php": "^7.0" }, "require-dev": { - "phpunit/phpunit": "^7.4" + "phpunit/phpunit": "^6.1" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "4.0-dev" + "dev-master": "3.1.x-dev" } }, "autoload": { @@ -6298,7 +6180,7 @@ "environment", "hhvm" ], - "time": "2018-11-25T09:31:21+00:00" + "time": "2017-07-01T08:51:00+00:00" }, { "name": "sebastian/exporter", @@ -6650,16 +6532,16 @@ }, { "name": "symfony/dom-crawler", - "version": "v4.2.1", + "version": "v4.1.7", "source": { "type": "git", "url": "https://github.com/symfony/dom-crawler.git", - "reference": "7438a32108fdd555295f443605d6de2cce473159" + "reference": "80e60271bb288de2a2259662cff125cff4f93f95" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/7438a32108fdd555295f443605d6de2cce473159", - "reference": "7438a32108fdd555295f443605d6de2cce473159", + "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/80e60271bb288de2a2259662cff125cff4f93f95", + "reference": "80e60271bb288de2a2259662cff125cff4f93f95", "shasum": "" }, "require": { @@ -6676,7 +6558,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "4.2-dev" + "dev-master": "4.1-dev" } }, "autoload": { @@ -6703,7 +6585,7 @@ ], "description": "Symfony DomCrawler Component", "homepage": "https://symfony.com", - "time": "2018-11-26T10:55:26+00:00" + "time": "2018-10-02T12:40:59+00:00" }, { "name": "theseer/tokenizer", From 88ad1f7f0673b8636ba5414f5b3ba76288b4e897 Mon Sep 17 00:00:00 2001 From: Adrien Poupa Date: Sun, 6 Jan 2019 20:18:40 -0500 Subject: [PATCH 026/179] Typo in phpdoc --- app/Presenters/ComponentGroupPresenter.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Presenters/ComponentGroupPresenter.php b/app/Presenters/ComponentGroupPresenter.php index 554a971f..456831a4 100644 --- a/app/Presenters/ComponentGroupPresenter.php +++ b/app/Presenters/ComponentGroupPresenter.php @@ -21,7 +21,7 @@ class ComponentGroupPresenter extends BasePresenter implements Arrayable use TimestampsTrait; /** - * Flags for the enabled_components_lowest function. + * Flag for the enabled_components_lowest function. * * @var bool */ From 52433694cde8b7e558e7c0d250d4de299c42e51a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Mon, 7 Jan 2019 05:46:03 +0000 Subject: [PATCH 027/179] Bump symfony/dom-crawler from 4.2.1 to 4.2.2 Bumps [symfony/dom-crawler](https://github.com/symfony/dom-crawler) from 4.2.1 to 4.2.2. - [Release notes](https://github.com/symfony/dom-crawler/releases) - [Changelog](https://github.com/symfony/dom-crawler/blob/master/CHANGELOG.md) - [Commits](https://github.com/symfony/dom-crawler/compare/v4.2.1...v4.2.2) Signed-off-by: dependabot[bot] --- composer.lock | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/composer.lock b/composer.lock index 3bcdb4d0..2ae84acf 100644 --- a/composer.lock +++ b/composer.lock @@ -6845,16 +6845,16 @@ }, { "name": "symfony/dom-crawler", - "version": "v4.2.1", + "version": "v4.2.2", "source": { "type": "git", "url": "https://github.com/symfony/dom-crawler.git", - "reference": "7438a32108fdd555295f443605d6de2cce473159" + "reference": "8dc06251d5ad98d8494e1f742bec9cfdb9e42044" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/7438a32108fdd555295f443605d6de2cce473159", - "reference": "7438a32108fdd555295f443605d6de2cce473159", + "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/8dc06251d5ad98d8494e1f742bec9cfdb9e42044", + "reference": "8dc06251d5ad98d8494e1f742bec9cfdb9e42044", "shasum": "" }, "require": { @@ -6898,7 +6898,7 @@ ], "description": "Symfony DomCrawler Component", "homepage": "https://symfony.com", - "time": "2018-11-26T10:55:26+00:00" + "time": "2019-01-03T09:07:35+00:00" }, { "name": "theseer/tokenizer", From e89c627fe7cde5f569531b8cc02f1eb2af60be44 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Mon, 7 Jan 2019 05:49:38 +0000 Subject: [PATCH 028/179] Bump aws/aws-sdk-php from 3.82.3 to 3.82.6 Bumps [aws/aws-sdk-php](https://github.com/aws/aws-sdk-php) from 3.82.3 to 3.82.6. - [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.82.3...3.82.6) Signed-off-by: dependabot[bot] --- composer.lock | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/composer.lock b/composer.lock index 3bcdb4d0..9252f745 100644 --- a/composer.lock +++ b/composer.lock @@ -410,16 +410,16 @@ }, { "name": "aws/aws-sdk-php", - "version": "3.82.3", + "version": "3.82.6", "source": { "type": "git", "url": "https://github.com/aws/aws-sdk-php.git", - "reference": "a0353c24b18d2ba0f5bb7ca8a478b4ce0b8153f7" + "reference": "a254cef386f193249e2dea5ca54f66b3e2c00963" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/a0353c24b18d2ba0f5bb7ca8a478b4ce0b8153f7", - "reference": "a0353c24b18d2ba0f5bb7ca8a478b4ce0b8153f7", + "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/a254cef386f193249e2dea5ca54f66b3e2c00963", + "reference": "a254cef386f193249e2dea5ca54f66b3e2c00963", "shasum": "" }, "require": { @@ -489,7 +489,7 @@ "s3", "sdk" ], - "time": "2018-12-21T22:21:50+00:00" + "time": "2019-01-04T23:01:07+00:00" }, { "name": "bacon/bacon-qr-code", From 7c0ea27ecb6b9c0f25d523e42c67d5bb41df0a00 Mon Sep 17 00:00:00 2001 From: Cachet Bot <40326150+CachetBot@users.noreply.github.com> Date: Mon, 7 Jan 2019 13:30:17 +0000 Subject: [PATCH 029/179] New translations forms.php (Dutch) --- resources/lang/nl-NL/forms.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/resources/lang/nl-NL/forms.php b/resources/lang/nl-NL/forms.php index 36c68c1c..4a364882 100644 --- a/resources/lang/nl-NL/forms.php +++ b/resources/lang/nl-NL/forms.php @@ -154,9 +154,9 @@ return [ 'about-this-page' => 'Over deze pagina', 'days-of-incidents' => 'Hoeveel dagen moeten incidenten getoond worden?', 'time_before_refresh' => 'Statuspagina verversingssnelheid (in seconden)', - 'major_outage_rate' => 'Major outage threshold (in %)', + 'major_outage_rate' => 'Drempelwaarde voor grote onderbreking (in %)', 'banner' => 'Banner afbeelding', - 'banner-help' => 'Bij voorkeur geen afbeeldingen breder dan 930 pixels uploaden', + 'banner-help' => "Bij voorkeur geen afbeeldingen breder dan 930 pixels uploaden", 'subscribers' => 'Bezoekers toestaan om te abonneren op e-mail notificaties?', 'suppress_notifications_in_maintenance' => 'Onderdruk meldingen wanneer incident tijdens de onderhoudingsperiode voordoet?', 'skip_subscriber_verification' => 'Verificatie van gebruikers overslaan? (Let op, je kunt gespamd worden)', @@ -180,8 +180,8 @@ return [ 'security' => [ 'allowed-domains' => 'Toegestane domeinen', 'allowed-domains-help' => 'Door komma\'s gescheiden. Het hierboven ingestelde domein is automatisch standaard toegelaten.', - 'always-authenticate' => 'Always authenticate', - 'always-authenticate-help' => 'Require login to view any Cachet page', + 'always-authenticate' => 'Altijd aanmelden', + 'always-authenticate-help' => 'Aanmelding vereist om ieder Cachet pagina te bekijken', ], 'stylesheet' => [ 'custom-css' => 'Aangepaste Stylesheet', From 0c94ca8fbd4ca107897aefb624ce20a487e09a17 Mon Sep 17 00:00:00 2001 From: Cachet Bot <40326150+CachetBot@users.noreply.github.com> Date: Mon, 7 Jan 2019 13:30:19 +0000 Subject: [PATCH 030/179] New translations dashboard.php (Dutch) --- resources/lang/nl-NL/dashboard.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/resources/lang/nl-NL/dashboard.php b/resources/lang/nl-NL/dashboard.php index da930522..17f85c38 100644 --- a/resources/lang/nl-NL/dashboard.php +++ b/resources/lang/nl-NL/dashboard.php @@ -35,7 +35,7 @@ return [ 'failure' => 'Er is een fout opgetreden bij het wijzigen van de incident update', ], ], - 'reported_by' => 'Gemeld door: gebruiker', + 'reported_by' => 'Gemeld door :user', 'add' => [ 'title' => 'Meld een incident', 'success' => 'Incident toegevoegd.', @@ -56,7 +56,7 @@ return [ 'title' => 'Incident Sjablonen', 'add' => [ 'title' => 'Creëer een incident template', - 'message' => 'Create your first incident template.', + 'message' => 'Voeg een incident template toe.', 'success' => 'Je nieuwe incident template is aangemaakt.', 'failure' => 'Er is iets misgegaan met de incident template.', ], @@ -227,11 +227,11 @@ return [ 'footer' => 'Aangepaste voettekst HTML', ], 'mail' => [ - 'mail' => 'Mail', + 'mail' => 'E-mail', 'test' => 'Test', 'email' => [ - 'subject' => 'Test notification from Cachet', - 'body' => 'This is a test notification from Cachet.', + 'subject' => 'Test notificatie van Cachet', + 'body' => 'Dit is een test notificatie van Cachet.', ], ], 'security' => [ From 94161499b488326943c915ca0e5d5518c4a5516c Mon Sep 17 00:00:00 2001 From: Cachet Bot <40326150+CachetBot@users.noreply.github.com> Date: Mon, 7 Jan 2019 13:30:20 +0000 Subject: [PATCH 031/179] New translations validation.php (Dutch) --- resources/lang/nl-NL/validation.php | 64 ++++++++++++++--------------- 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/resources/lang/nl-NL/validation.php b/resources/lang/nl-NL/validation.php index 860e2bd4..55541862 100644 --- a/resources/lang/nl-NL/validation.php +++ b/resources/lang/nl-NL/validation.php @@ -32,59 +32,59 @@ return [ 'before' => ':attribute moet een datum vóór :date zijn.', 'between' => [ 'numeric' => ':attribute moet tussen :min en de :max zijn.', - 'file' => 'The :attribute must be between :min and :max kilobytes.', - 'string' => 'The :attribute must be between :min and :max characters.', + 'file' => ':attribute moet tussen de :min en de :max aantal kilobytes zijn.', + 'string' => ':attribute moet tussen de :min en :max karakters lang zijn.', 'array' => ':attribute moet tussen :min en :max items hebben.', ], - '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.', - '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.', + 'boolean' => 'Het :attribute veld moet waar of onwaar zijn.', + 'confirmed' => 'De :attribute bevestiging komt niet overeen.', + 'date' => ':attribute is geen geldige datum.', + 'date_format' => ':attribute komt niet overeen met het volgende formaat :format.', + 'different' => ':attribute en :other mogen niet hetzelfde zijn.', + 'digits' => ':attribute moet uit :digits cijfers bestaan.', + 'digits_between' => ':attribute moet tussen de :min en :max cijfers zijn.', + 'email' => ':attribute moet een geldig e-mail adres zijn.', + 'exists' => 'Het geselecteerde :attribute is ongeldig.', 'distinct' => 'Het :attribute veld heeft een dubbele waarde.', - 'filled' => 'The :attribute field is required.', + 'filled' => 'Het :attribute veld is verplicht.', 'image' => ':attribute moet een afbeelding zijn.', - 'in' => 'The selected :attribute is invalid.', + 'in' => 'Het geselecteerde :attribute is ongeldig.', 'in_array' => 'Het :attribute veld bestaat niet in :other.', - 'integer' => 'The :attribute must be an integer.', - 'ip' => 'The :attribute must be a valid IP address.', + 'integer' => ':attribute moet een geheel getal zijn.', + 'ip' => 'Het :attribute moet een geldig IP-adres zijn.', 'json' => ':attribute moet een valide JSON tekst zijn.', '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.', + 'numeric' => ':attribute mag niet groter zijn dan :max.', + 'file' => ':attribute mag niet groter zijn dan :max kilobytes.', + 'string' => ':attribute mag niet groter zijn dan :max tekens.', 'array' => ':attribute mag niet meer dan :max items hebben.', ], - 'mimes' => 'The :attribute must be a file of type: :values.', + 'mimes' => ':attribute moet een :values bestand zijn.', 'min' => [ - 'numeric' => 'The :attribute must be at least :min.', + 'numeric' => ':attribute moet tenminste :min zijn.', 'file' => ':attribute moet minstens :min kilobytes groot zijn.', - 'string' => 'The :attribute must be at least :min characters.', - 'array' => 'The :attribute must have at least :min items.', + 'string' => ':attribute moet minimaal :min tekens zijn.', + 'array' => ':attribute moet tenminste :min onderdelen hebben.', ], - 'not_in' => 'The selected :attribute is invalid.', - 'numeric' => 'The :attribute must be a number.', + 'not_in' => 'Het geselecteerde :attribute is ongeldig.', + 'numeric' => ':attribute moet een getal zijn.', 'present' => 'Het :attribute veld moet aanwezig zijn.', 'regex' => 'Het :attribute-formaat is ongeldig.', - 'required' => 'The :attribute field is required.', - 'required_if' => 'The :attribute field is required when :other is :value.', + 'required' => 'Het :attribute veld is verplicht.', + 'required_if' => 'Het :attribute veld is verplicht als :other :value is.', 'required_unless' => 'Het :attribute veld is verplicht tenzij :other is in :values.', 'required_with' => ':attribute veld is verplicht wanneer :values aanwezig zijn.', 'required_with_all' => ':attribute veld is verplicht wanneer :values aanwezig zijn.', - '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.', + 'required_without' => 'Het :attribute veld is verplicht als er geen :values zijn.', + 'required_without_all' => 'Het :attribute veld is verplicht als geen van :values aanwezig zijn.', + 'same' => ':attribute en :other moeten overeenkomen.', 'size' => [ - 'numeric' => 'The :attribute must be :size.', + 'numeric' => ':attribute moet :size zijn.', 'file' => ':attribute moet :size kilobytes groot zijn.', 'string' => ':attribute moet :size karakters zijn.', - 'array' => 'The :attribute must contain :size items.', + 'array' => ':attribute moet :size onderdelen bevatten.', ], - 'string' => 'The :attribute must be a string.', + 'string' => ':attribute moet een woord zijn.', 'timezone' => ':attribute moet een geldige zone zijn.', 'unique' => ':attribute is reeds in gebruik.', 'url' => 'Het :attribute-formaat is ongeldig.', From c6dc5f0d77b22a0b3133def484536d236220e6c7 Mon Sep 17 00:00:00 2001 From: Cachet Bot <40326150+CachetBot@users.noreply.github.com> Date: Mon, 7 Jan 2019 13:30:22 +0000 Subject: [PATCH 032/179] New translations cachet.php (Dutch) --- resources/lang/nl-NL/cachet.php | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/resources/lang/nl-NL/cachet.php b/resources/lang/nl-NL/cachet.php index d716d4bb..95130961 100644 --- a/resources/lang/nl-NL/cachet.php +++ b/resources/lang/nl-NL/cachet.php @@ -23,8 +23,8 @@ return [ 'group' => [ 'other' => 'Andere componenten', ], - 'select_all' => 'Select All', - 'deselect_all' => 'Deselect All', + 'select_all' => 'Alles selecteren', + 'deselect_all' => 'Alles deselecteren', ], // Incidents @@ -77,15 +77,15 @@ return [ // Subscriber 'subscriber' => [ - 'subscribe' => 'Subscribe to status changes and incident updates', - 'unsubscribe' => 'Unsubscribe', + 'subscribe' => 'Abonneer je op statuswijzigingen en incident updates', + 'unsubscribe' => 'Abonnement opzeggen', 'button' => 'Abonneren', - 'manage_subscription' => 'Manage subscription', + 'manage_subscription' => 'Abonnement beheren', 'manage' => [ 'notifications' => 'Notificaties', - 'notifications_for' => 'Manage notifications for', + 'notifications_for' => 'Beheer meldingen voor', 'no_subscriptions' => 'Je bent momenteel geabonneerd op alle updates.', - 'update_subscription' => 'Update Subscription', + 'update_subscription' => 'Abonnement bijwerken', 'my_subscriptions' => 'Je bent momenteel geabonneerd op de volgende updates.', 'manage_at_link' => 'Beheer uw abonnementen op: link', ], From 88ade80540c2e2f0f1842acec6de4aadcfcf3fae Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Mon, 14 Jan 2019 07:10:31 +0000 Subject: [PATCH 033/179] Bump fideloper/proxy from 4.0.0 to 4.1.0 Bumps [fideloper/proxy](https://github.com/fideloper/TrustedProxy) from 4.0.0 to 4.1.0. - [Release notes](https://github.com/fideloper/TrustedProxy/releases) - [Commits](https://github.com/fideloper/TrustedProxy/compare/4.0.0...4.1.0) Signed-off-by: dependabot[bot] --- composer.lock | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/composer.lock b/composer.lock index 6ff44866..3c883a16 100644 --- a/composer.lock +++ b/composer.lock @@ -1249,16 +1249,16 @@ }, { "name": "fideloper/proxy", - "version": "4.0.0", + "version": "4.1.0", "source": { "type": "git", "url": "https://github.com/fideloper/TrustedProxy.git", - "reference": "cf8a0ca4b85659b9557e206c90110a6a4dba980a" + "reference": "177c79a2d1f9970f89ee2fb4c12b429af38b6dfb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/fideloper/TrustedProxy/zipball/cf8a0ca4b85659b9557e206c90110a6a4dba980a", - "reference": "cf8a0ca4b85659b9557e206c90110a6a4dba980a", + "url": "https://api.github.com/repos/fideloper/TrustedProxy/zipball/177c79a2d1f9970f89ee2fb4c12b429af38b6dfb", + "reference": "177c79a2d1f9970f89ee2fb4c12b429af38b6dfb", "shasum": "" }, "require": { @@ -1299,7 +1299,7 @@ "proxy", "trusted proxy" ], - "time": "2018-02-07T20:20:57+00:00" + "time": "2019-01-10T14:06:47+00:00" }, { "name": "graham-campbell/binput", From 2def96f8d55b3eaceb66090c6798a2ffb770f3a5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Mon, 21 Jan 2019 07:00:14 +0000 Subject: [PATCH 034/179] [Security] Bump twig/twig from 2.6.0 to 2.6.2 Bumps [twig/twig](https://github.com/twigphp/Twig) from 2.6.0 to 2.6.2. **This update includes security fixes.** - [Release notes](https://github.com/twigphp/Twig/releases) - [Changelog](https://github.com/twigphp/Twig/blob/2.x/CHANGELOG) - [Commits](https://github.com/twigphp/Twig/compare/v2.6.0...v2.6.2) Signed-off-by: dependabot[bot] --- composer.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/composer.lock b/composer.lock index 6ff44866..a2625dba 100644 --- a/composer.lock +++ b/composer.lock @@ -4427,7 +4427,7 @@ }, { "name": "Gert de Pagter", - "email": "BackEndTea@gmail.com" + "email": "backendtea@gmail.com" } ], "description": "Symfony polyfill for ctype functions", @@ -4818,16 +4818,16 @@ }, { "name": "twig/twig", - "version": "v2.6.0", + "version": "v2.6.2", "source": { "type": "git", "url": "https://github.com/twigphp/Twig.git", - "reference": "a11dd39f5b6589e14f0ff3b36675d06047c589b1" + "reference": "7d7342c8a4059fefb9b8d07db0cc14007021f9b7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/twigphp/Twig/zipball/a11dd39f5b6589e14f0ff3b36675d06047c589b1", - "reference": "a11dd39f5b6589e14f0ff3b36675d06047c589b1", + "url": "https://api.github.com/repos/twigphp/Twig/zipball/7d7342c8a4059fefb9b8d07db0cc14007021f9b7", + "reference": "7d7342c8a4059fefb9b8d07db0cc14007021f9b7", "shasum": "" }, "require": { @@ -4881,7 +4881,7 @@ "keywords": [ "templating" ], - "time": "2018-12-16T10:36:48+00:00" + "time": "2019-01-14T15:00:48+00:00" }, { "name": "vlucas/phpdotenv", From 63ebec155891df693e2bb9e8686858f4344546b1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Mon, 21 Jan 2019 07:02:56 +0000 Subject: [PATCH 035/179] Bump aws/aws-sdk-php from 3.82.6 to 3.86.2 Bumps [aws/aws-sdk-php](https://github.com/aws/aws-sdk-php) from 3.82.6 to 3.86.2. - [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.82.6...3.86.2) Signed-off-by: dependabot[bot] --- composer.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/composer.lock b/composer.lock index 6ff44866..8a4e9115 100644 --- a/composer.lock +++ b/composer.lock @@ -410,16 +410,16 @@ }, { "name": "aws/aws-sdk-php", - "version": "3.82.6", + "version": "3.86.2", "source": { "type": "git", "url": "https://github.com/aws/aws-sdk-php.git", - "reference": "a254cef386f193249e2dea5ca54f66b3e2c00963" + "reference": "50224232ac7a4e2a6fa4ebbe0281e5b7503acf76" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/a254cef386f193249e2dea5ca54f66b3e2c00963", - "reference": "a254cef386f193249e2dea5ca54f66b3e2c00963", + "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/50224232ac7a4e2a6fa4ebbe0281e5b7503acf76", + "reference": "50224232ac7a4e2a6fa4ebbe0281e5b7503acf76", "shasum": "" }, "require": { @@ -489,7 +489,7 @@ "s3", "sdk" ], - "time": "2019-01-04T23:01:07+00:00" + "time": "2019-01-18T21:10:44+00:00" }, { "name": "bacon/bacon-qr-code", @@ -4427,7 +4427,7 @@ }, { "name": "Gert de Pagter", - "email": "BackEndTea@gmail.com" + "email": "backendtea@gmail.com" } ], "description": "Symfony polyfill for ctype functions", From 035805c19f59cd8d6073e1c111c6b2ff5a701880 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Mon, 21 Jan 2019 07:06:07 +0000 Subject: [PATCH 036/179] Bump laravel/framework from 5.7.19 to 5.7.21 Bumps [laravel/framework](https://github.com/laravel/framework) from 5.7.19 to 5.7.21. - [Release notes](https://github.com/laravel/framework/releases) - [Changelog](https://github.com/laravel/framework/blob/5.7/CHANGELOG-5.7.md) - [Commits](https://github.com/laravel/framework/compare/v5.7.19...v5.7.21) Signed-off-by: dependabot[bot] --- composer.lock | 137 +++++++++++++++++++++++++------------------------- 1 file changed, 69 insertions(+), 68 deletions(-) diff --git a/composer.lock b/composer.lock index 6ff44866..07f662ec 100644 --- a/composer.lock +++ b/composer.lock @@ -2094,16 +2094,16 @@ }, { "name": "laravel/framework", - "version": "v5.7.19", + "version": "v5.7.21", "source": { "type": "git", "url": "https://github.com/laravel/framework.git", - "reference": "5c1d1ec7e8563ea31826fd5eb3f6791acf01160c" + "reference": "25f74458a242b61cc9e9c09d31f94fb13ed805f3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/framework/zipball/5c1d1ec7e8563ea31826fd5eb3f6791acf01160c", - "reference": "5c1d1ec7e8563ea31826fd5eb3f6791acf01160c", + "url": "https://api.github.com/repos/laravel/framework/zipball/25f74458a242b61cc9e9c09d31f94fb13ed805f3", + "reference": "25f74458a242b61cc9e9c09d31f94fb13ed805f3", "shasum": "" }, "require": { @@ -2177,7 +2177,7 @@ "moontoast/math": "^1.1", "orchestra/testbench-core": "3.7.*", "pda/pheanstalk": "^3.0", - "phpunit/phpunit": "^7.0", + "phpunit/phpunit": "^7.5", "predis/predis": "^1.1.1", "symfony/css-selector": "^4.1", "symfony/dom-crawler": "^4.1", @@ -2236,7 +2236,7 @@ "framework", "laravel" ], - "time": "2018-12-18T14:00:38+00:00" + "time": "2019-01-15T15:20:32+00:00" }, { "name": "laravel/nexmo-notification-channel", @@ -3051,16 +3051,16 @@ }, { "name": "opis/closure", - "version": "3.1.2", + "version": "3.1.5", "source": { "type": "git", "url": "https://github.com/opis/closure.git", - "reference": "de00c69a2328d3ee5baa71fc584dc643222a574c" + "reference": "41f5da65d75cf473e5ee582df8fc7f2c733ce9d6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/opis/closure/zipball/de00c69a2328d3ee5baa71fc584dc643222a574c", - "reference": "de00c69a2328d3ee5baa71fc584dc643222a574c", + "url": "https://api.github.com/repos/opis/closure/zipball/41f5da65d75cf473e5ee582df8fc7f2c733ce9d6", + "reference": "41f5da65d75cf473e5ee582df8fc7f2c733ce9d6", "shasum": "" }, "require": { @@ -3073,7 +3073,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.0.x-dev" + "dev-master": "3.1.x-dev" } }, "autoload": { @@ -3108,7 +3108,7 @@ "serialization", "serialize" ], - "time": "2018-12-16T21:48:23+00:00" + "time": "2019-01-14T14:45:33+00:00" }, { "name": "php-http/guzzle6-adapter", @@ -3882,16 +3882,16 @@ }, { "name": "symfony/console", - "version": "v4.2.1", + "version": "v4.2.2", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "4dff24e5d01e713818805c1862d2e3f901ee7dd0" + "reference": "b0a03c1bb0fcbe288629956cf2f1dd3f1dc97522" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/4dff24e5d01e713818805c1862d2e3f901ee7dd0", - "reference": "4dff24e5d01e713818805c1862d2e3f901ee7dd0", + "url": "https://api.github.com/repos/symfony/console/zipball/b0a03c1bb0fcbe288629956cf2f1dd3f1dc97522", + "reference": "b0a03c1bb0fcbe288629956cf2f1dd3f1dc97522", "shasum": "" }, "require": { @@ -3947,7 +3947,7 @@ ], "description": "Symfony Console Component", "homepage": "https://symfony.com", - "time": "2018-11-27T07:40:44+00:00" + "time": "2019-01-04T15:13:53+00:00" }, { "name": "symfony/contracts", @@ -4072,16 +4072,16 @@ }, { "name": "symfony/debug", - "version": "v4.2.1", + "version": "v4.2.2", "source": { "type": "git", "url": "https://github.com/symfony/debug.git", - "reference": "e0a2b92ee0b5b934f973d90c2f58e18af109d276" + "reference": "64cb33c81e37d19b7715d4a6a4d49c1c382066dd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/debug/zipball/e0a2b92ee0b5b934f973d90c2f58e18af109d276", - "reference": "e0a2b92ee0b5b934f973d90c2f58e18af109d276", + "url": "https://api.github.com/repos/symfony/debug/zipball/64cb33c81e37d19b7715d4a6a4d49c1c382066dd", + "reference": "64cb33c81e37d19b7715d4a6a4d49c1c382066dd", "shasum": "" }, "require": { @@ -4124,20 +4124,20 @@ ], "description": "Symfony Debug Component", "homepage": "https://symfony.com", - "time": "2018-11-28T18:24:18+00:00" + "time": "2019-01-03T09:07:35+00:00" }, { "name": "symfony/event-dispatcher", - "version": "v4.2.1", + "version": "v4.2.2", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher.git", - "reference": "921f49c3158a276d27c0d770a5a347a3b718b328" + "reference": "887de6d34c86cf0cb6cbf910afb170cdb743cb5e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/921f49c3158a276d27c0d770a5a347a3b718b328", - "reference": "921f49c3158a276d27c0d770a5a347a3b718b328", + "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/887de6d34c86cf0cb6cbf910afb170cdb743cb5e", + "reference": "887de6d34c86cf0cb6cbf910afb170cdb743cb5e", "shasum": "" }, "require": { @@ -4188,20 +4188,20 @@ ], "description": "Symfony EventDispatcher Component", "homepage": "https://symfony.com", - "time": "2018-12-01T08:52:38+00:00" + "time": "2019-01-05T16:37:49+00:00" }, { "name": "symfony/finder", - "version": "v4.2.1", + "version": "v4.2.2", "source": { "type": "git", "url": "https://github.com/symfony/finder.git", - "reference": "e53d477d7b5c4982d0e1bfd2298dbee63d01441d" + "reference": "9094d69e8c6ee3fe186a0ec5a4f1401e506071ce" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/finder/zipball/e53d477d7b5c4982d0e1bfd2298dbee63d01441d", - "reference": "e53d477d7b5c4982d0e1bfd2298dbee63d01441d", + "url": "https://api.github.com/repos/symfony/finder/zipball/9094d69e8c6ee3fe186a0ec5a4f1401e506071ce", + "reference": "9094d69e8c6ee3fe186a0ec5a4f1401e506071ce", "shasum": "" }, "require": { @@ -4237,20 +4237,20 @@ ], "description": "Symfony Finder Component", "homepage": "https://symfony.com", - "time": "2018-11-11T19:52:12+00:00" + "time": "2019-01-03T09:07:35+00:00" }, { "name": "symfony/http-foundation", - "version": "v4.2.1", + "version": "v4.2.2", "source": { "type": "git", "url": "https://github.com/symfony/http-foundation.git", - "reference": "1b31f3017fadd8cb05cf2c8aebdbf3b12a943851" + "reference": "a633d422a09242064ba24e44a6e1494c5126de86" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-foundation/zipball/1b31f3017fadd8cb05cf2c8aebdbf3b12a943851", - "reference": "1b31f3017fadd8cb05cf2c8aebdbf3b12a943851", + "url": "https://api.github.com/repos/symfony/http-foundation/zipball/a633d422a09242064ba24e44a6e1494c5126de86", + "reference": "a633d422a09242064ba24e44a6e1494c5126de86", "shasum": "" }, "require": { @@ -4291,20 +4291,20 @@ ], "description": "Symfony HttpFoundation Component", "homepage": "https://symfony.com", - "time": "2018-11-26T10:55:26+00:00" + "time": "2019-01-05T16:37:49+00:00" }, { "name": "symfony/http-kernel", - "version": "v4.2.1", + "version": "v4.2.2", "source": { "type": "git", "url": "https://github.com/symfony/http-kernel.git", - "reference": "b39ceffc0388232c309cbde3a7c3685f2ec0a624" + "reference": "83de6543328917c18d5498eeb6bb6d36f7aab31b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-kernel/zipball/b39ceffc0388232c309cbde3a7c3685f2ec0a624", - "reference": "b39ceffc0388232c309cbde3a7c3685f2ec0a624", + "url": "https://api.github.com/repos/symfony/http-kernel/zipball/83de6543328917c18d5498eeb6bb6d36f7aab31b", + "reference": "83de6543328917c18d5498eeb6bb6d36f7aab31b", "shasum": "" }, "require": { @@ -4380,7 +4380,7 @@ ], "description": "Symfony HttpKernel Component", "homepage": "https://symfony.com", - "time": "2018-12-06T17:39:52+00:00" + "time": "2019-01-06T16:19:23+00:00" }, { "name": "symfony/polyfill-ctype", @@ -4427,7 +4427,7 @@ }, { "name": "Gert de Pagter", - "email": "BackEndTea@gmail.com" + "email": "backendtea@gmail.com" } ], "description": "Symfony polyfill for ctype functions", @@ -4497,16 +4497,16 @@ }, { "name": "symfony/process", - "version": "v4.2.1", + "version": "v4.2.2", "source": { "type": "git", "url": "https://github.com/symfony/process.git", - "reference": "2b341009ccec76837a7f46f59641b431e4d4c2b0" + "reference": "ea043ab5d8ed13b467a9087d81cb876aee7f689a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/process/zipball/2b341009ccec76837a7f46f59641b431e4d4c2b0", - "reference": "2b341009ccec76837a7f46f59641b431e4d4c2b0", + "url": "https://api.github.com/repos/symfony/process/zipball/ea043ab5d8ed13b467a9087d81cb876aee7f689a", + "reference": "ea043ab5d8ed13b467a9087d81cb876aee7f689a", "shasum": "" }, "require": { @@ -4542,20 +4542,20 @@ ], "description": "Symfony Process Component", "homepage": "https://symfony.com", - "time": "2018-11-20T16:22:05+00:00" + "time": "2019-01-03T14:48:52+00:00" }, { "name": "symfony/routing", - "version": "v4.2.1", + "version": "v4.2.2", "source": { "type": "git", "url": "https://github.com/symfony/routing.git", - "reference": "649460207e77da6c545326c7f53618d23ad2c866" + "reference": "e69b7a13a0b58af378a49b49dd7084462de16cee" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/routing/zipball/649460207e77da6c545326c7f53618d23ad2c866", - "reference": "649460207e77da6c545326c7f53618d23ad2c866", + "url": "https://api.github.com/repos/symfony/routing/zipball/e69b7a13a0b58af378a49b49dd7084462de16cee", + "reference": "e69b7a13a0b58af378a49b49dd7084462de16cee", "shasum": "" }, "require": { @@ -4619,20 +4619,20 @@ "uri", "url" ], - "time": "2018-12-03T22:08:12+00:00" + "time": "2019-01-03T09:07:35+00:00" }, { "name": "symfony/translation", - "version": "v4.2.1", + "version": "v4.2.2", "source": { "type": "git", "url": "https://github.com/symfony/translation.git", - "reference": "c0e2191e9bed845946ab3d99767513b56ca7dcd6" + "reference": "939fb792d73f2ce80e6ae9019d205fc480f1c9a0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/translation/zipball/c0e2191e9bed845946ab3d99767513b56ca7dcd6", - "reference": "c0e2191e9bed845946ab3d99767513b56ca7dcd6", + "url": "https://api.github.com/repos/symfony/translation/zipball/939fb792d73f2ce80e6ae9019d205fc480f1c9a0", + "reference": "939fb792d73f2ce80e6ae9019d205fc480f1c9a0", "shasum": "" }, "require": { @@ -4692,20 +4692,20 @@ ], "description": "Symfony Translation Component", "homepage": "https://symfony.com", - "time": "2018-12-06T10:45:32+00:00" + "time": "2019-01-03T09:07:35+00:00" }, { "name": "symfony/var-dumper", - "version": "v4.2.1", + "version": "v4.2.2", "source": { "type": "git", "url": "https://github.com/symfony/var-dumper.git", - "reference": "db61258540350725f4beb6b84006e32398acd120" + "reference": "85bde661b178173d85c6f11ea9d03b61d1212bb2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-dumper/zipball/db61258540350725f4beb6b84006e32398acd120", - "reference": "db61258540350725f4beb6b84006e32398acd120", + "url": "https://api.github.com/repos/symfony/var-dumper/zipball/85bde661b178173d85c6f11ea9d03b61d1212bb2", + "reference": "85bde661b178173d85c6f11ea9d03b61d1212bb2", "shasum": "" }, "require": { @@ -4719,6 +4719,7 @@ }, "require-dev": { "ext-iconv": "*", + "symfony/console": "~3.4|~4.0", "symfony/process": "~3.4|~4.0", "twig/twig": "~1.34|~2.4" }, @@ -4767,7 +4768,7 @@ "debug", "dump" ], - "time": "2018-11-25T12:50:42+00:00" + "time": "2019-01-03T09:07:35+00:00" }, { "name": "tijsverkoyen/css-to-inline-styles", @@ -4885,16 +4886,16 @@ }, { "name": "vlucas/phpdotenv", - "version": "v2.5.1", + "version": "v2.5.2", "source": { "type": "git", "url": "https://github.com/vlucas/phpdotenv.git", - "reference": "8abb4f9aa89ddea9d52112c65bbe8d0125e2fa8e" + "reference": "cfd5dc225767ca154853752abc93aeec040fcf36" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/8abb4f9aa89ddea9d52112c65bbe8d0125e2fa8e", - "reference": "8abb4f9aa89ddea9d52112c65bbe8d0125e2fa8e", + "url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/cfd5dc225767ca154853752abc93aeec040fcf36", + "reference": "cfd5dc225767ca154853752abc93aeec040fcf36", "shasum": "" }, "require": { @@ -4931,7 +4932,7 @@ "env", "environment" ], - "time": "2018-07-29T20:33:41+00:00" + "time": "2018-10-30T17:29:25+00:00" }, { "name": "zendframework/zend-diactoros", From e873d08369ebde7454a86cadb4a20d23af27ce5e Mon Sep 17 00:00:00 2001 From: Cachet Bot <40326150+CachetBot@users.noreply.github.com> Date: Wed, 23 Jan 2019 09:03:57 +0000 Subject: [PATCH 037/179] New translations cachet.php (German) --- resources/lang/de-DE/cachet.php | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/resources/lang/de-DE/cachet.php b/resources/lang/de-DE/cachet.php index eed8feb4..c64afe57 100644 --- a/resources/lang/de-DE/cachet.php +++ b/resources/lang/de-DE/cachet.php @@ -23,8 +23,8 @@ return [ 'group' => [ 'other' => 'Andere Komponenten', ], - 'select_all' => 'Select All', - 'deselect_all' => 'Deselect All', + 'select_all' => 'Alles auswählen', + 'deselect_all' => 'Alles abwählen', ], // Incidents @@ -56,8 +56,8 @@ return [ // Service Status 'service' => [ 'good' => '[0,1]System funktioniert|[2,*]Alle Systeme funktionieren', - 'bad' => '[0,1]The system is experiencing issues|[2,*]Some systems are experiencing issues', - 'major' => '[0,1]The system is experiencing major issues|[2,*]Some systems are experiencing major issues', + 'bad' => '[0,1] Das System hat momentan Probleme|[2,*] Mehrere Systeme haben momentan Probleme', + 'major' => '[0,1] Das System hat ein schwerwiegendes Problem|[2,*] Mehrere Systeme haben ein schwerwiegendes Problem', ], 'api' => [ @@ -77,17 +77,17 @@ return [ // Subscriber 'subscriber' => [ - 'subscribe' => 'Subscribe to status changes and incident updates', - 'unsubscribe' => 'Unsubscribe', + 'subscribe' => 'Abonniere Status- und Vorfalländerungen', + 'unsubscribe' => 'Abmelden', 'button' => 'Abonnieren', - 'manage_subscription' => 'Manage subscription', + 'manage_subscription' => 'Abonnements verwalten', 'manage' => [ 'notifications' => 'Benachrichtigungen', - 'notifications_for' => 'Manage notifications for', + 'notifications_for' => 'Verwalten von Benachrichtigungen für', 'no_subscriptions' => 'Du hast im Augenblick alle Updates abonniert.', - 'update_subscription' => 'Update Subscription', + 'update_subscription' => 'Update-Abonnement', 'my_subscriptions' => 'Du hast im Augenblick folgende Updates abonniert.', - 'manage_at_link' => 'Manage your subscriptions at :link', + 'manage_at_link' => 'Verwalte deine Abonnements unter :link', ], 'email' => [ 'subscribe' => 'Aktualisierungen per E-Mail abonnieren.', @@ -128,8 +128,8 @@ return [ 'meta' => [ 'description' => [ 'incident' => 'Details und Aktualisierung über den :name Vorfall, die am :date aufgetreten sind', - 'schedule' => 'Details about the scheduled maintenance period :name starting :startDate', - 'subscribe' => 'Subscribe to :app in order to receive updates of incidents and scheduled maintenance periods', + 'schedule' => 'Details zu den geplanten Wartungszeitraum :name beginnend ab :startDate', + 'subscribe' => 'Abonniere :app um Updates von Vorfällen und geplanten Wartungszeiten zu erhalten', 'overview' => 'Bleiben sie auf dem Laufenden mit den neuesten Service-Updates von :app.', ], ], From 250461d0639647bc0b6d562cecd8da974fe0adb0 Mon Sep 17 00:00:00 2001 From: Cachet Bot <40326150+CachetBot@users.noreply.github.com> Date: Wed, 23 Jan 2019 09:04:00 +0000 Subject: [PATCH 038/179] New translations dashboard.php (German) --- resources/lang/de-DE/dashboard.php | 46 +++++++++++++++--------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/resources/lang/de-DE/dashboard.php b/resources/lang/de-DE/dashboard.php index f0ecac73..eb266348 100644 --- a/resources/lang/de-DE/dashboard.php +++ b/resources/lang/de-DE/dashboard.php @@ -16,26 +16,26 @@ return [ // Incidents 'incidents' => [ - 'title' => 'Incidents & Maintenance', + 'title' => 'Vorfälle & Wartungsarbeiten', 'incidents' => 'Ereignisse', - 'logged' => '{0}There are no incidents, good work.|[1]You have logged one incident.|[2,*]You have reported :count incidents.', + 'logged' => '{0}Es gibt keine Ereignisse, gute Arbeit.|[1]Du hast ein Ereignis gemeldet.|[2,*]Du hast :count Ereignisse gemeldet.', 'incident-create-template' => 'Vorlage erstellen', 'incident-templates' => 'Ereignis Vorlagen', 'updates' => [ - 'title' => 'Incident updates for :incident', - 'count' => '{0}Zero Updates|[1]One Update|[2]Two Updates|[3,*]Several Updates', + 'title' => 'Vorfall Updates für :incident', + 'count' => '{0}Keine Updates|[1]Ein Update|[2]Zwei Updates|[3,*]Mehrere Updates', 'add' => [ 'title' => 'Vorfall-Update erstellen', - 'success' => 'Your new incident update has been created.', - 'failure' => 'Something went wrong with the incident update.', + 'success' => 'Dein Vorfall Update wurde erstellt.', + 'failure' => 'Etwas ist mit dem Vorfall Update schief gelaufen.', ], 'edit' => [ - 'title' => 'Edit incident update', - 'success' => 'The incident update has been updated.', - 'failure' => 'Something went wrong updating the incident update', + 'title' => 'Vorfall Update bearbeiten', + 'success' => 'Vorfall wurde aktualisiert.', + 'failure' => 'Etwas ist mit dem Aktualisieren des Vorfall Updates schief gelaufen', ], ], - 'reported_by' => 'Reported by :user', + 'reported_by' => 'Gemeldet von :user', 'add' => [ 'title' => 'Ereignis hinzufügen', 'success' => 'Ereignis hinzugefügt.', @@ -56,7 +56,7 @@ return [ 'title' => 'Ereignis Vorlagen', 'add' => [ 'title' => 'Ereignisvorlage erstellen', - 'message' => 'Create your first incident template.', + 'message' => 'Du solltest eine Ereignis-Vorlage hinzufügen.', 'success' => 'Deine neue Ereignis-Vorlage wurde angelegt.', 'failure' => 'Etwas ist mit der Ereignis-Vorlage schief gelaufen.', ], @@ -74,22 +74,22 @@ return [ // Incident Maintenance 'schedule' => [ - 'schedule' => 'Maintenance', - 'logged' => '{0}There has been no Maintenance, good work.|[1]You have logged one schedule.|[2,*]You have reported :count schedules.', + 'schedule' => 'Wartungsarbeiten', + 'logged' => '{0}Es gibt keine geplanten Wartungen, gute Arbeit.|[1]Du hast einen Eintrag erstellt.|[2,*]Du hast :count Einträge erstellt.', 'scheduled_at' => 'Geplant am :timestamp', 'add' => [ - 'title' => 'Add Maintenance', - 'success' => 'Maintenance added.', - 'failure' => 'Something went wrong adding the Maintenance, please try again.', + 'title' => 'Wartungsarbeiten hinzufügen', + 'success' => 'Wartungsarbeiten hinzugefügt.', + 'failure' => 'Etwas lief schief mit dem Hinzufügen des Zeitplans. Bitte versuchen Sie es erneut.', ], 'edit' => [ - 'title' => 'Edit Maintenance', - 'success' => 'Maintenance has been updated!', - 'failure' => 'Something went wrong editing the Maintenance, please try again.', + 'title' => 'Planmäßige Wartung bearbeiten', + 'success' => 'Wartungsarbeiten wurden aktualisiert!', + 'failure' => 'Etwas lief schief mit dem Editieren des Zeitplans. Bitte versuchen Sie es erneut.', ], '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' => 'Der Zeitplan wurde gelöscht und wird nicht auf Ihrer Statusseite angezeigt.', + 'failure' => 'Der Zeitplan konnte nicht gelöscht werden. Bitte versuchen Sie es erneut.', ], ], @@ -158,12 +158,12 @@ return [ 'subscribers' => [ 'subscribers' => 'Abonnenten', 'description' => 'Abonnenten erhalten E-Mail Updates, wenn Vorfälle erstellt oder Komponenten bearbeitet werden.', - 'description_disabled' => 'To use this feature, you need allow people to signup for notifications.', + 'description_disabled' => 'Um diese Funktion nutzen zu können, musst du zulassen, dass sich Personen für Benachrichtigungen anmelden dürfen.', 'verified' => 'Bestätigt', 'not_verified' => 'Nicht Bestätigt', 'subscriber' => ':email, abonniert am :date', 'no_subscriptions' => 'Aktualisierungen per E-Mail abonnieren', - 'global' => 'Globally subscribed', + 'global' => 'Alles abonniert', 'add' => [ 'title' => 'Einen neuen Abonnenten hinzufügen', 'success' => 'Abonnent hinzugefügt.', From ec38e17572bad5d079b481ad560ed9910bab2394 Mon Sep 17 00:00:00 2001 From: Cachet Bot <40326150+CachetBot@users.noreply.github.com> Date: Wed, 23 Jan 2019 09:04:02 +0000 Subject: [PATCH 039/179] New translations forms.php (German) --- resources/lang/de-DE/forms.php | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/resources/lang/de-DE/forms.php b/resources/lang/de-DE/forms.php index d0b3ea40..cff4ed8e 100644 --- a/resources/lang/de-DE/forms.php +++ b/resources/lang/de-DE/forms.php @@ -49,12 +49,12 @@ return [ 'name' => 'Name', 'status' => 'Status', 'component' => 'Komponente', - 'component_status' => 'Component Status', + 'component_status' => 'Komponentenstatus', 'message' => 'Nachricht', 'message-help' => 'Sie können auch Markdown verwenden.', 'occurred_at' => 'Wann ist dieser Vorfall aufgetreten?', 'notify_subscribers' => 'Abonnenten benachrichtigen', - 'notify_disabled' => 'Due to scheduled maintenance, notifications about this incident or its components will be suppressed.', + 'notify_disabled' => 'Aufgrund von Wartungsarbeiten werden Benachrichtigungen über diesen Vorfall oder seiner Komponenten unterdrückt.', 'visibility' => 'Ereignis Sichtbarkeit', 'stick_status' => 'Vorfall anpinnen', 'stickied' => 'Angepinnt', @@ -153,16 +153,16 @@ return [ 'display-graphs' => 'Graphen auf der Statusseite anzeigen?', 'about-this-page' => 'Über diese Seite', 'days-of-incidents' => 'Wie viele Tage mit Vorfällen sollen gezeigt werden?', - 'time_before_refresh' => 'Status page refresh rate (in seconds)', - 'major_outage_rate' => 'Major outage threshold (in %)', + 'time_before_refresh' => 'Aktualisierungsrate der Statusseite (in Sekunden)', + 'major_outage_rate' => 'Grenzwert für schwerwiegende Ausfälle (in %)', 'banner' => 'Banner Bild', - 'banner-help' => "It's recommended that you upload files no bigger than 930px wide", + 'banner-help' => "Es wird empfohlen, dass Sie keine Dateien, die breiter als 930 Pixel sind, hochladen", 'subscribers' => 'Personen die Anmeldung für E-Mail-Benachrichtigung erlauben?', - 'suppress_notifications_in_maintenance' => 'Suppress notifications when incident occurs during maintenance period?', + 'suppress_notifications_in_maintenance' => 'Möchten Sie Benachrichtigungen über einen Vorfall während des Zeitraumes der Wartungsarbeiten unterdrücken?', 'skip_subscriber_verification' => 'Verifizierung der Nutzer überspringen? (Warnung, du könntest gespammt werden)', 'automatic_localization' => 'Die Status-Seite automatisch auf die Sprache deiner Besucher anpassen?', 'enable_external_dependencies' => 'Drittanbieter Abhängigkeiten erlauben (Google Schriftarten, Tracker, etc...)', - 'show_timezone' => 'Show the timezone the status page is running in', + 'show_timezone' => 'Zeitzone in der sich die Status-Seite befindet anzeigen', 'only_disrupted_days' => 'Im Verlauf nur Tage mit Vorfällen anzeigen?', ], 'analytics' => [ @@ -180,8 +180,8 @@ return [ 'security' => [ 'allowed-domains' => 'Erlaubte Domains', 'allowed-domains-help' => 'Durch Kommata trennen. Die oben genannte Domain ist standardmäßig erlaubt.', - 'always-authenticate' => 'Always authenticate', - 'always-authenticate-help' => 'Require login to view any Cachet page', + 'always-authenticate' => 'Immer anmelden', + 'always-authenticate-help' => 'Anmeldung für alle Cachet Seiten erzwingen', ], 'stylesheet' => [ 'custom-css' => 'Benutzerdefiniertes Stylesheet', @@ -191,7 +191,7 @@ return [ 'background-fills' => 'Hintergrunddateien (Komponenten, Vorfälle, Footer)', 'banner-background-color' => 'Banner Background Color', 'banner-padding' => 'Banner Padding', - 'fullwidth-banner' => 'Enable full width banner?', + 'fullwidth-banner' => 'Banner über komplette Breite?', 'text-color' => 'Schriftfarbe', 'dashboard-login' => 'Dashboard-Button im Footer anzeigen?', 'reds' => 'Rot (Genutzt für Fehler)', @@ -221,7 +221,7 @@ return [ ], 'team' => [ 'description' => 'Invite your team members by entering their email addresses here.', - 'email' => 'Your Team Members Email Address', + 'email' => 'Die E-Mail Adresse deines Teammitgliedes', ], ], @@ -241,7 +241,7 @@ return [ 'remove' => 'Entfernen', 'invite' => 'Einladen', 'signup' => 'Registrieren', - 'manage_updates' => 'Manage Updates', + 'manage_updates' => 'Updates verwalten', // Other 'optional' => '* optional', From 56d2c516f4253576619bf28c19f303f7b0ba0483 Mon Sep 17 00:00:00 2001 From: Cachet Bot <40326150+CachetBot@users.noreply.github.com> Date: Wed, 23 Jan 2019 09:04:05 +0000 Subject: [PATCH 040/179] New translations notifications.php (German) --- resources/lang/de-DE/notifications.php | 76 +++++++++++++------------- 1 file changed, 38 insertions(+), 38 deletions(-) diff --git a/resources/lang/de-DE/notifications.php b/resources/lang/de-DE/notifications.php index 6a65c6bd..f497f755 100644 --- a/resources/lang/de-DE/notifications.php +++ b/resources/lang/de-DE/notifications.php @@ -13,84 +13,84 @@ return [ 'component' => [ 'status_update' => [ 'mail' => [ - 'subject' => 'Component Status Updated', - 'greeting' => 'A component\'s status was updated!', - 'content' => ':name status changed from :old_status to :new_status.', - 'action' => 'View', + 'subject' => 'Status der Komponente aktualisiert', + 'greeting' => 'Ein Komponentenstatus wurde aktualisiert!', + 'content' => ':name Status wurde von :old_status zu :new_status geändert.', + 'action' => 'Anzeigen', ], 'slack' => [ - 'title' => 'Component Status Updated', - 'content' => ':name status changed from :old_status to :new_status.', + 'title' => 'Status der Komponente aktualisiert', + 'content' => ':name Status wurde von :old_status zu :new_status geändert.', ], 'sms' => [ - 'content' => ':name status changed from :old_status to :new_status.', + 'content' => ':name Status wurde von :old_status zu :new_status geändert.', ], ], ], 'incident' => [ 'new' => [ 'mail' => [ - 'subject' => 'New Incident Reported', - 'greeting' => 'A new incident was reported at :app_name.', - 'content' => 'Incident :name was reported', - 'action' => 'View', + 'subject' => 'Neuer Vorfall gemeldet', + 'greeting' => 'Ein neuer Vorfall wurde auf der :app_name Status Seite gemeldet.', + 'content' => 'Vorfall :name wurde gemeldet', + 'action' => 'Anzeigen', ], 'slack' => [ - 'title' => 'Incident :name Reported', - 'content' => 'A new incident was reported at :app_name', + 'title' => 'Vorfall :name gemeldet', + 'content' => 'Ein neuer Vorfall wurde auf der :app_name Status Seite gemeldet', ], 'sms' => [ - 'content' => 'A new incident was reported at :app_name.', + 'content' => 'Ein neuer Vorfall wurde auf der :app_name Status Seite gemeldet.', ], ], 'update' => [ 'mail' => [ - 'subject' => 'Incident Updated', - 'content' => ':name was updated', - 'title' => ':name was updated to :new_status', - 'action' => 'View', + 'subject' => 'Vorfall aktualisiert', + 'content' => ':name wurde aktualisiert', + 'title' => ':name wurde auf :new_status aktualisiert', + 'action' => 'Anzeigen', ], 'slack' => [ - 'title' => ':name Updated', - 'content' => ':name was updated to :new_status', + 'title' => ':name aktualisiert', + 'content' => ':name wurde auf :new_status aktualisiert', ], 'sms' => [ - 'content' => 'Incident :name was updated', + 'content' => 'Vorfall :name wurde aktualisiert', ], ], ], 'schedule' => [ 'new' => [ 'mail' => [ - 'subject' => 'New Schedule Created', - 'content' => ':name was scheduled for :date', - 'title' => 'A new scheduled maintenance was created.', - 'action' => 'View', + 'subject' => 'Neuer Zeitplan erstellt', + 'content' => ':name wurde für :date geplant', + 'title' => 'Eine neue geplante Wartung wurde erstellt.', + 'action' => 'Anzeigen', ], 'slack' => [ - 'title' => 'New Schedule Created!', - 'content' => ':name was scheduled for :date', + 'title' => 'Neuer Zeitplan erstellt!', + 'content' => ':name wurde für :date geplant', ], 'sms' => [ - 'content' => ':name was scheduled for :date', + 'content' => ':name wurde für :date geplant', ], ], ], 'subscriber' => [ 'verify' => [ 'mail' => [ - 'subject' => 'Verify Your Subscription', - 'content' => 'Click to verify your subscription to :app_name status page.', - 'title' => 'Verify your subscription to :app_name status page.', - 'action' => 'Verify', + 'subject' => 'Bitte bestätigen Sie Ihr Abonnement', + 'content' => 'Klicken Sie, um Ihr Abonnement von :app_name Statusseite zu bestätigen.', + 'title' => 'Bestätigen Sie Ihr Abonnement für die :app_name Statusseite.', + 'action' => 'Bestätigen', ], ], ], 'system' => [ 'test' => [ 'mail' => [ - 'subject' => 'Ping from Cachet!', - 'content' => 'This is a test notification from Cachet!', + 'subject' => 'Ping von Cachet!', + 'content' => 'Dies ist eine Test-Benachrichtigung von Cachet!', 'title' => '🔔', ], ], @@ -98,10 +98,10 @@ return [ 'user' => [ 'invite' => [ 'mail' => [ - 'subject' => 'Your invitation is inside...', - 'content' => 'You have been invited to join :app_name status page.', - 'title' => 'You\'re invited to join :app_name status page.', - 'action' => 'Accept', + 'subject' => 'Ihre Einladung wartet auf Sie...', + 'content' => 'Sie wurden eingeladen, um der :app_name Statusseite beizutreten.', + 'title' => 'Sie sind dazu eingeladen, der :app_name Statusseite beizutreten.', + 'action' => 'Akzeptieren', ], ], ], From e21918c81e5c3db5af7fac7591a9c012da6291ae Mon Sep 17 00:00:00 2001 From: James Brooks Date: Sat, 26 Jan 2019 10:12:22 +0000 Subject: [PATCH 041/179] Remove duplicate order statement. Fixes #3418 --- app/Presenters/IncidentPresenter.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Presenters/IncidentPresenter.php b/app/Presenters/IncidentPresenter.php index 139860cb..0a8e8a65 100644 --- a/app/Presenters/IncidentPresenter.php +++ b/app/Presenters/IncidentPresenter.php @@ -256,7 +256,7 @@ class IncidentPresenter extends BasePresenter implements Arrayable public function latest() { if (is_bool($this->latest)) { - $this->latest = $this->wrappedObject->updates()->orderBy('created_at', 'desc')->first(); + $this->latest = $this->wrappedObject->updates()->first(); } return $this->latest; From df7dc2ac397304703a56b1ddbce974fb759d2914 Mon Sep 17 00:00:00 2001 From: James Brooks Date: Sat, 26 Jan 2019 10:19:06 +0000 Subject: [PATCH 042/179] Remove string about HTTP(s). Fixes #3421 --- resources/lang/en/forms.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/lang/en/forms.php b/resources/lang/en/forms.php index 47a1a3e7..339ba0b8 100644 --- a/resources/lang/en/forms.php +++ b/resources/lang/en/forms.php @@ -168,7 +168,7 @@ return [ 'analytics' => [ 'analytics_google' => 'Google Analytics code', 'analytics_gosquared' => 'GoSquared Analytics code', - 'analytics_piwik_url' => 'URL of your Piwik instance (without http(s)://)', + 'analytics_piwik_url' => 'URL of your Piwik instance', 'analytics_piwik_siteid' => 'Piwik\'s site id', ], 'localization' => [ From 654e72ceb535ef508c37808d81af762ce11562f7 Mon Sep 17 00:00:00 2001 From: James Brooks Date: Sat, 26 Jan 2019 10:37:24 +0000 Subject: [PATCH 043/179] Fixes CORS headers. Closes #3413 --- .../Providers/RouteServiceProvider.php | 4 +-- app/Http/Kernel.php | 6 ++-- app/Http/Middleware/VerifyCsrfToken.php | 33 +++++++++++++++++++ app/Http/Routes/ApiRoutes.php | 2 +- config/cors.php | 17 ++++++---- 5 files changed, 49 insertions(+), 13 deletions(-) create mode 100644 app/Http/Middleware/VerifyCsrfToken.php diff --git a/app/Foundation/Providers/RouteServiceProvider.php b/app/Foundation/Providers/RouteServiceProvider.php index 9a17c2a6..b375e5a5 100644 --- a/app/Foundation/Providers/RouteServiceProvider.php +++ b/app/Foundation/Providers/RouteServiceProvider.php @@ -11,7 +11,6 @@ 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\Timezone; @@ -22,12 +21,12 @@ use CachetHQ\Cachet\Http\Routes\SetupRoutes; use CachetHQ\Cachet\Http\Routes\SignupRoutes; use Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse; use Illuminate\Cookie\Middleware\EncryptCookies; -use Illuminate\Foundation\Http\Middleware\VerifyCsrfToken; use Illuminate\Foundation\Support\Providers\RouteServiceProvider as ServiceProvider; use Illuminate\Routing\Middleware\SubstituteBindings; use Illuminate\Routing\Router; use Illuminate\Session\Middleware\StartSession; use Illuminate\View\Middleware\ShareErrorsFromSession; +use CachetHQ\Cachet\Http\Middleware\VerifyCsrfToken; /** * This is the route service provider. @@ -171,7 +170,6 @@ class RouteServiceProvider extends ServiceProvider protected function mapOtherwise(Router $router, $routes, $applyAlwaysAuthenticate) { $middleware = [ - HandleCors::class, SubstituteBindings::class, Acceptable::class, Timezone::class, diff --git a/app/Http/Kernel.php b/app/Http/Kernel.php index 775f4691..fe449484 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 Barryvdh\Cors\HandleCors; class Kernel extends HttpKernel { @@ -33,8 +34,8 @@ class Kernel extends HttpKernel * @var array */ protected $middleware = [ - TrustProxies::class, - CheckForMaintenanceMode::class, + // TrustProxies::class, + // CheckForMaintenanceMode::class, ]; /** @@ -45,6 +46,7 @@ class Kernel extends HttpKernel protected $routeMiddleware = [ 'admin' => Admin::class, 'can' => Authorize::class, + 'cors' => HandleCors::class, 'auth' => Authenticate::class, 'auth.api' => ApiAuthentication::class, 'guest' => RedirectIfAuthenticated::class, diff --git a/app/Http/Middleware/VerifyCsrfToken.php b/app/Http/Middleware/VerifyCsrfToken.php new file mode 100644 index 00000000..213645b7 --- /dev/null +++ b/app/Http/Middleware/VerifyCsrfToken.php @@ -0,0 +1,33 @@ + 'Api', 'prefix' => 'api/v1', ], function (Registrar $router) { - $router->group(['middleware' => ['auth.api']], function (Registrar $router) { + $router->group(['middleware' => ['auth.api', 'cors']], function (Registrar $router) { $router->get('components', 'ComponentController@index'); $router->get('components/groups', 'ComponentGroupController@index'); $router->get('components/groups/{component_group}', 'ComponentGroupController@show'); diff --git a/config/cors.php b/config/cors.php index fb12f8c9..a1079ccf 100644 --- a/config/cors.php +++ b/config/cors.php @@ -10,6 +10,7 @@ */ return [ + /* |-------------------------------------------------------------------------- | Laravel CORS @@ -19,11 +20,13 @@ return [ | to accept any value. | */ - 'supportsCredentials' => false, - 'allowedOrigins' => ['*'], - 'allowedHeaders' => ['X-Cachet-Token'], - 'allowedMethods' => ['*'], - 'exposedHeaders' => [], - 'maxAge' => 3600, - 'hosts' => [], + + 'supportsCredentials' => false, + 'allowedOrigins' => ['*'], + 'allowedOriginsPatterns' => [], + 'allowedHeaders' => ['X-Cachet-Token'], + 'allowedMethods' => ['*'], + 'exposedHeaders' => [], + 'maxAge' => 3600, + ]; From ffe9c99f9c1a244394b1be3c5d92a192a63f0fa0 Mon Sep 17 00:00:00 2001 From: James Brooks Date: Sat, 26 Jan 2019 10:38:21 +0000 Subject: [PATCH 044/179] Apply fixes from StyleCI --- app/Foundation/Providers/RouteServiceProvider.php | 2 +- app/Http/Kernel.php | 2 +- app/Http/Middleware/VerifyCsrfToken.php | 4 ++-- config/cors.php | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/Foundation/Providers/RouteServiceProvider.php b/app/Foundation/Providers/RouteServiceProvider.php index b375e5a5..45c01a5d 100644 --- a/app/Foundation/Providers/RouteServiceProvider.php +++ b/app/Foundation/Providers/RouteServiceProvider.php @@ -14,6 +14,7 @@ namespace CachetHQ\Cachet\Foundation\Providers; use CachetHQ\Cachet\Http\Middleware\Acceptable; use CachetHQ\Cachet\Http\Middleware\Authenticate; use CachetHQ\Cachet\Http\Middleware\Timezone; +use CachetHQ\Cachet\Http\Middleware\VerifyCsrfToken; use CachetHQ\Cachet\Http\Routes\ApiSystemRoutes; use CachetHQ\Cachet\Http\Routes\AuthRoutes; use CachetHQ\Cachet\Http\Routes\Setup\ApiRoutes as ApiSetupRoutes; @@ -26,7 +27,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\VerifyCsrfToken; /** * This is the route service provider. diff --git a/app/Http/Kernel.php b/app/Http/Kernel.php index fe449484..c0079a83 100644 --- a/app/Http/Kernel.php +++ b/app/Http/Kernel.php @@ -12,6 +12,7 @@ namespace CachetHQ\Cachet\Http; use AltThree\Throttle\ThrottlingMiddleware; +use Barryvdh\Cors\HandleCors; use CachetHQ\Cachet\Http\Middleware\Admin; use CachetHQ\Cachet\Http\Middleware\ApiAuthentication; use CachetHQ\Cachet\Http\Middleware\Authenticate; @@ -24,7 +25,6 @@ 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 Barryvdh\Cors\HandleCors; class Kernel extends HttpKernel { diff --git a/app/Http/Middleware/VerifyCsrfToken.php b/app/Http/Middleware/VerifyCsrfToken.php index 213645b7..03736d46 100644 --- a/app/Http/Middleware/VerifyCsrfToken.php +++ b/app/Http/Middleware/VerifyCsrfToken.php @@ -28,6 +28,6 @@ class VerifyCsrfToken extends Middleware * @var array */ protected $except = [ - '/api/*' + '/api/*', ]; -} \ No newline at end of file +} diff --git a/config/cors.php b/config/cors.php index a1079ccf..6e843598 100644 --- a/config/cors.php +++ b/config/cors.php @@ -10,7 +10,7 @@ */ return [ - + /* |-------------------------------------------------------------------------- | Laravel CORS @@ -20,7 +20,7 @@ return [ | to accept any value. | */ - + 'supportsCredentials' => false, 'allowedOrigins' => ['*'], 'allowedOriginsPatterns' => [], From 8baf234a0789ca8ff7284567e2e5420b75eaee5f Mon Sep 17 00:00:00 2001 From: James Brooks Date: Sat, 26 Jan 2019 10:43:55 +0000 Subject: [PATCH 045/179] Update deps --- composer.lock | 66 +++++++++++++++++++++++++-------------------------- 1 file changed, 33 insertions(+), 33 deletions(-) diff --git a/composer.lock b/composer.lock index 21eb5e30..4b574018 100644 --- a/composer.lock +++ b/composer.lock @@ -410,16 +410,16 @@ }, { "name": "aws/aws-sdk-php", - "version": "3.86.2", + "version": "3.87.2", "source": { "type": "git", "url": "https://github.com/aws/aws-sdk-php.git", - "reference": "50224232ac7a4e2a6fa4ebbe0281e5b7503acf76" + "reference": "7c00779a343c9b813628bf6a27b94945272ced93" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/50224232ac7a4e2a6fa4ebbe0281e5b7503acf76", - "reference": "50224232ac7a4e2a6fa4ebbe0281e5b7503acf76", + "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/7c00779a343c9b813628bf6a27b94945272ced93", + "reference": "7c00779a343c9b813628bf6a27b94945272ced93", "shasum": "" }, "require": { @@ -489,7 +489,7 @@ "s3", "sdk" ], - "time": "2019-01-18T21:10:44+00:00" + "time": "2019-01-25T22:29:49+00:00" }, { "name": "bacon/bacon-qr-code", @@ -2094,16 +2094,16 @@ }, { "name": "laravel/framework", - "version": "v5.7.21", + "version": "v5.7.22", "source": { "type": "git", "url": "https://github.com/laravel/framework.git", - "reference": "25f74458a242b61cc9e9c09d31f94fb13ed805f3" + "reference": "64a7749bd9e8df68addce1d01a54bcf606141f29" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/framework/zipball/25f74458a242b61cc9e9c09d31f94fb13ed805f3", - "reference": "25f74458a242b61cc9e9c09d31f94fb13ed805f3", + "url": "https://api.github.com/repos/laravel/framework/zipball/64a7749bd9e8df68addce1d01a54bcf606141f29", + "reference": "64a7749bd9e8df68addce1d01a54bcf606141f29", "shasum": "" }, "require": { @@ -2236,7 +2236,7 @@ "framework", "laravel" ], - "time": "2019-01-15T15:20:32+00:00" + "time": "2019-01-22T15:08:35+00:00" }, { "name": "laravel/nexmo-notification-channel", @@ -2528,7 +2528,7 @@ { "name": "Luís Otávio Cobucci Oblonczyk", "email": "lcobucci@gmail.com", - "role": "developer" + "role": "Developer" } ], "description": "A simple library to work with JSON Web Token and JSON Web Signature", @@ -2952,16 +2952,16 @@ }, { "name": "nexmo/client", - "version": "1.6.0", + "version": "1.6.1", "source": { "type": "git", "url": "https://github.com/Nexmo/nexmo-php.git", - "reference": "01809cc1e17a5af275913c49bb5d444eb6cc06d4" + "reference": "3dc03ca1dab726a23b757110897740e54304fc65" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Nexmo/nexmo-php/zipball/01809cc1e17a5af275913c49bb5d444eb6cc06d4", - "reference": "01809cc1e17a5af275913c49bb5d444eb6cc06d4", + "url": "https://api.github.com/repos/Nexmo/nexmo-php/zipball/3dc03ca1dab726a23b757110897740e54304fc65", + "reference": "3dc03ca1dab726a23b757110897740e54304fc65", "shasum": "" }, "require": { @@ -2996,20 +2996,20 @@ } ], "description": "PHP Client for using Nexmo's API.", - "time": "2018-12-17T10:47:50+00:00" + "time": "2019-01-02T09:06:47+00:00" }, { "name": "nikic/php-parser", - "version": "v4.1.1", + "version": "v4.2.0", "source": { "type": "git", "url": "https://github.com/nikic/PHP-Parser.git", - "reference": "8aae5b59b83bb4d0dbf07b0a835f2680a658f610" + "reference": "594bcae1fc0bccd3993d2f0d61a018e26ac2865a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/8aae5b59b83bb4d0dbf07b0a835f2680a658f610", - "reference": "8aae5b59b83bb4d0dbf07b0a835f2680a658f610", + "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/594bcae1fc0bccd3993d2f0d61a018e26ac2865a", + "reference": "594bcae1fc0bccd3993d2f0d61a018e26ac2865a", "shasum": "" }, "require": { @@ -3025,7 +3025,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "4.1-dev" + "dev-master": "4.2-dev" } }, "autoload": { @@ -3047,7 +3047,7 @@ "parser", "php" ], - "time": "2018-12-26T11:32:39+00:00" + "time": "2019-01-12T16:31:37+00:00" }, { "name": "opis/closure", @@ -4019,16 +4019,16 @@ }, { "name": "symfony/css-selector", - "version": "v4.2.1", + "version": "v4.2.2", "source": { "type": "git", "url": "https://github.com/symfony/css-selector.git", - "reference": "aa9fa526ba1b2ec087ffdfb32753803d999fcfcd" + "reference": "76dac1dbe2830213e95892c7c2ec1edd74113ea4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/css-selector/zipball/aa9fa526ba1b2ec087ffdfb32753803d999fcfcd", - "reference": "aa9fa526ba1b2ec087ffdfb32753803d999fcfcd", + "url": "https://api.github.com/repos/symfony/css-selector/zipball/76dac1dbe2830213e95892c7c2ec1edd74113ea4", + "reference": "76dac1dbe2830213e95892c7c2ec1edd74113ea4", "shasum": "" }, "require": { @@ -4068,7 +4068,7 @@ ], "description": "Symfony CssSelector Component", "homepage": "https://symfony.com", - "time": "2018-11-11T19:52:12+00:00" + "time": "2019-01-03T09:07:35+00:00" }, { "name": "symfony/debug", @@ -4427,7 +4427,7 @@ }, { "name": "Gert de Pagter", - "email": "backendtea@gmail.com" + "email": "BackEndTea@gmail.com" } ], "description": "Symfony polyfill for ctype functions", @@ -6199,16 +6199,16 @@ }, { "name": "phpunit/phpunit", - "version": "7.5.1", + "version": "7.5.2", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "c23d78776ad415d5506e0679723cb461d71f488f" + "reference": "7c89093bd00f7d5ddf0ab81dee04f801416b4944" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/c23d78776ad415d5506e0679723cb461d71f488f", - "reference": "c23d78776ad415d5506e0679723cb461d71f488f", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/7c89093bd00f7d5ddf0ab81dee04f801416b4944", + "reference": "7c89093bd00f7d5ddf0ab81dee04f801416b4944", "shasum": "" }, "require": { @@ -6279,7 +6279,7 @@ "testing", "xunit" ], - "time": "2018-12-12T07:20:32+00:00" + "time": "2019-01-15T08:19:08+00:00" }, { "name": "sebastian/code-unit-reverse-lookup", From f1fcd307cc9cd46836eb6429da99381b1f85c03d Mon Sep 17 00:00:00 2001 From: James Brooks Date: Sat, 26 Jan 2019 11:01:06 +0000 Subject: [PATCH 046/179] Compile assets --- public/dist/js/all.js | 42 ++++++++++++++++++++-------------------- public/dist/js/app.js | 2 +- public/dist/js/vendor.js | 2 +- 3 files changed, 23 insertions(+), 23 deletions(-) diff --git a/public/dist/js/all.js b/public/dist/js/all.js index 32419e0a..d2d6ed80 100644 --- a/public/dist/js/all.js +++ b/public/dist/js/all.js @@ -1,27 +1,27 @@ -if(webpackJsonp([1],[,,,function(e,t,n){"use strict";function r(e){return"[object Array]"===l.call(e)}function i(e){return null!==e&&"object"==typeof e}function o(e){return"[object Function]"===l.call(e)}function a(e,t){if(null!==e&&void 0!==e)if("object"!=typeof e&&(e=[e]),r(e))for(var n=0,i=e.length;n=200&&e<300}};u.headers={common:{Accept:"application/json, text/plain, */*"}},o.forEach(["delete","get","head"],function(e){u.headers[e]={}}),o.forEach(["post","put","patch"],function(e){u.headers[e]=o.merge(s)}),e.exports=u}).call(t,n(21))},,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;t-1}function f(e,t,n){for(var r=-1,i=null==e?0:e.length;++r-1;);return n}function H(e,t){for(var n=e.length;n--&&b(t,e[n],0)>-1;);return n}function O(e){return"\\"+tn[e]}function A(e){return Gt.test(e)}function P(e){var t=-1,n=Array(e.size);return e.forEach(function(e,r){n[++t]=[r,e]}),n}function N(e,t){return function(n){return e(t(n))}}function I(e,t){for(var n=-1,r=e.length,i=0,o=[];++n>>1,ye=[["ary",ae],["bind",Q],["bindKey",ee],["curry",ne],["curryRight",re],["flip",ue],["partial",ie],["partialRight",oe],["rearg",se]],ve="[object Arguments]",be="[object Array]",Me="[object AsyncFunction]",we="[object Boolean]",Le="[object Date]",xe="[object DOMException]",ke="[object Error]",Te="[object Function]",De="[object GeneratorFunction]",Ye="[object Map]",Se="[object Number]",Ce="[object Null]",je="[object Object]",Ee="[object Proxy]",He="[object RegExp]",Oe="[object Set]",Ae="[object String]",Pe="[object Symbol]",Ne="[object Undefined]",Ie="[object WeakMap]",Re="[object ArrayBuffer]",We="[object DataView]",$e="[object Float32Array]",Fe="[object Float64Array]",ze="[object Int8Array]",qe="[object Int16Array]",Be="[object Int32Array]",Ue="[object Uint8Array]",Ve="[object Uint8ClampedArray]",Je="[object Uint16Array]",Ge="[object Uint32Array]",Xe=/\b__p \+= '';/g,Ke=/\b(__p \+=) '' \+/g,Ze=/(__e\(.*?\)|\b__t\)) \+\n'';/g,Qe=/&(?:amp|lt|gt|quot|#39);/g,et=/[&<>"']/g,tt=RegExp(Qe.source),nt=RegExp(et.source),rt=/<%-([\s\S]+?)%>/g,it=/<%([\s\S]+?)%>/g,ot=/<%=([\s\S]+?)%>/g,at=/\.|\[(?:[^[\]]*|(["'])(?:(?!\1)[^\\]|\\.)*?\1)\]/,st=/^\w*$/,ut=/[^.[\]]+|\[(?:(-?\d+(?:\.\d+)?)|(["'])((?:(?!\2)[^\\]|\\.)*?)\2)\]|(?=(?:\.|\[\])(?:\.|\[\]|$))/g,lt=/[\\^$.*+?()[\]{}|]/g,dt=RegExp(lt.source),ct=/^\s+|\s+$/g,ft=/^\s+/,ht=/\s+$/,pt=/\{(?:\n\/\* \[wrapped with .+\] \*\/)?\n?/,mt=/\{\n\/\* \[wrapped with (.+)\] \*/,_t=/,? & /,gt=/[^\x00-\x2f\x3a-\x40\x5b-\x60\x7b-\x7f]+/g,yt=/\\(\\)?/g,vt=/\$\{([^\\}]*(?:\\.[^\\}]*)*)\}/g,bt=/\w*$/,Mt=/^[-+]0x[0-9a-f]+$/i,wt=/^0b[01]+$/i,Lt=/^\[object .+?Constructor\]$/,xt=/^0o[0-7]+$/i,kt=/^(?:0|[1-9]\d*)$/,Tt=/[\xc0-\xd6\xd8-\xf6\xf8-\xff\u0100-\u017f]/g,Dt=/($^)/,Yt=/['\n\r\u2028\u2029\\]/g,St="\\u0300-\\u036f\\ufe20-\\ufe2f\\u20d0-\\u20ff",Ct="\\xac\\xb1\\xd7\\xf7\\x00-\\x2f\\x3a-\\x40\\x5b-\\x60\\x7b-\\xbf\\u2000-\\u206f \\t\\x0b\\f\\xa0\\ufeff\\n\\r\\u2028\\u2029\\u1680\\u180e\\u2000\\u2001\\u2002\\u2003\\u2004\\u2005\\u2006\\u2007\\u2008\\u2009\\u200a\\u202f\\u205f\\u3000",jt="["+Ct+"]",Et="["+St+"]",Ht="[a-z\\xdf-\\xf6\\xf8-\\xff]",Ot="[^\\ud800-\\udfff"+Ct+"\\d+\\u2700-\\u27bfa-z\\xdf-\\xf6\\xf8-\\xffA-Z\\xc0-\\xd6\\xd8-\\xde]",At="\\ud83c[\\udffb-\\udfff]",Pt="[^\\ud800-\\udfff]",Nt="(?:\\ud83c[\\udde6-\\uddff]){2}",It="[\\ud800-\\udbff][\\udc00-\\udfff]",Rt="[A-Z\\xc0-\\xd6\\xd8-\\xde]",Wt="(?:"+Ht+"|"+Ot+")",$t="(?:"+Et+"|"+At+")?",Ft="[\\ufe0e\\ufe0f]?"+$t+"(?:\\u200d(?:"+[Pt,Nt,It].join("|")+")[\\ufe0e\\ufe0f]?"+$t+")*",zt="(?:"+["[\\u2700-\\u27bf]",Nt,It].join("|")+")"+Ft,qt="(?:"+[Pt+Et+"?",Et,Nt,It,"[\\ud800-\\udfff]"].join("|")+")",Bt=RegExp("['’]","g"),Ut=RegExp(Et,"g"),Vt=RegExp(At+"(?="+At+")|"+qt+Ft,"g"),Jt=RegExp([Rt+"?"+Ht+"+(?:['’](?:d|ll|m|re|s|t|ve))?(?="+[jt,Rt,"$"].join("|")+")","(?:[A-Z\\xc0-\\xd6\\xd8-\\xde]|[^\\ud800-\\udfff\\xac\\xb1\\xd7\\xf7\\x00-\\x2f\\x3a-\\x40\\x5b-\\x60\\x7b-\\xbf\\u2000-\\u206f \\t\\x0b\\f\\xa0\\ufeff\\n\\r\\u2028\\u2029\\u1680\\u180e\\u2000\\u2001\\u2002\\u2003\\u2004\\u2005\\u2006\\u2007\\u2008\\u2009\\u200a\\u202f\\u205f\\u3000\\d+\\u2700-\\u27bfa-z\\xdf-\\xf6\\xf8-\\xffA-Z\\xc0-\\xd6\\xd8-\\xde])+(?:['’](?:D|LL|M|RE|S|T|VE))?(?="+[jt,Rt+Wt,"$"].join("|")+")",Rt+"?"+Wt+"+(?:['’](?:d|ll|m|re|s|t|ve))?",Rt+"+(?:['’](?:D|LL|M|RE|S|T|VE))?","\\d*(?:1ST|2ND|3RD|(?![123])\\dTH)(?=\\b|[a-z_])","\\d*(?:1st|2nd|3rd|(?![123])\\dth)(?=\\b|[A-Z_])","\\d+",zt].join("|"),"g"),Gt=RegExp("[\\u200d\\ud800-\\udfff"+St+"\\ufe0e\\ufe0f]"),Xt=/[a-z][A-Z]|[A-Z]{2}[a-z]|[0-9][a-zA-Z]|[a-zA-Z][0-9]|[^a-zA-Z0-9 ]/,Kt=["Array","Buffer","DataView","Date","Error","Float32Array","Float64Array","Function","Int8Array","Int16Array","Int32Array","Map","Math","Object","Promise","RegExp","Set","String","Symbol","TypeError","Uint8Array","Uint8ClampedArray","Uint16Array","Uint32Array","WeakMap","_","clearTimeout","isFinite","parseInt","setTimeout"],Zt=-1,Qt={};Qt[$e]=Qt[Fe]=Qt[ze]=Qt[qe]=Qt[Be]=Qt[Ue]=Qt[Ve]=Qt[Je]=Qt[Ge]=!0,Qt[ve]=Qt[be]=Qt[Re]=Qt[we]=Qt[We]=Qt[Le]=Qt[ke]=Qt[Te]=Qt[Ye]=Qt[Se]=Qt[je]=Qt[He]=Qt[Oe]=Qt[Ae]=Qt[Ie]=!1;var en={};en[ve]=en[be]=en[Re]=en[We]=en[we]=en[Le]=en[$e]=en[Fe]=en[ze]=en[qe]=en[Be]=en[Ye]=en[Se]=en[je]=en[He]=en[Oe]=en[Ae]=en[Pe]=en[Ue]=en[Ve]=en[Je]=en[Ge]=!0,en[ke]=en[Te]=en[Ie]=!1;var tn={"\\":"\\","'":"'","\n":"n","\r":"r","\u2028":"u2028","\u2029":"u2029"},nn=parseFloat,rn=parseInt,on="object"==typeof e&&e&&e.Object===Object&&e,an="object"==typeof self&&self&&self.Object===Object&&self,sn=on||an||Function("return this")(),un="object"==typeof t&&t&&!t.nodeType&&t,ln=un&&"object"==typeof r&&r&&!r.nodeType&&r,dn=ln&&ln.exports===un,cn=dn&&on.process,fn=function(){try{return ln&&ln.require&&ln.require("util").types||cn&&cn.binding&&cn.binding("util")}catch(e){}}(),hn=fn&&fn.isArrayBuffer,pn=fn&&fn.isDate,mn=fn&&fn.isMap,_n=fn&&fn.isRegExp,gn=fn&&fn.isSet,yn=fn&&fn.isTypedArray,vn=x("length"),bn=k({"À":"A","Á":"A","Â":"A","Ã":"A","Ä":"A","Å":"A","à":"a","á":"a","â":"a","ã":"a","ä":"a","å":"a","Ç":"C","ç":"c","Ð":"D","ð":"d","È":"E","É":"E","Ê":"E","Ë":"E","è":"e","é":"e","ê":"e","ë":"e","Ì":"I","Í":"I","Î":"I","Ï":"I","ì":"i","í":"i","î":"i","ï":"i","Ñ":"N","ñ":"n","Ò":"O","Ó":"O","Ô":"O","Õ":"O","Ö":"O","Ø":"O","ò":"o","ó":"o","ô":"o","õ":"o","ö":"o","ø":"o","Ù":"U","Ú":"U","Û":"U","Ü":"U","ù":"u","ú":"u","û":"u","ü":"u","Ý":"Y","ý":"y","ÿ":"y","Æ":"Ae","æ":"ae","Þ":"Th","þ":"th","ß":"ss","Ā":"A","Ă":"A","Ą":"A","ā":"a","ă":"a","ą":"a","Ć":"C","Ĉ":"C","Ċ":"C","Č":"C","ć":"c","ĉ":"c","ċ":"c","č":"c","Ď":"D","Đ":"D","ď":"d","đ":"d","Ē":"E","Ĕ":"E","Ė":"E","Ę":"E","Ě":"E","ē":"e","ĕ":"e","ė":"e","ę":"e","ě":"e","Ĝ":"G","Ğ":"G","Ġ":"G","Ģ":"G","ĝ":"g","ğ":"g","ġ":"g","ģ":"g","Ĥ":"H","Ħ":"H","ĥ":"h","ħ":"h","Ĩ":"I","Ī":"I","Ĭ":"I","Į":"I","İ":"I","ĩ":"i","ī":"i","ĭ":"i","į":"i","ı":"i","Ĵ":"J","ĵ":"j","Ķ":"K","ķ":"k","ĸ":"k","Ĺ":"L","Ļ":"L","Ľ":"L","Ŀ":"L","Ł":"L","ĺ":"l","ļ":"l","ľ":"l","ŀ":"l","ł":"l","Ń":"N","Ņ":"N","Ň":"N","Ŋ":"N","ń":"n","ņ":"n","ň":"n","ŋ":"n","Ō":"O","Ŏ":"O","Ő":"O","ō":"o","ŏ":"o","ő":"o","Ŕ":"R","Ŗ":"R","Ř":"R","ŕ":"r","ŗ":"r","ř":"r","Ś":"S","Ŝ":"S","Ş":"S","Š":"S","ś":"s","ŝ":"s","ş":"s","š":"s","Ţ":"T","Ť":"T","Ŧ":"T","ţ":"t","ť":"t","ŧ":"t","Ũ":"U","Ū":"U","Ŭ":"U","Ů":"U","Ű":"U","Ų":"U","ũ":"u","ū":"u","ŭ":"u","ů":"u","ű":"u","ų":"u","Ŵ":"W","ŵ":"w","Ŷ":"Y","ŷ":"y","Ÿ":"Y","Ź":"Z","Ż":"Z","Ž":"Z","ź":"z","ż":"z","ž":"z","IJ":"IJ","ij":"ij","Œ":"Oe","œ":"oe","ʼn":"'n","ſ":"s"}),Mn=k({"&":"&","<":"<",">":">",'"':""","'":"'"}),wn=k({"&":"&","<":"<",">":">",""":'"',"'":"'"}),Ln=function e(t){function n(e){if(to(e)&&!Vs(e)&&!(e instanceof k)){if(e instanceof i)return e;if(Uo.call(e,"__wrapped__"))return Di(e)}return new i(e)}function r(){}function i(e,t){this.__wrapped__=e,this.__actions__=[],this.__chain__=!!t,this.__index__=0,this.__values__=z}function k(e){this.__wrapped__=e,this.__actions__=[],this.__dir__=1,this.__filtered__=!1,this.__iteratees__=[],this.__takeCount__=me,this.__views__=[]}function St(e){var t=-1,n=null==e?0:e.length;for(this.clear();++t=t?e:t)),e}function Gt(e,t,n,r,i,o){var a,u=t&J,l=t&G,d=t&X;if(n&&(a=i?n(e,r,i,o):n(e)),a!==z)return a;if(!eo(e))return e;var c=Vs(e);if(c){if(a=function(e){var t=e.length,n=new e.constructor(t);return t&&"string"==typeof e[0]&&Uo.call(e,"index")&&(n.index=e.index,n.input=e.input),n}(e),!u)return Yr(e,a)}else{var f=ns(e),h=f==Te||f==De;if(Gs(e))return wr(e,u);if(f==je||f==ve||h&&!i){if(a=l||h?{}:di(e),!u)return l?function(e,t){return Sr(e,ts(e),t)}(e,function(e,t){return e&&Sr(t,go(t),e)}(a,e)):function(e,t){return Sr(e,es(e),t)}(e,Ft(a,e))}else{if(!en[f])return i?e:{};a=function(e,t,n){var r,i,o,a=e.constructor;switch(t){case Re:return Lr(e);case we:case Le:return new a(+e);case We:return function(e,t){var n=t?Lr(e.buffer):e.buffer;return new e.constructor(n,e.byteOffset,e.byteLength)}(e,n);case $e:case Fe:case ze:case qe:case Be:case Ue:case Ve:case Je:case Ge:return xr(e,n);case Ye:return new a;case Se:case Ae:return new a(e);case He:return(o=new(i=e).constructor(i.source,bt.exec(i))).lastIndex=i.lastIndex,o;case Oe:return new a;case Pe:return r=e,$a?No($a.call(r)):{}}}(e,f,u)}}o||(o=new Ht);var p=o.get(e);if(p)return p;if(o.set(e,a),Qs(e))return e.forEach(function(r){a.add(Gt(r,t,n,r,e,o))}),a;if(Ks(e))return e.forEach(function(r,i){a.set(i,Gt(r,t,n,i,e,o))}),a;var m=c?z:(d?l?ni:ti:l?go:_o)(e);return s(m||e,function(r,i){m&&(r=e[i=r]),Rt(a,i,Gt(r,t,n,i,e,o))}),a}function tn(e,t,n){var r=n.length;if(null==e)return!r;for(e=No(e);r--;){var i=n[r],o=t[i],a=e[i];if(a===z&&!(i in e)||!o(a))return!1}return!0}function on(e,t,n){if("function"!=typeof e)throw new Wo(B);return os(function(){e.apply(z,n)},t)}function an(e,t,n,r){var i=-1,o=c,a=!0,s=e.length,u=[],l=t.length;if(!s)return u;n&&(t=h(t,S(n))),r?(o=f,a=!1):t.length>=q&&(o=j,a=!1,t=new Et(t));e:for(;++i0&&n(s)?t>1?fn(s,t-1,n,r,i):p(i,s):r||(i[i.length]=s)}return i}function vn(e,t){return e&&Ua(e,t,_o)}function xn(e,t){return e&&Va(e,t,_o)}function kn(e,t){return d(t,function(t){return Ki(e[t])})}function Tn(e,t){for(var n=0,r=(t=br(t,e)).length;null!=e&&nt}function Cn(e,t){return null!=e&&Uo.call(e,t)}function jn(e,t){return null!=e&&t in No(e)}function En(e,t,n){for(var r=n?f:c,i=e[0].length,o=e.length,a=o,s=Eo(o),u=1/0,l=[];a--;){var d=e[a];a&&t&&(d=h(d,S(t))),u=wa(d.length,u),s[a]=!n&&(t||i>=120&&d.length>=120)?new Et(a&&d):z}d=e[0];var p=-1,m=s[0];e:for(;++p=s)return u;return u*("desc"==n[r]?-1:1)}}return e.index-t.index}(e,t,n)})}function Jn(e,t,n){for(var r=-1,i=t.length,o={};++r-1;)s!==e&&aa.call(s,u,1),aa.call(e,u,1);return e}function Xn(e,t){for(var n=e?t.length:0,r=n-1;n--;){var i=t[n];if(n==r||i!==o){var o=i;fi(i)?aa.call(e,i,1):fr(e,i)}}return e}function Kn(e,t){return e+ma(ka()*(t-e+1))}function Zn(e,t){var n="";if(!e||t<1||t>fe)return n;do{t%2&&(n+=e),(t=ma(t/2))&&(e+=e)}while(t);return n}function Qn(e,t){return as(vi(e,t,xo),e+"")}function er(e){return At(vo(e))}function tr(e,t){var n=vo(e);return xi(n,Vt(t,0,n.length))}function nr(e,t,n,r){if(!eo(e))return e;for(var i=-1,o=(t=br(t,e)).length,a=o-1,s=e;null!=s&&++ii?0:i+t),(n=n>i?i:n)<0&&(n+=i),i=t>n?0:n-t>>>0,t>>>=0;for(var o=Eo(i);++r>>1,a=e[o];null!==a&&!oo(a)&&(n?a<=t:a=q){var l=t?null:Za(e);if(l)return R(l);a=!1,i=j,u=new Et}else u=t?[]:s;e:for(;++r=r?e:ir(e,t,n)}function wr(e,t){if(t)return e.slice();var n=e.length,r=na?na(n):new e.constructor(n);return e.copy(r),r}function Lr(e){var t=new e.constructor(e.byteLength);return new ta(t).set(new ta(e)),t}function xr(e,t){var n=t?Lr(e.buffer):e.buffer;return new e.constructor(n,e.byteOffset,e.length)}function kr(e,t){if(e!==t){var n=e!==z,r=null===e,i=e==e,o=oo(e),a=t!==z,s=null===t,u=t==t,l=oo(t);if(!s&&!l&&!o&&e>t||o&&a&&u&&!s&&!l||r&&a&&u||!n&&u||!i)return 1;if(!r&&!o&&!l&&e1?n[i-1]:z,a=i>2?n[2]:z;for(o=e.length>3&&"function"==typeof o?(i--,o):z,a&&hi(n[0],n[1],a)&&(o=i<3?z:o,i=1),t=No(t);++r-1?i[o?t[a]:a]:z}}function Ir(e){return ei(function(t){var n=t.length,r=n,o=i.prototype.thru;for(e&&t.reverse();r--;){var a=t[r];if("function"!=typeof a)throw new Wo(B);if(o&&!s&&"wrapper"==ri(a))var s=new i([],!0)}for(r=s?r:n;++r=200&&e<300}};u.headers={common:{Accept:"application/json, text/plain, */*"}},o.forEach(["delete","get","head"],function(e){u.headers[e]={}}),o.forEach(["post","put","patch"],function(e){u.headers[e]=o.merge(s)}),e.exports=u}).call(t,n(21))},,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;t-1}function f(e,t,n){for(var r=-1,i=null==e?0:e.length;++r-1;);return n}function H(e,t){for(var n=e.length;n--&&b(t,e[n],0)>-1;);return n}function O(e){return"\\"+tn[e]}function A(e){return Gt.test(e)}function P(e){var t=-1,n=Array(e.size);return e.forEach(function(e,r){n[++t]=[r,e]}),n}function N(e,t){return function(n){return e(t(n))}}function I(e,t){for(var n=-1,r=e.length,i=0,o=[];++n>>1,ye=[["ary",ae],["bind",Q],["bindKey",ee],["curry",ne],["curryRight",re],["flip",ue],["partial",ie],["partialRight",oe],["rearg",se]],ve="[object Arguments]",be="[object Array]",Me="[object AsyncFunction]",we="[object Boolean]",Le="[object Date]",xe="[object DOMException]",ke="[object Error]",Te="[object Function]",De="[object GeneratorFunction]",Ye="[object Map]",Se="[object Number]",Ce="[object Null]",je="[object Object]",Ee="[object Proxy]",He="[object RegExp]",Oe="[object Set]",Ae="[object String]",Pe="[object Symbol]",Ne="[object Undefined]",Ie="[object WeakMap]",Re="[object ArrayBuffer]",We="[object DataView]",$e="[object Float32Array]",Fe="[object Float64Array]",ze="[object Int8Array]",qe="[object Int16Array]",Be="[object Int32Array]",Ue="[object Uint8Array]",Ve="[object Uint8ClampedArray]",Je="[object Uint16Array]",Ge="[object Uint32Array]",Xe=/\b__p \+= '';/g,Ke=/\b(__p \+=) '' \+/g,Ze=/(__e\(.*?\)|\b__t\)) \+\n'';/g,Qe=/&(?:amp|lt|gt|quot|#39);/g,et=/[&<>"']/g,tt=RegExp(Qe.source),nt=RegExp(et.source),rt=/<%-([\s\S]+?)%>/g,it=/<%([\s\S]+?)%>/g,ot=/<%=([\s\S]+?)%>/g,at=/\.|\[(?:[^[\]]*|(["'])(?:(?!\1)[^\\]|\\.)*?\1)\]/,st=/^\w*$/,ut=/[^.[\]]+|\[(?:(-?\d+(?:\.\d+)?)|(["'])((?:(?!\2)[^\\]|\\.)*?)\2)\]|(?=(?:\.|\[\])(?:\.|\[\]|$))/g,lt=/[\\^$.*+?()[\]{}|]/g,dt=RegExp(lt.source),ct=/^\s+|\s+$/g,ft=/^\s+/,ht=/\s+$/,pt=/\{(?:\n\/\* \[wrapped with .+\] \*\/)?\n?/,mt=/\{\n\/\* \[wrapped with (.+)\] \*/,_t=/,? & /,gt=/[^\x00-\x2f\x3a-\x40\x5b-\x60\x7b-\x7f]+/g,yt=/\\(\\)?/g,vt=/\$\{([^\\}]*(?:\\.[^\\}]*)*)\}/g,bt=/\w*$/,Mt=/^[-+]0x[0-9a-f]+$/i,wt=/^0b[01]+$/i,Lt=/^\[object .+?Constructor\]$/,xt=/^0o[0-7]+$/i,kt=/^(?:0|[1-9]\d*)$/,Tt=/[\xc0-\xd6\xd8-\xf6\xf8-\xff\u0100-\u017f]/g,Dt=/($^)/,Yt=/['\n\r\u2028\u2029\\]/g,St="\\u0300-\\u036f\\ufe20-\\ufe2f\\u20d0-\\u20ff",Ct="\\xac\\xb1\\xd7\\xf7\\x00-\\x2f\\x3a-\\x40\\x5b-\\x60\\x7b-\\xbf\\u2000-\\u206f \\t\\x0b\\f\\xa0\\ufeff\\n\\r\\u2028\\u2029\\u1680\\u180e\\u2000\\u2001\\u2002\\u2003\\u2004\\u2005\\u2006\\u2007\\u2008\\u2009\\u200a\\u202f\\u205f\\u3000",jt="["+Ct+"]",Et="["+St+"]",Ht="[a-z\\xdf-\\xf6\\xf8-\\xff]",Ot="[^\\ud800-\\udfff"+Ct+"\\d+\\u2700-\\u27bfa-z\\xdf-\\xf6\\xf8-\\xffA-Z\\xc0-\\xd6\\xd8-\\xde]",At="\\ud83c[\\udffb-\\udfff]",Pt="[^\\ud800-\\udfff]",Nt="(?:\\ud83c[\\udde6-\\uddff]){2}",It="[\\ud800-\\udbff][\\udc00-\\udfff]",Rt="[A-Z\\xc0-\\xd6\\xd8-\\xde]",Wt="(?:"+Ht+"|"+Ot+")",$t="(?:"+Et+"|"+At+")?",Ft="[\\ufe0e\\ufe0f]?"+$t+"(?:\\u200d(?:"+[Pt,Nt,It].join("|")+")[\\ufe0e\\ufe0f]?"+$t+")*",zt="(?:"+["[\\u2700-\\u27bf]",Nt,It].join("|")+")"+Ft,qt="(?:"+[Pt+Et+"?",Et,Nt,It,"[\\ud800-\\udfff]"].join("|")+")",Bt=RegExp("['’]","g"),Ut=RegExp(Et,"g"),Vt=RegExp(At+"(?="+At+")|"+qt+Ft,"g"),Jt=RegExp([Rt+"?"+Ht+"+(?:['’](?:d|ll|m|re|s|t|ve))?(?="+[jt,Rt,"$"].join("|")+")","(?:[A-Z\\xc0-\\xd6\\xd8-\\xde]|[^\\ud800-\\udfff\\xac\\xb1\\xd7\\xf7\\x00-\\x2f\\x3a-\\x40\\x5b-\\x60\\x7b-\\xbf\\u2000-\\u206f \\t\\x0b\\f\\xa0\\ufeff\\n\\r\\u2028\\u2029\\u1680\\u180e\\u2000\\u2001\\u2002\\u2003\\u2004\\u2005\\u2006\\u2007\\u2008\\u2009\\u200a\\u202f\\u205f\\u3000\\d+\\u2700-\\u27bfa-z\\xdf-\\xf6\\xf8-\\xffA-Z\\xc0-\\xd6\\xd8-\\xde])+(?:['’](?:D|LL|M|RE|S|T|VE))?(?="+[jt,Rt+Wt,"$"].join("|")+")",Rt+"?"+Wt+"+(?:['’](?:d|ll|m|re|s|t|ve))?",Rt+"+(?:['’](?:D|LL|M|RE|S|T|VE))?","\\d*(?:1ST|2ND|3RD|(?![123])\\dTH)(?=\\b|[a-z_])","\\d*(?:1st|2nd|3rd|(?![123])\\dth)(?=\\b|[A-Z_])","\\d+",zt].join("|"),"g"),Gt=RegExp("[\\u200d\\ud800-\\udfff"+St+"\\ufe0e\\ufe0f]"),Xt=/[a-z][A-Z]|[A-Z]{2}[a-z]|[0-9][a-zA-Z]|[a-zA-Z][0-9]|[^a-zA-Z0-9 ]/,Kt=["Array","Buffer","DataView","Date","Error","Float32Array","Float64Array","Function","Int8Array","Int16Array","Int32Array","Map","Math","Object","Promise","RegExp","Set","String","Symbol","TypeError","Uint8Array","Uint8ClampedArray","Uint16Array","Uint32Array","WeakMap","_","clearTimeout","isFinite","parseInt","setTimeout"],Zt=-1,Qt={};Qt[$e]=Qt[Fe]=Qt[ze]=Qt[qe]=Qt[Be]=Qt[Ue]=Qt[Ve]=Qt[Je]=Qt[Ge]=!0,Qt[ve]=Qt[be]=Qt[Re]=Qt[we]=Qt[We]=Qt[Le]=Qt[ke]=Qt[Te]=Qt[Ye]=Qt[Se]=Qt[je]=Qt[He]=Qt[Oe]=Qt[Ae]=Qt[Ie]=!1;var en={};en[ve]=en[be]=en[Re]=en[We]=en[we]=en[Le]=en[$e]=en[Fe]=en[ze]=en[qe]=en[Be]=en[Ye]=en[Se]=en[je]=en[He]=en[Oe]=en[Ae]=en[Pe]=en[Ue]=en[Ve]=en[Je]=en[Ge]=!0,en[ke]=en[Te]=en[Ie]=!1;var tn={"\\":"\\","'":"'","\n":"n","\r":"r","\u2028":"u2028","\u2029":"u2029"},nn=parseFloat,rn=parseInt,on="object"==typeof e&&e&&e.Object===Object&&e,an="object"==typeof self&&self&&self.Object===Object&&self,sn=on||an||Function("return this")(),un="object"==typeof t&&t&&!t.nodeType&&t,ln=un&&"object"==typeof r&&r&&!r.nodeType&&r,dn=ln&&ln.exports===un,cn=dn&&on.process,fn=function(){try{return ln&&ln.require&&ln.require("util").types||cn&&cn.binding&&cn.binding("util")}catch(e){}}(),hn=fn&&fn.isArrayBuffer,pn=fn&&fn.isDate,mn=fn&&fn.isMap,_n=fn&&fn.isRegExp,gn=fn&&fn.isSet,yn=fn&&fn.isTypedArray,vn=x("length"),bn=k({"À":"A","Á":"A","Â":"A","Ã":"A","Ä":"A","Å":"A","à":"a","á":"a","â":"a","ã":"a","ä":"a","å":"a","Ç":"C","ç":"c","Ð":"D","ð":"d","È":"E","É":"E","Ê":"E","Ë":"E","è":"e","é":"e","ê":"e","ë":"e","Ì":"I","Í":"I","Î":"I","Ï":"I","ì":"i","í":"i","î":"i","ï":"i","Ñ":"N","ñ":"n","Ò":"O","Ó":"O","Ô":"O","Õ":"O","Ö":"O","Ø":"O","ò":"o","ó":"o","ô":"o","õ":"o","ö":"o","ø":"o","Ù":"U","Ú":"U","Û":"U","Ü":"U","ù":"u","ú":"u","û":"u","ü":"u","Ý":"Y","ý":"y","ÿ":"y","Æ":"Ae","æ":"ae","Þ":"Th","þ":"th","ß":"ss","Ā":"A","Ă":"A","Ą":"A","ā":"a","ă":"a","ą":"a","Ć":"C","Ĉ":"C","Ċ":"C","Č":"C","ć":"c","ĉ":"c","ċ":"c","č":"c","Ď":"D","Đ":"D","ď":"d","đ":"d","Ē":"E","Ĕ":"E","Ė":"E","Ę":"E","Ě":"E","ē":"e","ĕ":"e","ė":"e","ę":"e","ě":"e","Ĝ":"G","Ğ":"G","Ġ":"G","Ģ":"G","ĝ":"g","ğ":"g","ġ":"g","ģ":"g","Ĥ":"H","Ħ":"H","ĥ":"h","ħ":"h","Ĩ":"I","Ī":"I","Ĭ":"I","Į":"I","İ":"I","ĩ":"i","ī":"i","ĭ":"i","į":"i","ı":"i","Ĵ":"J","ĵ":"j","Ķ":"K","ķ":"k","ĸ":"k","Ĺ":"L","Ļ":"L","Ľ":"L","Ŀ":"L","Ł":"L","ĺ":"l","ļ":"l","ľ":"l","ŀ":"l","ł":"l","Ń":"N","Ņ":"N","Ň":"N","Ŋ":"N","ń":"n","ņ":"n","ň":"n","ŋ":"n","Ō":"O","Ŏ":"O","Ő":"O","ō":"o","ŏ":"o","ő":"o","Ŕ":"R","Ŗ":"R","Ř":"R","ŕ":"r","ŗ":"r","ř":"r","Ś":"S","Ŝ":"S","Ş":"S","Š":"S","ś":"s","ŝ":"s","ş":"s","š":"s","Ţ":"T","Ť":"T","Ŧ":"T","ţ":"t","ť":"t","ŧ":"t","Ũ":"U","Ū":"U","Ŭ":"U","Ů":"U","Ű":"U","Ų":"U","ũ":"u","ū":"u","ŭ":"u","ů":"u","ű":"u","ų":"u","Ŵ":"W","ŵ":"w","Ŷ":"Y","ŷ":"y","Ÿ":"Y","Ź":"Z","Ż":"Z","Ž":"Z","ź":"z","ż":"z","ž":"z","IJ":"IJ","ij":"ij","Œ":"Oe","œ":"oe","ʼn":"'n","ſ":"s"}),Mn=k({"&":"&","<":"<",">":">",'"':""","'":"'"}),wn=k({"&":"&","<":"<",">":">",""":'"',"'":"'"}),Ln=function e(t){function n(e){if(to(e)&&!Vs(e)&&!(e instanceof k)){if(e instanceof i)return e;if(Uo.call(e,"__wrapped__"))return Di(e)}return new i(e)}function r(){}function i(e,t){this.__wrapped__=e,this.__actions__=[],this.__chain__=!!t,this.__index__=0,this.__values__=z}function k(e){this.__wrapped__=e,this.__actions__=[],this.__dir__=1,this.__filtered__=!1,this.__iteratees__=[],this.__takeCount__=me,this.__views__=[]}function St(e){var t=-1,n=null==e?0:e.length;for(this.clear();++t=t?e:t)),e}function Gt(e,t,n,r,i,o){var a,u=t&J,l=t&G,d=t&X;if(n&&(a=i?n(e,r,i,o):n(e)),a!==z)return a;if(!eo(e))return e;var c=Vs(e);if(c){if(a=function(e){var t=e.length,n=new e.constructor(t);return t&&"string"==typeof e[0]&&Uo.call(e,"index")&&(n.index=e.index,n.input=e.input),n}(e),!u)return Yr(e,a)}else{var f=ns(e),h=f==Te||f==De;if(Gs(e))return wr(e,u);if(f==je||f==ve||h&&!i){if(a=l||h?{}:di(e),!u)return l?function(e,t){return Sr(e,ts(e),t)}(e,function(e,t){return e&&Sr(t,go(t),e)}(a,e)):function(e,t){return Sr(e,es(e),t)}(e,Ft(a,e))}else{if(!en[f])return i?e:{};a=function(e,t,n){var r,i,o,a=e.constructor;switch(t){case Re:return Lr(e);case we:case Le:return new a(+e);case We:return function(e,t){var n=t?Lr(e.buffer):e.buffer;return new e.constructor(n,e.byteOffset,e.byteLength)}(e,n);case $e:case Fe:case ze:case qe:case Be:case Ue:case Ve:case Je:case Ge:return xr(e,n);case Ye:return new a;case Se:case Ae:return new a(e);case He:return(o=new(i=e).constructor(i.source,bt.exec(i))).lastIndex=i.lastIndex,o;case Oe:return new a;case Pe:return r=e,$a?No($a.call(r)):{}}}(e,f,u)}}o||(o=new Ht);var p=o.get(e);if(p)return p;if(o.set(e,a),Qs(e))return e.forEach(function(r){a.add(Gt(r,t,n,r,e,o))}),a;if(Ks(e))return e.forEach(function(r,i){a.set(i,Gt(r,t,n,i,e,o))}),a;var m=c?z:(d?l?ni:ti:l?go:_o)(e);return s(m||e,function(r,i){m&&(r=e[i=r]),Rt(a,i,Gt(r,t,n,i,e,o))}),a}function tn(e,t,n){var r=n.length;if(null==e)return!r;for(e=No(e);r--;){var i=n[r],o=t[i],a=e[i];if(a===z&&!(i in e)||!o(a))return!1}return!0}function on(e,t,n){if("function"!=typeof e)throw new Wo(B);return os(function(){e.apply(z,n)},t)}function an(e,t,n,r){var i=-1,o=c,a=!0,s=e.length,u=[],l=t.length;if(!s)return u;n&&(t=h(t,S(n))),r?(o=f,a=!1):t.length>=q&&(o=j,a=!1,t=new Et(t));e:for(;++i0&&n(s)?t>1?fn(s,t-1,n,r,i):p(i,s):r||(i[i.length]=s)}return i}function vn(e,t){return e&&Ua(e,t,_o)}function xn(e,t){return e&&Va(e,t,_o)}function kn(e,t){return d(t,function(t){return Ki(e[t])})}function Tn(e,t){for(var n=0,r=(t=br(t,e)).length;null!=e&&nt}function Cn(e,t){return null!=e&&Uo.call(e,t)}function jn(e,t){return null!=e&&t in No(e)}function En(e,t,n){for(var r=n?f:c,i=e[0].length,o=e.length,a=o,s=Eo(o),u=1/0,l=[];a--;){var d=e[a];a&&t&&(d=h(d,S(t))),u=wa(d.length,u),s[a]=!n&&(t||i>=120&&d.length>=120)?new Et(a&&d):z}d=e[0];var p=-1,m=s[0];e:for(;++p=s)return u;return u*("desc"==n[r]?-1:1)}}return e.index-t.index}(e,t,n)})}function Jn(e,t,n){for(var r=-1,i=t.length,o={};++r-1;)s!==e&&aa.call(s,u,1),aa.call(e,u,1);return e}function Xn(e,t){for(var n=e?t.length:0,r=n-1;n--;){var i=t[n];if(n==r||i!==o){var o=i;fi(i)?aa.call(e,i,1):fr(e,i)}}return e}function Kn(e,t){return e+ma(ka()*(t-e+1))}function Zn(e,t){var n="";if(!e||t<1||t>fe)return n;do{t%2&&(n+=e),(t=ma(t/2))&&(e+=e)}while(t);return n}function Qn(e,t){return as(vi(e,t,xo),e+"")}function er(e){return At(vo(e))}function tr(e,t){var n=vo(e);return xi(n,Vt(t,0,n.length))}function nr(e,t,n,r){if(!eo(e))return e;for(var i=-1,o=(t=br(t,e)).length,a=o-1,s=e;null!=s&&++ii?0:i+t),(n=n>i?i:n)<0&&(n+=i),i=t>n?0:n-t>>>0,t>>>=0;for(var o=Eo(i);++r>>1,a=e[o];null!==a&&!oo(a)&&(n?a<=t:a=q){var l=t?null:Za(e);if(l)return R(l);a=!1,i=j,u=new Et}else u=t?[]:s;e:for(;++r=r?e:ir(e,t,n)}function wr(e,t){if(t)return e.slice();var n=e.length,r=na?na(n):new e.constructor(n);return e.copy(r),r}function Lr(e){var t=new e.constructor(e.byteLength);return new ta(t).set(new ta(e)),t}function xr(e,t){var n=t?Lr(e.buffer):e.buffer;return new e.constructor(n,e.byteOffset,e.length)}function kr(e,t){if(e!==t){var n=e!==z,r=null===e,i=e==e,o=oo(e),a=t!==z,s=null===t,u=t==t,l=oo(t);if(!s&&!l&&!o&&e>t||o&&a&&u&&!s&&!l||r&&a&&u||!n&&u||!i)return 1;if(!r&&!o&&!l&&e1?n[i-1]:z,a=i>2?n[2]:z;for(o=e.length>3&&"function"==typeof o?(i--,o):z,a&&hi(n[0],n[1],a)&&(o=i<3?z:o,i=1),t=No(t);++r-1?i[o?t[a]:a]:z}}function Ir(e){return ei(function(t){var n=t.length,r=n,o=i.prototype.thru;for(e&&t.reverse();r--;){var a=t[r];if("function"!=typeof a)throw new Wo(B);if(o&&!s&&"wrapper"==ri(a))var s=new i([],!0)}for(r=s?r:n;++r1&&y.reverse(),d&&us))return!1;var l=o.get(e);if(l&&o.get(t))return l==t;var d=-1,c=!0,f=n&Z?new Et:z;for(o.set(e,t),o.set(t,e);++d-1&&e%1==0&&e1?"& ":"")+t[r],t=t.join(n>2?", ":" "),e.replace(pt,"{\n/* [wrapped with "+t+"] */\n")}(r,function(e,t){return s(ye,function(n){var r="_."+n[0];t&n[1]&&!c(e,r)&&e.push(r)}),e.sort()}(function(e){var t=e.match(mt);return t?t[1].split(_t):[]}(r),n)))}function Li(e){var t=0,n=0;return function(){var r=La(),i=de-(r-n);if(n=r,i>0){if(++t>=le)return arguments[0]}else t=0;return e.apply(z,arguments)}}function xi(e,t){var n=-1,r=e.length,i=r-1;for(t=t===z?r:t;++n0&&(n=t.apply(this,arguments)),e<=1&&(t=z),n}}function qi(e,t,n){function r(t){var n=u,r=l;return u=l=z,p=t,c=e.apply(r,n)}function i(e){var n=e-h;return h===z||n>=t||n<0||_&&e-p>=d}function o(){var e=Os();if(i(e))return a(e);f=os(o,function(e){var n=t-(e-h);return _?wa(n,d-(e-p)):n}(e))}function a(e){return f=z,g&&u?r(e):(u=l=z,c)}function s(){var e=Os(),n=i(e);if(u=arguments,l=this,h=e,n){if(f===z)return function(e){return p=e,f=os(o,t),m?r(e):c}(h);if(_)return f=os(o,t),r(h)}return f===z&&(f=os(o,t)),c}var u,l,d,c,f,h,p=0,m=!1,_=!1,g=!0;if("function"!=typeof e)throw new Wo(B);return t=co(t)||0,eo(n)&&(m=!!n.leading,d=(_="maxWait"in n)?Ma(co(n.maxWait)||0,t):d,g="trailing"in n?!!n.trailing:g),s.cancel=function(){f!==z&&Ka(f),p=0,u=h=l=f=z},s.flush=function(){return f===z?c:a(Os())},s}function Bi(e,t){if("function"!=typeof e||null!=t&&"function"!=typeof t)throw new Wo(B);var n=function(){var r=arguments,i=t?t.apply(this,r):r[0],o=n.cache;if(o.has(i))return o.get(i);var a=e.apply(this,r);return n.cache=o.set(i,a)||o,a};return n.cache=new(Bi.Cache||jt),n}function Ui(e){if("function"!=typeof e)throw new Wo(B);return function(){var t=arguments;switch(t.length){case 0:return!e.call(this);case 1:return!e.call(this,t[0]);case 2:return!e.call(this,t[0],t[1]);case 3:return!e.call(this,t[0],t[1],t[2])}return!e.apply(this,t)}}function Vi(e,t){return e===t||e!=e&&t!=t}function Ji(e){return null!=e&&Qi(e.length)&&!Ki(e)}function Gi(e){return to(e)&&Ji(e)}function Xi(e){if(!to(e))return!1;var t=Yn(e);return t==ke||t==xe||"string"==typeof e.message&&"string"==typeof e.name&&!ro(e)}function Ki(e){if(!eo(e))return!1;var t=Yn(e);return t==Te||t==De||t==Me||t==Ee}function Zi(e){return"number"==typeof e&&e==uo(e)}function Qi(e){return"number"==typeof e&&e>-1&&e%1==0&&e<=fe}function eo(e){var t=typeof e;return null!=e&&("object"==t||"function"==t)}function to(e){return null!=e&&"object"==typeof e}function no(e){return"number"==typeof e||to(e)&&Yn(e)==Se}function ro(e){if(!to(e)||Yn(e)!=je)return!1;var t=ra(e);if(null===t)return!0;var n=Uo.call(t,"constructor")&&t.constructor;return"function"==typeof n&&n instanceof n&&Bo.call(n)==Xo}function io(e){return"string"==typeof e||!Vs(e)&&to(e)&&Yn(e)==Ae}function oo(e){return"symbol"==typeof e||to(e)&&Yn(e)==Pe}function ao(e){if(!e)return[];if(Ji(e))return io(e)?F(e):Yr(e);if(ua&&e[ua])return function(e){for(var t,n=[];!(t=e.next()).done;)n.push(t.value);return n}(e[ua]());var t=ns(e);return(t==Ye?P:t==Oe?R:vo)(e)}function so(e){return e?(e=co(e))===ce||e===-ce?(e<0?-1:1)*he:e==e?e:0:0===e?e:0}function uo(e){var t=so(e),n=t%1;return t==t?n?t-n:t:0}function lo(e){return e?Vt(uo(e),0,me):0}function co(e){if("number"==typeof e)return e;if(oo(e))return pe;if(eo(e)){var t="function"==typeof e.valueOf?e.valueOf():e;e=eo(t)?t+"":t}if("string"!=typeof e)return 0===e?e:+e;e=e.replace(ct,"");var n=wt.test(e);return n||xt.test(e)?rn(e.slice(2),n?2:8):Mt.test(e)?pe:+e}function fo(e){return Sr(e,go(e))}function ho(e){return null==e?"":dr(e)}function po(e,t,n){var r=null==e?z:Tn(e,t);return r===z?n:r}function mo(e,t){return null!=e&&li(e,t,jn)}function _o(e){return Ji(e)?Ot(e):Rn(e)}function go(e){return Ji(e)?Ot(e,!0):Wn(e)}function yo(e,t){if(null==e)return{};var n=h(ni(e),function(e){return[e]});return t=oi(t),Jn(e,n,function(e,n){return t(e,n[0])})}function vo(e){return null==e?[]:C(e,_o(e))}function bo(e){return Tu(ho(e).toLowerCase())}function Mo(e){return(e=ho(e))&&e.replace(Tt,bn).replace(Ut,"")}function wo(e,t,n){return e=ho(e),(t=n?z:t)===z?function(e){return Xt.test(e)}(e)?function(e){return e.match(Jt)||[]}(e):function(e){return e.match(gt)||[]}(e):e.match(t)||[]}function Lo(e){return function(){return e}}function xo(e){return e}function ko(e){return In("function"==typeof e?e:Gt(e,J))}function To(e,t,n){var r=_o(t),i=kn(t,r);null!=n||eo(t)&&(i.length||!r.length)||(n=t,t=e,e=this,i=kn(t,_o(t)));var o=!(eo(n)&&"chain"in n&&!n.chain),a=Ki(e);return s(i,function(n){var r=t[n];e[n]=r,a&&(e.prototype[n]=function(){var t=this.__chain__;if(o||t){var n=e(this.__wrapped__);return(n.__actions__=Yr(this.__actions__)).push({func:r,args:arguments,thisArg:e}),n.__chain__=t,n}return r.apply(e,p([this.value()],arguments))})}),e}function Do(){}function Yo(e){return pi(e)?x(ki(e)):function(e){return function(t){return Tn(t,e)}}(e)}function So(){return[]}function Co(){return!1}var jo,Eo=(t=null==t?sn:Ln.defaults(sn.Object(),t,Ln.pick(sn,Kt))).Array,Ho=t.Date,Oo=t.Error,Ao=t.Function,Po=t.Math,No=t.Object,Io=t.RegExp,Ro=t.String,Wo=t.TypeError,$o=Eo.prototype,Fo=Ao.prototype,zo=No.prototype,qo=t["__core-js_shared__"],Bo=Fo.toString,Uo=zo.hasOwnProperty,Vo=0,Jo=(jo=/[^.]+$/.exec(qo&&qo.keys&&qo.keys.IE_PROTO||""))?"Symbol(src)_1."+jo:"",Go=zo.toString,Xo=Bo.call(No),Ko=sn._,Zo=Io("^"+Bo.call(Uo).replace(lt,"\\$&").replace(/hasOwnProperty|(function).*?(?=\\\()| for .+?(?=\\\])/g,"$1.*?")+"$"),Qo=dn?t.Buffer:z,ea=t.Symbol,ta=t.Uint8Array,na=Qo?Qo.allocUnsafe:z,ra=N(No.getPrototypeOf,No),ia=No.create,oa=zo.propertyIsEnumerable,aa=$o.splice,sa=ea?ea.isConcatSpreadable:z,ua=ea?ea.iterator:z,la=ea?ea.toStringTag:z,da=function(){try{var e=ui(No,"defineProperty");return e({},"",{}),e}catch(e){}}(),ca=t.clearTimeout!==sn.clearTimeout&&t.clearTimeout,fa=Ho&&Ho.now!==sn.Date.now&&Ho.now,ha=t.setTimeout!==sn.setTimeout&&t.setTimeout,pa=Po.ceil,ma=Po.floor,_a=No.getOwnPropertySymbols,ga=Qo?Qo.isBuffer:z,ya=t.isFinite,va=$o.join,ba=N(No.keys,No),Ma=Po.max,wa=Po.min,La=Ho.now,xa=t.parseInt,ka=Po.random,Ta=$o.reverse,Da=ui(t,"DataView"),Ya=ui(t,"Map"),Sa=ui(t,"Promise"),Ca=ui(t,"Set"),ja=ui(t,"WeakMap"),Ea=ui(No,"create"),Ha=ja&&new ja,Oa={},Aa=Ti(Da),Pa=Ti(Ya),Na=Ti(Sa),Ia=Ti(Ca),Ra=Ti(ja),Wa=ea?ea.prototype:z,$a=Wa?Wa.valueOf:z,Fa=Wa?Wa.toString:z,za=function(){function e(){}return function(t){if(!eo(t))return{};if(ia)return ia(t);e.prototype=t;var n=new e;return e.prototype=z,n}}();n.templateSettings={escape:rt,evaluate:it,interpolate:ot,variable:"",imports:{_:n}},n.prototype=r.prototype,n.prototype.constructor=n,i.prototype=za(r.prototype),i.prototype.constructor=i,k.prototype=za(r.prototype),k.prototype.constructor=k,St.prototype.clear=function(){this.__data__=Ea?Ea(null):{},this.size=0},St.prototype.delete=function(e){var t=this.has(e)&&delete this.__data__[e];return this.size-=t?1:0,t},St.prototype.get=function(e){var t=this.__data__;if(Ea){var n=t[e];return n===U?z:n}return Uo.call(t,e)?t[e]:z},St.prototype.has=function(e){var t=this.__data__;return Ea?t[e]!==z:Uo.call(t,e)},St.prototype.set=function(e,t){var n=this.__data__;return this.size+=this.has(e)?0:1,n[e]=Ea&&t===z?U:t,this},Ct.prototype.clear=function(){this.__data__=[],this.size=0},Ct.prototype.delete=function(e){var t=this.__data__,n=Wt(t,e);return!(n<0||(n==t.length-1?t.pop():aa.call(t,n,1),--this.size,0))},Ct.prototype.get=function(e){var t=this.__data__,n=Wt(t,e);return n<0?z:t[n][1]},Ct.prototype.has=function(e){return Wt(this.__data__,e)>-1},Ct.prototype.set=function(e,t){var n=this.__data__,r=Wt(n,e);return r<0?(++this.size,n.push([e,t])):n[r][1]=t,this},jt.prototype.clear=function(){this.size=0,this.__data__={hash:new St,map:new(Ya||Ct),string:new St}},jt.prototype.delete=function(e){var t=ai(this,e).delete(e);return this.size-=t?1:0,t},jt.prototype.get=function(e){return ai(this,e).get(e)},jt.prototype.has=function(e){return ai(this,e).has(e)},jt.prototype.set=function(e,t){var n=ai(this,e),r=n.size;return n.set(e,t),this.size+=n.size==r?0:1,this},Et.prototype.add=Et.prototype.push=function(e){return this.__data__.set(e,U),this},Et.prototype.has=function(e){return this.__data__.has(e)},Ht.prototype.clear=function(){this.__data__=new Ct,this.size=0},Ht.prototype.delete=function(e){var t=this.__data__,n=t.delete(e);return this.size=t.size,n},Ht.prototype.get=function(e){return this.__data__.get(e)},Ht.prototype.has=function(e){return this.__data__.has(e)},Ht.prototype.set=function(e,t){var n=this.__data__;if(n instanceof Ct){var r=n.__data__;if(!Ya||r.length1?e[t-1]:z;return Pi(e,n="function"==typeof n?(e.pop(),n):z)}),ks=ei(function(e){var t=e.length,n=t?e[0]:0,r=this.__wrapped__,o=function(t){return qt(t,e)};return!(t>1||this.__actions__.length)&&r instanceof k&&fi(n)?((r=r.slice(n,+n+(t?1:0))).__actions__.push({func:Ii,args:[o],thisArg:z}),new i(r,this.__chain__).thru(function(e){return t&&!e.length&&e.push(z),e})):this.thru(o)}),Ts=Cr(function(e,t,n){Uo.call(e,n)?++e[n]:zt(e,n,1)}),Ds=Nr(Yi),Ys=Nr(Si),Ss=Cr(function(e,t,n){Uo.call(e,n)?e[n].push(t):zt(e,n,[t])}),Cs=Qn(function(e,t,n){var r=-1,i="function"==typeof t,a=Ji(e)?Eo(e.length):[];return qa(e,function(e){a[++r]=i?o(t,e,n):Hn(e,t,n)}),a}),js=Cr(function(e,t,n){zt(e,n,t)}),Es=Cr(function(e,t,n){e[n?0:1].push(t)},function(){return[[],[]]}),Hs=Qn(function(e,t){if(null==e)return[];var n=t.length;return n>1&&hi(e,t[0],t[1])?t=[]:n>2&&hi(t[0],t[1],t[2])&&(t=[t[0]]),Vn(e,fn(t,1),[])}),Os=fa||function(){return sn.Date.now()},As=Qn(function(e,t,n){var r=Q;if(n.length){var i=I(n,ii(As));r|=ie}return Gr(e,r,t,n,i)}),Ps=Qn(function(e,t,n){var r=Q|ee;if(n.length){var i=I(n,ii(Ps));r|=ie}return Gr(t,r,e,n,i)}),Ns=Qn(function(e,t){return on(e,1,t)}),Is=Qn(function(e,t,n){return on(e,co(t)||0,n)});Bi.Cache=jt;var Rs,Ws=Xa(function(e,t){var n=(t=1==t.length&&Vs(t[0])?h(t[0],S(oi())):h(fn(t,1),S(oi()))).length;return Qn(function(r){for(var i=-1,a=wa(r.length,n);++i=t}),Us=On(function(){return arguments}())?On:function(e){return to(e)&&Uo.call(e,"callee")&&!oa.call(e,"callee")},Vs=Eo.isArray,Js=hn?S(hn):function(e){return to(e)&&Yn(e)==Re},Gs=ga||Co,Xs=pn?S(pn):function(e){return to(e)&&Yn(e)==Le},Ks=mn?S(mn):function(e){return to(e)&&ns(e)==Ye},Zs=_n?S(_n):function(e){return to(e)&&Yn(e)==He},Qs=gn?S(gn):function(e){return to(e)&&ns(e)==Oe},eu=yn?S(yn):function(e){return to(e)&&Qi(e.length)&&!!Qt[Yn(e)]},tu=Br($n),nu=Br(function(e,t){return e<=t}),ru=jr(function(e,t){if(_i(t)||Ji(t))Sr(t,_o(t),e);else for(var n in t)Uo.call(t,n)&&Rt(e,n,t[n])}),iu=jr(function(e,t){Sr(t,go(t),e)}),ou=jr(function(e,t,n,r){Sr(t,go(t),e,r)}),au=jr(function(e,t,n,r){Sr(t,_o(t),e,r)}),su=ei(qt),uu=Qn(function(e,t){e=No(e);var n=-1,r=t.length,i=r>2?t[2]:z;for(i&&hi(t[0],t[1],i)&&(r=1);++n1),t}),Sr(e,ni(e),n),r&&(n=Gt(n,J|G|X,Zr));for(var i=t.length;i--;)fr(n,t[i]);return n}),_u=ei(function(e,t){return null==e?{}:function(e,t){return Jn(e,t,function(t,n){return mo(e,n)})}(e,t)}),gu=Jr(_o),yu=Jr(go),vu=Ar(function(e,t,n){return t=t.toLowerCase(),e+(n?bo(t):t)}),bu=Ar(function(e,t,n){return e+(n?"-":"")+t.toLowerCase()}),Mu=Ar(function(e,t,n){return e+(n?" ":"")+t.toLowerCase()}),wu=Or("toLowerCase"),Lu=Ar(function(e,t,n){return e+(n?"_":"")+t.toLowerCase()}),xu=Ar(function(e,t,n){return e+(n?" ":"")+Tu(t)}),ku=Ar(function(e,t,n){return e+(n?" ":"")+t.toUpperCase()}),Tu=Or("toUpperCase"),Du=Qn(function(e,t){try{return o(e,z,t)}catch(e){return Xi(e)?e:new Oo(e)}}),Yu=ei(function(e,t){return s(t,function(t){t=ki(t),zt(e,t,As(e[t],e))}),e}),Su=Ir(),Cu=Ir(!0),ju=Qn(function(e,t){return function(n){return Hn(n,e,t)}}),Eu=Qn(function(e,t){return function(n){return Hn(e,n,t)}}),Hu=Fr(h),Ou=Fr(l),Au=Fr(g),Pu=qr(),Nu=qr(!0),Iu=$r(function(e,t){return e+t},0),Ru=Vr("ceil"),Wu=$r(function(e,t){return e/t},1),$u=Vr("floor"),Fu=$r(function(e,t){return e*t},1),zu=Vr("round"),qu=$r(function(e,t){return e-t},0);return n.after=function(e,t){if("function"!=typeof t)throw new Wo(B);return e=uo(e),function(){if(--e<1)return t.apply(this,arguments)}},n.ary=Fi,n.assign=ru,n.assignIn=iu,n.assignInWith=ou,n.assignWith=au,n.at=su,n.before=zi,n.bind=As,n.bindAll=Yu,n.bindKey=Ps,n.castArray=function(){if(!arguments.length)return[];var e=arguments[0];return Vs(e)?e:[e]},n.chain=Ni,n.chunk=function(e,t,n){t=(n?hi(e,t,n):t===z)?1:Ma(uo(t),0);var r=null==e?0:e.length;if(!r||t<1)return[];for(var i=0,o=0,a=Eo(pa(r/t));ii?0:i+n),(r=r===z||r>i?i:uo(r))<0&&(r+=i),r=n>r?0:lo(r);n>>0)?(e=ho(e))&&("string"==typeof t||null!=t&&!Zs(t))&&!(t=dr(t))&&A(e)?Mr(F(e),0,n):e.split(t,n):[]},n.spread=function(e,t){if("function"!=typeof e)throw new Wo(B);return t=null==t?0:Ma(uo(t),0),Qn(function(n){var r=n[t],i=Mr(n,0,t);return r&&p(i,r),o(e,this,i)})},n.tail=function(e){var t=null==e?0:e.length;return t?ir(e,1,t):[]},n.take=function(e,t,n){return e&&e.length?ir(e,0,(t=n||t===z?1:uo(t))<0?0:t):[]},n.takeRight=function(e,t,n){var r=null==e?0:e.length;return r?ir(e,(t=r-(t=n||t===z?1:uo(t)))<0?0:t,r):[]},n.takeRightWhile=function(e,t){return e&&e.length?pr(e,oi(t,3),!1,!0):[]},n.takeWhile=function(e,t){return e&&e.length?pr(e,oi(t,3)):[]},n.tap=function(e,t){return t(e),e},n.throttle=function(e,t,n){var r=!0,i=!0;if("function"!=typeof e)throw new Wo(B);return eo(n)&&(r="leading"in n?!!n.leading:r,i="trailing"in n?!!n.trailing:i),qi(e,t,{leading:r,maxWait:t,trailing:i})},n.thru=Ii,n.toArray=ao,n.toPairs=gu,n.toPairsIn=yu,n.toPath=function(e){return Vs(e)?h(e,ki):oo(e)?[e]:Yr(ss(ho(e)))},n.toPlainObject=fo,n.transform=function(e,t,n){var r=Vs(e),i=r||Gs(e)||eu(e);if(t=oi(t,4),null==n){var o=e&&e.constructor;n=i?r?new o:[]:eo(e)&&Ki(o)?za(ra(e)):{}}return(i?s:vn)(e,function(e,r,i){return t(n,e,r,i)}),n},n.unary=function(e){return Fi(e,1)},n.union=_s,n.unionBy=gs,n.unionWith=ys,n.uniq=function(e){return e&&e.length?cr(e):[]},n.uniqBy=function(e,t){return e&&e.length?cr(e,oi(t,2)):[]},n.uniqWith=function(e,t){return t="function"==typeof t?t:z,e&&e.length?cr(e,z,t):[]},n.unset=function(e,t){return null==e||fr(e,t)},n.unzip=Ai,n.unzipWith=Pi,n.update=function(e,t,n){return null==e?e:hr(e,t,vr(n))},n.updateWith=function(e,t,n,r){return r="function"==typeof r?r:z,null==e?e:hr(e,t,vr(n),r)},n.values=vo,n.valuesIn=function(e){return null==e?[]:C(e,go(e))},n.without=vs,n.words=wo,n.wrap=function(e,t){return $s(vr(t),e)},n.xor=bs,n.xorBy=Ms,n.xorWith=ws,n.zip=Ls,n.zipObject=function(e,t){return gr(e||[],t||[],Rt)},n.zipObjectDeep=function(e,t){return gr(e||[],t||[],nr)},n.zipWith=xs,n.entries=gu,n.entriesIn=yu,n.extend=iu,n.extendWith=ou,To(n,n),n.add=Iu,n.attempt=Du,n.camelCase=vu,n.capitalize=bo,n.ceil=Ru,n.clamp=function(e,t,n){return n===z&&(n=t,t=z),n!==z&&(n=(n=co(n))==n?n:0),t!==z&&(t=(t=co(t))==t?t:0),Vt(co(e),t,n)},n.clone=function(e){return Gt(e,X)},n.cloneDeep=function(e){return Gt(e,J|X)},n.cloneDeepWith=function(e,t){return Gt(e,J|X,t="function"==typeof t?t:z)},n.cloneWith=function(e,t){return Gt(e,X,t="function"==typeof t?t:z)},n.conformsTo=function(e,t){return null==t||tn(e,t,_o(t))},n.deburr=Mo,n.defaultTo=function(e,t){return null==e||e!=e?t:e},n.divide=Wu,n.endsWith=function(e,t,n){e=ho(e),t=dr(t);var r=e.length,i=n=n===z?r:Vt(uo(n),0,r);return(n-=t.length)>=0&&e.slice(n,i)==t},n.eq=Vi,n.escape=function(e){return(e=ho(e))&&nt.test(e)?e.replace(et,Mn):e},n.escapeRegExp=function(e){return(e=ho(e))&&dt.test(e)?e.replace(lt,"\\$&"):e},n.every=function(e,t,n){var r=Vs(e)?l:un;return n&&hi(e,t,n)&&(t=z),r(e,oi(t,3))},n.find=Ds,n.findIndex=Yi,n.findKey=function(e,t){return y(e,oi(t,3),vn)},n.findLast=Ys,n.findLastIndex=Si,n.findLastKey=function(e,t){return y(e,oi(t,3),xn)},n.floor=$u,n.forEach=Ri,n.forEachRight=Wi,n.forIn=function(e,t){return null==e?e:Ua(e,oi(t,3),go)},n.forInRight=function(e,t){return null==e?e:Va(e,oi(t,3),go)},n.forOwn=function(e,t){return e&&vn(e,oi(t,3))},n.forOwnRight=function(e,t){return e&&xn(e,oi(t,3))},n.get=po,n.gt=qs,n.gte=Bs,n.has=function(e,t){return null!=e&&li(e,t,Cn)},n.hasIn=mo,n.head=ji,n.identity=xo,n.includes=function(e,t,n,r){e=Ji(e)?e:vo(e),n=n&&!r?uo(n):0;var i=e.length;return n<0&&(n=Ma(i+n,0)),io(e)?n<=i&&e.indexOf(t,n)>-1:!!i&&b(e,t,n)>-1},n.indexOf=function(e,t,n){var r=null==e?0:e.length;if(!r)return-1;var i=null==n?0:uo(n);return i<0&&(i=Ma(r+i,0)),b(e,t,i)},n.inRange=function(e,t,n){return t=so(t),n===z?(n=t,t=0):n=so(n),function(e,t,n){return e>=wa(t,n)&&e=-fe&&e<=fe},n.isSet=Qs,n.isString=io,n.isSymbol=oo,n.isTypedArray=eu,n.isUndefined=function(e){return e===z},n.isWeakMap=function(e){return to(e)&&ns(e)==Ie},n.isWeakSet=function(e){return to(e)&&"[object WeakSet]"==Yn(e)},n.join=function(e,t){return null==e?"":va.call(e,t)},n.kebabCase=bu,n.last=Ei,n.lastIndexOf=function(e,t,n){var r=null==e?0:e.length;if(!r)return-1;var i=r;return n!==z&&(i=(i=uo(n))<0?Ma(r+i,0):wa(i,r-1)),t==t?function(e,t,n){for(var r=n+1;r--;)if(e[r]===t)return r;return r}(e,t,i):v(e,w,i,!0)},n.lowerCase=Mu,n.lowerFirst=wu,n.lt=tu,n.lte=nu,n.max=function(e){return e&&e.length?ln(e,xo,Sn):z},n.maxBy=function(e,t){return e&&e.length?ln(e,oi(t,2),Sn):z},n.mean=function(e){return L(e,xo)},n.meanBy=function(e,t){return L(e,oi(t,2))},n.min=function(e){return e&&e.length?ln(e,xo,$n):z},n.minBy=function(e,t){return e&&e.length?ln(e,oi(t,2),$n):z},n.stubArray=So,n.stubFalse=Co,n.stubObject=function(){return{}},n.stubString=function(){return""},n.stubTrue=function(){return!0},n.multiply=Fu,n.nth=function(e,t){return e&&e.length?Un(e,uo(t)):z},n.noConflict=function(){return sn._===this&&(sn._=Ko),this},n.noop=Do,n.now=Os,n.pad=function(e,t,n){e=ho(e);var r=(t=uo(t))?$(e):0;if(!t||r>=t)return e;var i=(t-r)/2;return zr(ma(i),n)+e+zr(pa(i),n)},n.padEnd=function(e,t,n){e=ho(e);var r=(t=uo(t))?$(e):0;return t&&rt){var r=e;e=t,t=r}if(n||e%1||t%1){var i=ka();return wa(e+i*(t-e+nn("1e-"+((i+"").length-1))),t)}return Kn(e,t)},n.reduce=function(e,t,n){var r=Vs(e)?m:T,i=arguments.length<3;return r(e,oi(t,4),n,i,qa)},n.reduceRight=function(e,t,n){var r=Vs(e)?_:T,i=arguments.length<3;return r(e,oi(t,4),n,i,Ba)},n.repeat=function(e,t,n){return t=(n?hi(e,t,n):t===z)?1:uo(t),Zn(ho(e),t)},n.replace=function(){var e=arguments,t=ho(e[0]);return e.length<3?t:t.replace(e[1],e[2])},n.result=function(e,t,n){var r=-1,i=(t=br(t,e)).length;for(i||(i=1,e=z);++rfe)return[];var n=me,r=wa(e,me);t=oi(t),e-=me;for(var i=Y(r,t);++n=o)return e;var s=n-$(r);if(s<1)return r;var u=a?Mr(a,0,s).join(""):e.slice(0,s);if(i===z)return u+r;if(a&&(s+=u.length-s),Zs(i)){if(e.slice(s).search(i)){var l,d=u;for(i.global||(i=Io(i.source,ho(bt.exec(i))+"g")),i.lastIndex=0;l=i.exec(d);)var c=l.index;u=u.slice(0,c===z?s:c)}}else if(e.indexOf(dr(i),s)!=s){var f=u.lastIndexOf(i);f>-1&&(u=u.slice(0,f))}return u+r},n.unescape=function(e){return(e=ho(e))&&tt.test(e)?e.replace(Qe,wn):e},n.uniqueId=function(e){var t=++Vo;return ho(e)+t},n.upperCase=ku,n.upperFirst=Tu,n.each=Ri,n.eachRight=Wi,n.first=ji,To(n,(Rs={},vn(n,function(e,t){Uo.call(n.prototype,t)||(Rs[t]=e)}),Rs),{chain:!1}),n.VERSION="4.17.11",s(["bind","bindKey","curry","curryRight","partial","partialRight"],function(e){n[e].placeholder=n}),s(["drop","take"],function(e,t){k.prototype[e]=function(n){n=n===z?1:Ma(uo(n),0);var r=this.__filtered__&&!t?new k(this):this.clone();return r.__filtered__?r.__takeCount__=wa(n,r.__takeCount__):r.__views__.push({size:wa(n,me),type:e+(r.__dir__<0?"Right":"")}),r},k.prototype[e+"Right"]=function(t){return this.reverse()[e](t).reverse()}}),s(["filter","map","takeWhile"],function(e,t){var n=t+1,r=1==n||3==n;k.prototype[e]=function(e){var t=this.clone();return t.__iteratees__.push({iteratee:oi(e,3),type:n}),t.__filtered__=t.__filtered__||r,t}}),s(["head","last"],function(e,t){var n="take"+(t?"Right":"");k.prototype[e]=function(){return this[n](1).value()[0]}}),s(["initial","tail"],function(e,t){var n="drop"+(t?"":"Right");k.prototype[e]=function(){return this.__filtered__?new k(this):this[n](1)}}),k.prototype.compact=function(){return this.filter(xo)},k.prototype.find=function(e){return this.filter(e).head()},k.prototype.findLast=function(e){return this.reverse().find(e)},k.prototype.invokeMap=Qn(function(e,t){return"function"==typeof e?new k(this):this.map(function(n){return Hn(n,e,t)})}),k.prototype.reject=function(e){return this.filter(Ui(oi(e)))},k.prototype.slice=function(e,t){e=uo(e);var n=this;return n.__filtered__&&(e>0||t<0)?new k(n):(e<0?n=n.takeRight(-e):e&&(n=n.drop(e)),t!==z&&(n=(t=uo(t))<0?n.dropRight(-t):n.take(t-e)),n)},k.prototype.takeRightWhile=function(e){return this.reverse().takeWhile(e).reverse()},k.prototype.toArray=function(){return this.take(me)},vn(k.prototype,function(e,t){var r=/^(?:filter|find|map|reject)|While$/.test(t),o=/^(?:head|last)$/.test(t),a=n[o?"take"+("last"==t?"Right":""):t],s=o||/^find/.test(t);a&&(n.prototype[t]=function(){var t=this.__wrapped__,u=o?[1]:arguments,l=t instanceof k,d=u[0],c=l||Vs(t),f=function(e){var t=a.apply(n,p([e],u));return o&&h?t[0]:t};c&&r&&"function"==typeof d&&1!=d.length&&(l=c=!1);var h=this.__chain__,m=!!this.__actions__.length,_=s&&!h,g=l&&!m;if(!s&&c){t=g?t:new k(this);var y=e.apply(t,u);return y.__actions__.push({func:Ii,args:[f],thisArg:z}),new i(y,h)}return _&&g?e.apply(this,u):(y=this.thru(f),_?o?y.value()[0]:y.value():y)})}),s(["pop","push","shift","sort","splice","unshift"],function(e){var t=$o[e],r=/^(?:push|sort|unshift)$/.test(e)?"tap":"thru",i=/^(?:pop|shift)$/.test(e);n.prototype[e]=function(){var e=arguments;if(i&&!this.__chain__){var n=this.value();return t.apply(Vs(n)?n:[],e)}return this[r](function(n){return t.apply(Vs(n)?n:[],e)})}}),vn(k.prototype,function(e,t){var r=n[t];if(r){var i=r.name+"";(Oa[i]||(Oa[i]=[])).push({name:t,func:r})}}),Oa[Rr(z,ee).name]=[{name:"wrapper",func:z}],k.prototype.clone=function(){var e=new k(this.__wrapped__);return e.__actions__=Yr(this.__actions__),e.__dir__=this.__dir__,e.__filtered__=this.__filtered__,e.__iteratees__=Yr(this.__iteratees__),e.__takeCount__=this.__takeCount__,e.__views__=Yr(this.__views__),e},k.prototype.reverse=function(){if(this.__filtered__){var e=new k(this);e.__dir__=-1,e.__filtered__=!0}else(e=this.clone()).__dir__*=-1;return e},k.prototype.value=function(){var e=this.__wrapped__.value(),t=this.__dir__,n=Vs(e),r=t<0,i=n?e.length:0,o=function(e,t,n){for(var r=-1,i=n.length;++r=this.__values__.length;return{done:e,value:e?z:this.__values__[this.__index__++]}},n.prototype.plant=function(e){for(var t,n=this;n instanceof r;){var i=Di(n);i.__index__=0,i.__values__=z,t?o.__wrapped__=i:t=i;var o=i;n=n.__wrapped__}return o.__wrapped__=e,t},n.prototype.reverse=function(){var e=this.__wrapped__;if(e instanceof k){var t=e;return this.__actions__.length&&(t=new k(this)),(t=t.reverse()).__actions__.push({func:Ii,args:[Oi],thisArg:z}),new i(t,this.__chain__)}return this.thru(Oi)},n.prototype.toJSON=n.prototype.valueOf=n.prototype.value=function(){return mr(this.__wrapped__,this.__actions__)},n.prototype.first=n.prototype.head,ua&&(n.prototype[ua]=function(){return this}),n}();sn._=Ln,(i=function(){return Ln}.call(t,n,t,r))===z||(r.exports=i)}).call(this)}).call(t,n(9),n(18)(e))},,function(e,t,n){e.exports=n(171)},function(e,t,n){"use strict";e.exports=function(e,t){return function(){for(var n=new Array(arguments.length),r=0;r "+t+") {","args = new Array(arguments.length + 1);","for (var i = 0; i < arguments.length; i++) {","args[i] = arguments[i];","}","}","return new Promise(function (rs, rj) {","var cb = "+o+";","var res;","switch (argLength) {",n.concat(["extra"]).map(function(e,t){return"case "+t+":res = fn.call("+["self"].concat(n.slice(0,t)).concat("cb").join(",")+");break;"}).join(""),"default:","args[argLength] = cb;","res = fn.apply(self, args);","}","if (res &&",'(typeof res === "object" || typeof res === "function") &&','typeof res.then === "function"',") {rs(res);}","});","};"].join("");return Function(["Promise","fn"],a)(r,e)}(e)};var o="function (err, res) {if (err) { rj(err); } else { rs(res); }}";r.nodeify=function(e){return function(){var t=Array.prototype.slice.call(arguments),n="function"==typeof t[t.length-1]?t.pop():null,o=this;try{return e.apply(this,arguments).nodeify(n,o)}catch(e){if(null===n||void 0===n)return new r(function(t,n){n(e)});i(function(){n.call(o,e)})}}},r.prototype.nodeify=function(e,t){if("function"!=typeof e)return this;this.then(function(n){i(function(){e.call(t,null,n)})},function(n){i(function(){e.call(t,n)})})}},function(e,t,n){"use strict";function r(e){var t;(t=a.length?a.pop():new i).task=e,o(t)}function i(){this.task=null}var o=n(16),a=[],s=[],u=o.makeRequestCallFromTimer(function(){if(s.length)throw s.shift()});e.exports=r,i.prototype.call=function(){try{this.task.call()}catch(e){r.onerror?r.onerror(e):(s.push(e),u())}finally{this.task=null,a[a.length]=this}}},function(e,t,n){"use strict";var r=n(7);e.exports=r,r.enableSynchronous=function(){r.prototype.isPending=function(){return 0==this.getState()},r.prototype.isFulfilled=function(){return 1==this.getState()},r.prototype.isRejected=function(){return 2==this.getState()},r.prototype.getValue=function(){if(3===this._65)return this._55.getValue();if(!this.isFulfilled())throw new Error("Cannot get a value of an unfulfilled promise.");return this._55},r.prototype.getReason=function(){if(3===this._65)return this._55.getReason();if(!this.isRejected())throw new Error("Cannot get a rejection reason of a non-rejected promise.");return this._55},r.prototype.getState=function(){return 3===this._65?this._55.getState():-1===this._65||-2===this._65?0:this._65}},r.disableSynchronous=function(){r.prototype.isPending=void 0,r.prototype.isFulfilled=void 0,r.prototype.isRejected=void 0,r.prototype.getValue=void 0,r.prototype.getReason=void 0,r.prototype.getState=void 0}},function(e,t,n){window._=n(17);try{window.$=window.jQuery=n(169),n(170)}catch(e){}window.axios=n(19),window.axios.defaults.headers.common["X-Requested-With"]="XMLHttpRequest";var r=document.head.querySelector('meta[name="token"]');r?window.axios.defaults.headers.common["X-CSRF-TOKEN"]=r.content:console.error("CSRF token not found: https://laravel.com/docs/csrf#csrf-x-csrf-token")},function(e,t,n){var r,i,o;i="undefined"!=typeof window?window:this,o=function(n,i){function o(e){var t=!!e&&"length"in e&&e.length,n=te.type(e);return"function"!==n&&!te.isWindow(e)&&("array"===n||0===t||"number"==typeof t&&t>0&&t-1 in e)}function a(e,t,n){if(te.isFunction(t))return te.grep(e,function(e,r){return!!t.call(e,r,e)!==n});if(t.nodeType)return te.grep(e,function(e){return e===t!==n});if("string"==typeof t){if(ce.test(t))return te.filter(t,e,n);t=te.filter(t,e)}return te.grep(e,function(e){return X.call(t,e)>-1!==n})}function s(e,t){for(;(e=e[t])&&1!==e.nodeType;);return e}function u(){U.removeEventListener("DOMContentLoaded",u),n.removeEventListener("load",u),te.ready()}function l(){this.expando=te.expando+l.uid++}function d(e,t,n){var r;if(void 0===n&&1===e.nodeType)if(r="data-"+t.replace(Le,"-$&").toLowerCase(),"string"==typeof(n=e.getAttribute(r))){try{n="true"===n||"false"!==n&&("null"===n?null:+n+""===n?+n:we.test(n)?te.parseJSON(n):n)}catch(e){}Me.set(e,t,n)}else n=void 0;return n}function c(e,t,n,r){var i,o=1,a=20,s=r?function(){return r.cur()}:function(){return te.css(e,t,"")},u=s(),l=n&&n[3]||(te.cssNumber[t]?"":"px"),d=(te.cssNumber[t]||"px"!==l&&+u)&&ke.exec(te.css(e,t));if(d&&d[3]!==l){l=l||d[3],n=n||[],d=+u||1;do{d/=o=o||".5",te.style(e,t,d+l)}while(o!==(o=s()/u)&&1!==o&&--a)}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 f(e,t){var n=void 0!==e.getElementsByTagName?e.getElementsByTagName(t||"*"):void 0!==e.querySelectorAll?e.querySelectorAll(t||"*"):[];return void 0===t||t&&te.nodeName(e,t)?te.merge([e],n):n}function h(e,t){for(var n=0,r=e.length;n-1)i&&i.push(o);else if(l=te.contains(o.ownerDocument,o),a=f(c.appendChild(o),"script"),l&&h(a),n)for(d=0;o=a[d++];)Ce.test(o.type||"")&&n.push(o);return c}function m(){return!0}function _(){return!1}function g(){try{return U.activeElement}catch(e){}}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=_;else if(!i)return e;return 1===o&&(a=i,(i=function(e){return te().off(e),a.apply(this,arguments)}).guid=a.guid||(a.guid=te.guid++)),e.each(function(){te.event.add(this,t,i,r,n)})}function v(e,t){return te.nodeName(e,"table")&&te.nodeName(11!==t.nodeType?t:t.firstChild,"tr")?e.getElementsByTagName("tbody")[0]||e.appendChild(e.ownerDocument.createElement("tbody")):e}function b(e){return e.type=(null!==e.getAttribute("type"))+"/"+e.type,e}function M(e){var t=$e.exec(e.type);return t?e.type=t[1]:e.removeAttribute("type"),e}function w(e,t){var n,r,i,o,a,s,u,l;if(1===t.nodeType){if(be.hasData(e)&&(o=be.access(e),a=be.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 m&&!ee.checkClone&&We.test(m))return e.each(function(i){var o=e.eq(i);_&&(t[0]=m.call(this,i,o.html())),L(o,t,n,r)});if(c&&(o=(i=p(t,e[0].ownerDocument,!1,e,r)).firstChild,1===i.childNodes.length&&(i=o),o||r)){for(s=(a=te.map(f(i,"script"),b)).length;d")).appendTo(t.documentElement))[0].contentDocument).write(),t.close(),n=k(e,t),ze.detach()),qe[e]=n),n}function D(e,t,n){var r,i,o,a,s=e.style;return""!==(a=(n=n||Ve(e))?n.getPropertyValue(t)||n[t]:void 0)&&void 0!==a||te.contains(e.ownerDocument,e)||(a=te.style(e,t)),n&&!ee.pixelMarginRight()&&Ue.test(a)&&Be.test(t)&&(r=s.width,i=s.minWidth,o=s.maxWidth,s.minWidth=s.maxWidth=s.width=a,a=n.width,s.width=r,s.minWidth=i,s.maxWidth=o),void 0!==a?a+"":a}function Y(e,t){return{get:function(){if(!e())return(this.get=t).apply(this,arguments);delete this.get}}}function S(e){if(e in et)return e;for(var t=e[0].toUpperCase()+e.slice(1),n=Qe.length;n--;)if((e=Qe[n]+t)in et)return e}function C(e,t,n){var r=ke.exec(t);return r?Math.max(0,r[2]-(n||0))+(r[3]||"px"):t}function j(e,t,n,r,i){for(var o=n===(r?"border":"content")?4:"width"===t?1:0,a=0;o<4;o+=2)"margin"===n&&(a+=te.css(e,n+Te[o],!0,i)),r?("content"===n&&(a-=te.css(e,"padding"+Te[o],!0,i)),"margin"!==n&&(a-=te.css(e,"border"+Te[o]+"Width",!0,i))):(a+=te.css(e,"padding"+Te[o],!0,i),"padding"!==n&&(a+=te.css(e,"border"+Te[o]+"Width",!0,i)));return a}function E(e,t,n){var r=!0,i="width"===t?e.offsetWidth:e.offsetHeight,o=Ve(e),a="border-box"===te.css(e,"boxSizing",!1,o);if(i<=0||null==i){if(((i=D(e,t,o))<0||null==i)&&(i=e.style[t]),Ue.test(i))return i;r=a&&(ee.boxSizingReliable()||i===e.style[t]),i=parseFloat(i)||0}return i+j(e,t,n||(a?"border":"content"),r,o)+"px"}function H(e,t){for(var n,r,i,o=[],a=0,s=e.length;a=0&&n=0},isPlainObject:function(e){var t;if("object"!==te.type(e)||e.nodeType||te.isWindow(e))return!1;if(e.constructor&&!Q.call(e,"constructor")&&!Q.call(e.constructor.prototype||{},"isPrototypeOf"))return!1;for(t in e); +n.isElement=function(e){return to(e)&&1===e.nodeType&&!ro(e)},n.isEmpty=function(e){if(null==e)return!0;if(Ji(e)&&(Vs(e)||"string"==typeof e||"function"==typeof e.splice||Gs(e)||eu(e)||Us(e)))return!e.length;var t=ns(e);if(t==Ye||t==Oe)return!e.size;if(_i(e))return!Rn(e).length;for(var n in e)if(Uo.call(e,n))return!1;return!0},n.isEqual=function(e,t){return An(e,t)},n.isEqualWith=function(e,t,n){var r=(n="function"==typeof n?n:z)?n(e,t):z;return r===z?An(e,t,z,n):!!r},n.isError=Xi,n.isFinite=function(e){return"number"==typeof e&&ya(e)},n.isFunction=Ki,n.isInteger=Zi,n.isLength=Qi,n.isMap=Ks,n.isMatch=function(e,t){return e===t||Pn(e,t,si(t))},n.isMatchWith=function(e,t,n){return n="function"==typeof n?n:z,Pn(e,t,si(t),n)},n.isNaN=function(e){return no(e)&&e!=+e},n.isNative=function(e){if(rs(e))throw new Oo("Unsupported core-js use. Try https://npms.io/search?q=ponyfill.");return Nn(e)},n.isNil=function(e){return null==e},n.isNull=function(e){return null===e},n.isNumber=no,n.isObject=eo,n.isObjectLike=to,n.isPlainObject=ro,n.isRegExp=Zs,n.isSafeInteger=function(e){return Zi(e)&&e>=-fe&&e<=fe},n.isSet=Qs,n.isString=io,n.isSymbol=oo,n.isTypedArray=eu,n.isUndefined=function(e){return e===z},n.isWeakMap=function(e){return to(e)&&ns(e)==Ie},n.isWeakSet=function(e){return to(e)&&"[object WeakSet]"==Yn(e)},n.join=function(e,t){return null==e?"":va.call(e,t)},n.kebabCase=bu,n.last=Ei,n.lastIndexOf=function(e,t,n){var r=null==e?0:e.length;if(!r)return-1;var i=r;return n!==z&&(i=(i=uo(n))<0?Ma(r+i,0):wa(i,r-1)),t==t?function(e,t,n){for(var r=n+1;r--;)if(e[r]===t)return r;return r}(e,t,i):v(e,w,i,!0)},n.lowerCase=Mu,n.lowerFirst=wu,n.lt=tu,n.lte=nu,n.max=function(e){return e&&e.length?ln(e,xo,Sn):z},n.maxBy=function(e,t){return e&&e.length?ln(e,oi(t,2),Sn):z},n.mean=function(e){return L(e,xo)},n.meanBy=function(e,t){return L(e,oi(t,2))},n.min=function(e){return e&&e.length?ln(e,xo,$n):z},n.minBy=function(e,t){return e&&e.length?ln(e,oi(t,2),$n):z},n.stubArray=So,n.stubFalse=Co,n.stubObject=function(){return{}},n.stubString=function(){return""},n.stubTrue=function(){return!0},n.multiply=Fu,n.nth=function(e,t){return e&&e.length?Un(e,uo(t)):z},n.noConflict=function(){return sn._===this&&(sn._=Ko),this},n.noop=Do,n.now=Os,n.pad=function(e,t,n){e=ho(e);var r=(t=uo(t))?$(e):0;if(!t||r>=t)return e;var i=(t-r)/2;return zr(ma(i),n)+e+zr(pa(i),n)},n.padEnd=function(e,t,n){e=ho(e);var r=(t=uo(t))?$(e):0;return t&&rt){var r=e;e=t,t=r}if(n||e%1||t%1){var i=ka();return wa(e+i*(t-e+nn("1e-"+((i+"").length-1))),t)}return Kn(e,t)},n.reduce=function(e,t,n){var r=Vs(e)?m:T,i=arguments.length<3;return r(e,oi(t,4),n,i,qa)},n.reduceRight=function(e,t,n){var r=Vs(e)?_:T,i=arguments.length<3;return r(e,oi(t,4),n,i,Ba)},n.repeat=function(e,t,n){return t=(n?hi(e,t,n):t===z)?1:uo(t),Zn(ho(e),t)},n.replace=function(){var e=arguments,t=ho(e[0]);return e.length<3?t:t.replace(e[1],e[2])},n.result=function(e,t,n){var r=-1,i=(t=br(t,e)).length;for(i||(i=1,e=z);++rfe)return[];var n=me,r=wa(e,me);t=oi(t),e-=me;for(var i=Y(r,t);++n=o)return e;var s=n-$(r);if(s<1)return r;var u=a?Mr(a,0,s).join(""):e.slice(0,s);if(i===z)return u+r;if(a&&(s+=u.length-s),Zs(i)){if(e.slice(s).search(i)){var l,d=u;for(i.global||(i=Io(i.source,ho(bt.exec(i))+"g")),i.lastIndex=0;l=i.exec(d);)var c=l.index;u=u.slice(0,c===z?s:c)}}else if(e.indexOf(dr(i),s)!=s){var f=u.lastIndexOf(i);f>-1&&(u=u.slice(0,f))}return u+r},n.unescape=function(e){return(e=ho(e))&&tt.test(e)?e.replace(Qe,wn):e},n.uniqueId=function(e){var t=++Vo;return ho(e)+t},n.upperCase=ku,n.upperFirst=Tu,n.each=Ri,n.eachRight=Wi,n.first=ji,To(n,(Rs={},vn(n,function(e,t){Uo.call(n.prototype,t)||(Rs[t]=e)}),Rs),{chain:!1}),n.VERSION="4.17.11",s(["bind","bindKey","curry","curryRight","partial","partialRight"],function(e){n[e].placeholder=n}),s(["drop","take"],function(e,t){k.prototype[e]=function(n){n=n===z?1:Ma(uo(n),0);var r=this.__filtered__&&!t?new k(this):this.clone();return r.__filtered__?r.__takeCount__=wa(n,r.__takeCount__):r.__views__.push({size:wa(n,me),type:e+(r.__dir__<0?"Right":"")}),r},k.prototype[e+"Right"]=function(t){return this.reverse()[e](t).reverse()}}),s(["filter","map","takeWhile"],function(e,t){var n=t+1,r=1==n||3==n;k.prototype[e]=function(e){var t=this.clone();return t.__iteratees__.push({iteratee:oi(e,3),type:n}),t.__filtered__=t.__filtered__||r,t}}),s(["head","last"],function(e,t){var n="take"+(t?"Right":"");k.prototype[e]=function(){return this[n](1).value()[0]}}),s(["initial","tail"],function(e,t){var n="drop"+(t?"":"Right");k.prototype[e]=function(){return this.__filtered__?new k(this):this[n](1)}}),k.prototype.compact=function(){return this.filter(xo)},k.prototype.find=function(e){return this.filter(e).head()},k.prototype.findLast=function(e){return this.reverse().find(e)},k.prototype.invokeMap=Qn(function(e,t){return"function"==typeof e?new k(this):this.map(function(n){return Hn(n,e,t)})}),k.prototype.reject=function(e){return this.filter(Ui(oi(e)))},k.prototype.slice=function(e,t){e=uo(e);var n=this;return n.__filtered__&&(e>0||t<0)?new k(n):(e<0?n=n.takeRight(-e):e&&(n=n.drop(e)),t!==z&&(n=(t=uo(t))<0?n.dropRight(-t):n.take(t-e)),n)},k.prototype.takeRightWhile=function(e){return this.reverse().takeWhile(e).reverse()},k.prototype.toArray=function(){return this.take(me)},vn(k.prototype,function(e,t){var r=/^(?:filter|find|map|reject)|While$/.test(t),o=/^(?:head|last)$/.test(t),a=n[o?"take"+("last"==t?"Right":""):t],s=o||/^find/.test(t);a&&(n.prototype[t]=function(){var t=this.__wrapped__,u=o?[1]:arguments,l=t instanceof k,d=u[0],c=l||Vs(t),f=function(e){var t=a.apply(n,p([e],u));return o&&h?t[0]:t};c&&r&&"function"==typeof d&&1!=d.length&&(l=c=!1);var h=this.__chain__,m=!!this.__actions__.length,_=s&&!h,g=l&&!m;if(!s&&c){t=g?t:new k(this);var y=e.apply(t,u);return y.__actions__.push({func:Ii,args:[f],thisArg:z}),new i(y,h)}return _&&g?e.apply(this,u):(y=this.thru(f),_?o?y.value()[0]:y.value():y)})}),s(["pop","push","shift","sort","splice","unshift"],function(e){var t=$o[e],r=/^(?:push|sort|unshift)$/.test(e)?"tap":"thru",i=/^(?:pop|shift)$/.test(e);n.prototype[e]=function(){var e=arguments;if(i&&!this.__chain__){var n=this.value();return t.apply(Vs(n)?n:[],e)}return this[r](function(n){return t.apply(Vs(n)?n:[],e)})}}),vn(k.prototype,function(e,t){var r=n[t];if(r){var i=r.name+"";(Oa[i]||(Oa[i]=[])).push({name:t,func:r})}}),Oa[Rr(z,ee).name]=[{name:"wrapper",func:z}],k.prototype.clone=function(){var e=new k(this.__wrapped__);return e.__actions__=Yr(this.__actions__),e.__dir__=this.__dir__,e.__filtered__=this.__filtered__,e.__iteratees__=Yr(this.__iteratees__),e.__takeCount__=this.__takeCount__,e.__views__=Yr(this.__views__),e},k.prototype.reverse=function(){if(this.__filtered__){var e=new k(this);e.__dir__=-1,e.__filtered__=!0}else(e=this.clone()).__dir__*=-1;return e},k.prototype.value=function(){var e=this.__wrapped__.value(),t=this.__dir__,n=Vs(e),r=t<0,i=n?e.length:0,o=function(e,t,n){for(var r=-1,i=n.length;++r=this.__values__.length;return{done:e,value:e?z:this.__values__[this.__index__++]}},n.prototype.plant=function(e){for(var t,n=this;n instanceof r;){var i=Di(n);i.__index__=0,i.__values__=z,t?o.__wrapped__=i:t=i;var o=i;n=n.__wrapped__}return o.__wrapped__=e,t},n.prototype.reverse=function(){var e=this.__wrapped__;if(e instanceof k){var t=e;return this.__actions__.length&&(t=new k(this)),(t=t.reverse()).__actions__.push({func:Ii,args:[Oi],thisArg:z}),new i(t,this.__chain__)}return this.thru(Oi)},n.prototype.toJSON=n.prototype.valueOf=n.prototype.value=function(){return mr(this.__wrapped__,this.__actions__)},n.prototype.first=n.prototype.head,ua&&(n.prototype[ua]=function(){return this}),n}();sn._=Ln,(i=function(){return Ln}.call(t,n,t,r))===z||(r.exports=i)}).call(this)}).call(t,n(9),n(18)(e))},,function(e,t,n){e.exports=n(171)},function(e,t,n){"use strict";e.exports=function(e,t){return function(){for(var n=new Array(arguments.length),r=0;r "+t+") {","args = new Array(arguments.length + 1);","for (var i = 0; i < arguments.length; i++) {","args[i] = arguments[i];","}","}","return new Promise(function (rs, rj) {","var cb = "+o+";","var res;","switch (argLength) {",n.concat(["extra"]).map(function(e,t){return"case "+t+":res = fn.call("+["self"].concat(n.slice(0,t)).concat("cb").join(",")+");break;"}).join(""),"default:","args[argLength] = cb;","res = fn.apply(self, args);","}","if (res &&",'(typeof res === "object" || typeof res === "function") &&','typeof res.then === "function"',") {rs(res);}","});","};"].join("");return Function(["Promise","fn"],a)(r,e)}(e)};var o="function (err, res) {if (err) { rj(err); } else { rs(res); }}";r.nodeify=function(e){return function(){var t=Array.prototype.slice.call(arguments),n="function"==typeof t[t.length-1]?t.pop():null,o=this;try{return e.apply(this,arguments).nodeify(n,o)}catch(e){if(null===n||void 0===n)return new r(function(t,n){n(e)});i(function(){n.call(o,e)})}}},r.prototype.nodeify=function(e,t){if("function"!=typeof e)return this;this.then(function(n){i(function(){e.call(t,null,n)})},function(n){i(function(){e.call(t,n)})})}},function(e,t,n){"use strict";function r(e){var t;(t=a.length?a.pop():new i).task=e,o(t)}function i(){this.task=null}var o=n(16),a=[],s=[],u=o.makeRequestCallFromTimer(function(){if(s.length)throw s.shift()});e.exports=r,i.prototype.call=function(){try{this.task.call()}catch(e){r.onerror?r.onerror(e):(s.push(e),u())}finally{this.task=null,a[a.length]=this}}},function(e,t,n){"use strict";var r=n(8);e.exports=r,r.enableSynchronous=function(){r.prototype.isPending=function(){return 0==this.getState()},r.prototype.isFulfilled=function(){return 1==this.getState()},r.prototype.isRejected=function(){return 2==this.getState()},r.prototype.getValue=function(){if(3===this._65)return this._55.getValue();if(!this.isFulfilled())throw new Error("Cannot get a value of an unfulfilled promise.");return this._55},r.prototype.getReason=function(){if(3===this._65)return this._55.getReason();if(!this.isRejected())throw new Error("Cannot get a rejection reason of a non-rejected promise.");return this._55},r.prototype.getState=function(){return 3===this._65?this._55.getState():-1===this._65||-2===this._65?0:this._65}},r.disableSynchronous=function(){r.prototype.isPending=void 0,r.prototype.isFulfilled=void 0,r.prototype.isRejected=void 0,r.prototype.getValue=void 0,r.prototype.getReason=void 0,r.prototype.getState=void 0}},function(e,t,n){window._=n(17);try{window.$=window.jQuery=n(169),n(170)}catch(e){}window.axios=n(19),window.axios.defaults.headers.common["X-Requested-With"]="XMLHttpRequest";var r=document.head.querySelector('meta[name="token"]');r?window.axios.defaults.headers.common["X-CSRF-TOKEN"]=r.content:console.error("CSRF token not found: https://laravel.com/docs/csrf#csrf-x-csrf-token")},function(e,t,n){var r,i,o;i="undefined"!=typeof window?window:this,o=function(n,i){function o(e){var t=!!e&&"length"in e&&e.length,n=te.type(e);return"function"!==n&&!te.isWindow(e)&&("array"===n||0===t||"number"==typeof t&&t>0&&t-1 in e)}function a(e,t,n){if(te.isFunction(t))return te.grep(e,function(e,r){return!!t.call(e,r,e)!==n});if(t.nodeType)return te.grep(e,function(e){return e===t!==n});if("string"==typeof t){if(ce.test(t))return te.filter(t,e,n);t=te.filter(t,e)}return te.grep(e,function(e){return X.call(t,e)>-1!==n})}function s(e,t){for(;(e=e[t])&&1!==e.nodeType;);return e}function u(){U.removeEventListener("DOMContentLoaded",u),n.removeEventListener("load",u),te.ready()}function l(){this.expando=te.expando+l.uid++}function d(e,t,n){var r;if(void 0===n&&1===e.nodeType)if(r="data-"+t.replace(Le,"-$&").toLowerCase(),"string"==typeof(n=e.getAttribute(r))){try{n="true"===n||"false"!==n&&("null"===n?null:+n+""===n?+n:we.test(n)?te.parseJSON(n):n)}catch(e){}Me.set(e,t,n)}else n=void 0;return n}function c(e,t,n,r){var i,o=1,a=20,s=r?function(){return r.cur()}:function(){return te.css(e,t,"")},u=s(),l=n&&n[3]||(te.cssNumber[t]?"":"px"),d=(te.cssNumber[t]||"px"!==l&&+u)&&ke.exec(te.css(e,t));if(d&&d[3]!==l){l=l||d[3],n=n||[],d=+u||1;do{d/=o=o||".5",te.style(e,t,d+l)}while(o!==(o=s()/u)&&1!==o&&--a)}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 f(e,t){var n=void 0!==e.getElementsByTagName?e.getElementsByTagName(t||"*"):void 0!==e.querySelectorAll?e.querySelectorAll(t||"*"):[];return void 0===t||t&&te.nodeName(e,t)?te.merge([e],n):n}function h(e,t){for(var n=0,r=e.length;n-1)i&&i.push(o);else if(l=te.contains(o.ownerDocument,o),a=f(c.appendChild(o),"script"),l&&h(a),n)for(d=0;o=a[d++];)Ce.test(o.type||"")&&n.push(o);return c}function m(){return!0}function _(){return!1}function g(){try{return U.activeElement}catch(e){}}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=_;else if(!i)return e;return 1===o&&(a=i,(i=function(e){return te().off(e),a.apply(this,arguments)}).guid=a.guid||(a.guid=te.guid++)),e.each(function(){te.event.add(this,t,i,r,n)})}function v(e,t){return te.nodeName(e,"table")&&te.nodeName(11!==t.nodeType?t:t.firstChild,"tr")?e.getElementsByTagName("tbody")[0]||e.appendChild(e.ownerDocument.createElement("tbody")):e}function b(e){return e.type=(null!==e.getAttribute("type"))+"/"+e.type,e}function M(e){var t=$e.exec(e.type);return t?e.type=t[1]:e.removeAttribute("type"),e}function w(e,t){var n,r,i,o,a,s,u,l;if(1===t.nodeType){if(be.hasData(e)&&(o=be.access(e),a=be.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 m&&!ee.checkClone&&We.test(m))return e.each(function(i){var o=e.eq(i);_&&(t[0]=m.call(this,i,o.html())),L(o,t,n,r)});if(c&&(o=(i=p(t,e[0].ownerDocument,!1,e,r)).firstChild,1===i.childNodes.length&&(i=o),o||r)){for(s=(a=te.map(f(i,"script"),b)).length;d")).appendTo(t.documentElement))[0].contentDocument).write(),t.close(),n=k(e,t),ze.detach()),qe[e]=n),n}function D(e,t,n){var r,i,o,a,s=e.style;return""!==(a=(n=n||Ve(e))?n.getPropertyValue(t)||n[t]:void 0)&&void 0!==a||te.contains(e.ownerDocument,e)||(a=te.style(e,t)),n&&!ee.pixelMarginRight()&&Ue.test(a)&&Be.test(t)&&(r=s.width,i=s.minWidth,o=s.maxWidth,s.minWidth=s.maxWidth=s.width=a,a=n.width,s.width=r,s.minWidth=i,s.maxWidth=o),void 0!==a?a+"":a}function Y(e,t){return{get:function(){if(!e())return(this.get=t).apply(this,arguments);delete this.get}}}function S(e){if(e in et)return e;for(var t=e[0].toUpperCase()+e.slice(1),n=Qe.length;n--;)if((e=Qe[n]+t)in et)return e}function C(e,t,n){var r=ke.exec(t);return r?Math.max(0,r[2]-(n||0))+(r[3]||"px"):t}function j(e,t,n,r,i){for(var o=n===(r?"border":"content")?4:"width"===t?1:0,a=0;o<4;o+=2)"margin"===n&&(a+=te.css(e,n+Te[o],!0,i)),r?("content"===n&&(a-=te.css(e,"padding"+Te[o],!0,i)),"margin"!==n&&(a-=te.css(e,"border"+Te[o]+"Width",!0,i))):(a+=te.css(e,"padding"+Te[o],!0,i),"padding"!==n&&(a+=te.css(e,"border"+Te[o]+"Width",!0,i)));return a}function E(e,t,n){var r=!0,i="width"===t?e.offsetWidth:e.offsetHeight,o=Ve(e),a="border-box"===te.css(e,"boxSizing",!1,o);if(i<=0||null==i){if(((i=D(e,t,o))<0||null==i)&&(i=e.style[t]),Ue.test(i))return i;r=a&&(ee.boxSizingReliable()||i===e.style[t]),i=parseFloat(i)||0}return i+j(e,t,n||(a?"border":"content"),r,o)+"px"}function H(e,t){for(var n,r,i,o=[],a=0,s=e.length;a=0&&n=0},isPlainObject:function(e){var t;if("object"!==te.type(e)||e.nodeType||te.isWindow(e))return!1;if(e.constructor&&!Q.call(e,"constructor")&&!Q.call(e.constructor.prototype||{},"isPrototypeOf"))return!1;for(t in e); return void 0===t||Q.call(e,t)},isEmptyObject:function(e){var t;for(t in e)return!1;return!0},type:function(e){return null==e?e+"":"object"==typeof e||"function"==typeof e?K[Z.call(e)]||"object":typeof e},globalEval:function(e){var t,n=eval;(e=te.trim(e))&&(1===e.indexOf("use strict")?((t=U.createElement("script")).text=e,U.head.appendChild(t).parentNode.removeChild(t)):n(e))},camelCase:function(e){return e.replace(re,"ms-").replace(ie,oe)},nodeName:function(e,t){return e.nodeName&&e.nodeName.toLowerCase()===t.toLowerCase()},each:function(e,t){var n,r=0;if(o(e))for(n=e.length;ry.cacheLength&&delete t[e.shift()],t[n+" "]=r}}function r(e){return e[A]=!0,e}function i(e){var t=Y.createElement("div");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--;)y.attrHandle[n[r]]=t}function a(e,t){var n=t&&e,r=n&&1===e.nodeType&&1===t.nodeType&&(~t.sourceIndex||z)-(~e.sourceIndex||z);if(r)return r;if(n)for(;n=n.nextSibling;)if(n===t)return-1;return e?1:-1}function s(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 u(e){return e&&void 0!==e.getElementsByTagName&&e}function l(){}function d(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 h(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=h(v===s?v.splice(_,v.length):v),a?a(null,s,v,l):J.apply(s,v)})}function m(e){for(var t,n,r,i=e.length,o=y.relative[e[0].type],a=o||y.relative[" "],s=o?1:0,u=c(function(e){return e===t},a,!0),l=c(function(e){return X(t,e)>-1},a,!0),h=[function(e,n,r){var i=!o&&(r||n!==x)||((t=n).nodeType?u(e,n,r):l(e,n,r));return t=null,i}];s1&&f(h),s>1&&d(e.slice(0,s-1).concat({value:" "===e[s-2].type?"*":""})).replace(re,"$1"),n,s+~]|"+Z+")"+Z+"*"),ae=new RegExp("="+Z+"*([^\\]'\"]*?)"+Z+"*\\]","g"),se=new RegExp(te),ue=new RegExp("^"+Q+"$"),le={ID:new RegExp("^#("+Q+")"),CLASS:new RegExp("^\\.("+Q+")"),TAG:new RegExp("^("+Q+"|[*])"),ATTR:new RegExp("^"+ee),PSEUDO:new RegExp("^"+te),CHILD:new RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+Z+"*(even|odd|(([+-]|)(\\d*)n|)"+Z+"*(?:([+-]|)"+Z+"*(\\d+)|))"+Z+"*\\)|)","i"),bool:new RegExp("^(?:"+K+")$","i"),needsContext:new RegExp("^"+Z+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+Z+"*((?:-\\d)?\\d*)"+Z+"*\\)|)(?=[^-]|$)","i")},de=/^(?:input|select|textarea|button)$/i,ce=/^h\d$/i,fe=/^[^{]+\{\s*\[native \w/,he=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,pe=/[+~]/,me=/'|\\/g,_e=new RegExp("\\\\([\\da-f]{1,6}"+Z+"?|("+Z+")|.)","ig"),ge=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)},ye=function(){D()};try{J.apply(B=G.call(P.childNodes),P.childNodes),B[P.childNodes.length].nodeType}catch(e){J={apply:B.length?function(e,t){V.apply(e,G.call(t))}:function(e,t){for(var n=e.length,r=0;e[n++]=t[r++];);e.length=n-1}}}for(_ in g=t.support={},b=t.isXML=function(e){var t=e&&(e.ownerDocument||e).documentElement;return!!t&&"HTML"!==t.nodeName},D=t.setDocument=function(e){var t,n,r=e?e.ownerDocument||e:P;return r!==Y&&9===r.nodeType&&r.documentElement?(S=(Y=r).documentElement,C=!b(Y),(n=Y.defaultView)&&n.top!==n&&(n.addEventListener?n.addEventListener("unload",ye,!1):n.attachEvent&&n.attachEvent("onunload",ye)),g.attributes=i(function(e){return e.className="i",!e.getAttribute("className")}),g.getElementsByTagName=i(function(e){return e.appendChild(Y.createComment("")),!e.getElementsByTagName("*").length}),g.getElementsByClassName=fe.test(Y.getElementsByClassName),g.getById=i(function(e){return S.appendChild(e).id=A,!Y.getElementsByName||!Y.getElementsByName(A).length}),g.getById?(y.find.ID=function(e,t){if(void 0!==t.getElementById&&C){var n=t.getElementById(e);return n?[n]:[]}},y.filter.ID=function(e){var t=e.replace(_e,ge);return function(e){return e.getAttribute("id")===t}}):(delete y.find.ID,y.filter.ID=function(e){var t=e.replace(_e,ge);return function(e){var n=void 0!==e.getAttributeNode&&e.getAttributeNode("id");return n&&n.value===t}}),y.find.TAG=g.getElementsByTagName?function(e,t){return void 0!==t.getElementsByTagName?t.getElementsByTagName(e):g.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},y.find.CLASS=g.getElementsByClassName&&function(e,t){if(void 0!==t.getElementsByClassName&&C)return t.getElementsByClassName(e)},E=[],j=[],(g.qsa=fe.test(Y.querySelectorAll))&&(i(function(e){S.appendChild(e).innerHTML="",e.querySelectorAll("[msallowcapture^='']").length&&j.push("[*^$]="+Z+"*(?:''|\"\")"),e.querySelectorAll("[selected]").length||j.push("\\["+Z+"*(?:value|"+K+")"),e.querySelectorAll("[id~="+A+"-]").length||j.push("~="),e.querySelectorAll(":checked").length||j.push(":checked"),e.querySelectorAll("a#"+A+"+*").length||j.push(".#.+[+~]")}),i(function(e){var t=Y.createElement("input");t.setAttribute("type","hidden"),e.appendChild(t).setAttribute("name","D"),e.querySelectorAll("[name=d]").length&&j.push("name"+Z+"*[*^$|!~]?="),e.querySelectorAll(":enabled").length||j.push(":enabled",":disabled"),e.querySelectorAll("*,:x"),j.push(",.*:")})),(g.matchesSelector=fe.test(H=S.matches||S.webkitMatchesSelector||S.mozMatchesSelector||S.oMatchesSelector||S.msMatchesSelector))&&i(function(e){g.disconnectedMatch=H.call(e,"div"),H.call(e,"[s!='']:x"),E.push("!=",te)}),j=j.length&&new RegExp(j.join("|")),E=E.length&&new RegExp(E.join("|")),t=fe.test(S.compareDocumentPosition),O=t||fe.test(S.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},F=t?function(e,t){if(e===t)return T=!0,0;var n=!e.compareDocumentPosition-!t.compareDocumentPosition;return n||(1&(n=(e.ownerDocument||e)===(t.ownerDocument||t)?e.compareDocumentPosition(t):1)||!g.sortDetached&&t.compareDocumentPosition(e)===n?e===Y||e.ownerDocument===P&&O(P,e)?-1:t===Y||t.ownerDocument===P&&O(P,t)?1:k?X(k,e)-X(k,t):0:4&n?-1:1)}:function(e,t){if(e===t)return T=!0,0;var n,r=0,i=e.parentNode,o=t.parentNode,s=[e],u=[t];if(!i||!o)return e===Y?-1:t===Y?1:i?-1:o?1:k?X(k,e)-X(k,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]===P?-1:u[r]===P?1:0},Y):Y},t.matches=function(e,n){return t(e,null,null,n)},t.matchesSelector=function(e,n){if((e.ownerDocument||e)!==Y&&D(e),n=n.replace(ae,"='$1']"),g.matchesSelector&&C&&!$[n+" "]&&(!E||!E.test(n))&&(!j||!j.test(n)))try{var r=H.call(e,n);if(r||g.disconnectedMatch||e.document&&11!==e.document.nodeType)return r}catch(e){}return t(n,Y,null,[e]).length>0},t.contains=function(e,t){return(e.ownerDocument||e)!==Y&&D(e),O(e,t)},t.attr=function(e,t){(e.ownerDocument||e)!==Y&&D(e);var n=y.attrHandle[t.toLowerCase()],r=n&&q.call(y.attrHandle,t.toLowerCase())?n(e,t,!C):void 0;return void 0!==r?r:g.attributes||!C?e.getAttribute(t):(r=e.getAttributeNode(t))&&r.specified?r.value:null},t.error=function(e){throw new Error("Syntax error, unrecognized expression: "+e)},t.uniqueSort=function(e){var t,n=[],r=0,i=0;if(T=!g.detectDuplicates,k=!g.sortStable&&e.slice(0),e.sort(F),T){for(;t=e[i++];)t===e[i]&&(r=n.push(i));for(;r--;)e.splice(n[r],1)}return k=null,e},v=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+=v(e)}else if(3===i||4===i)return e.nodeValue}else for(;t=e[r++];)n+=v(t);return n},(y=t.selectors={cacheLength:50,createPseudo:r,match:le,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(_e,ge),e[3]=(e[3]||e[4]||e[5]||"").replace(_e,ge),"~="===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 le.CHILD.test(e[0])?null:(e[3]?e[2]=e[4]||e[5]||"":n&&se.test(n)&&(t=M(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(_e,ge).toLowerCase();return"*"===e?function(){return!0}:function(e){return e.nodeName&&e.nodeName.toLowerCase()===t}},CLASS:function(e){var t=R[e+" "];return t||(t=new RegExp("(^|"+Z+")"+e+"("+Z+"|$)"))&&R(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(ne," ")+" ").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=_)[A]||(f[A]={}))[f.uniqueID]||(c[f.uniqueID]={}))[e]||[])[0]===N&&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]=[N,h,v];break}}else if(y&&(v=h=(l=(d=(c=(f=t)[A]||(f[A]={}))[f.uniqueID]||(c[f.uniqueID]={}))[e]||[])[0]===N&&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[A]||(f[A]={}))[f.uniqueID]||(c[f.uniqueID]={}))[e]=[N,v]),f!==t)););return(v-=i)===r||v%r==0&&v/r>=0}}},PSEUDO:function(e,n){var i,o=y.pseudos[e]||y.setFilters[e.toLowerCase()]||t.error("unsupported pseudo: "+e);return o[A]?o(n):o.length>1?(i=[e,e,"",n],y.setFilters.hasOwnProperty(e.toLowerCase())?r(function(e,t){for(var r,i=o(e,n),a=i.length;a--;)e[r=X(e,i[a])]=!(t[r]=i[a])}):function(e){return o(e,0,i)}):o}},pseudos:{not:r(function(e){var t=[],n=[],i=w(e.replace(re,"$1"));return i[A]?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(_e,ge),function(t){return(t.textContent||t.innerText||v(t)).indexOf(e)>-1}}),lang:r(function(e){return ue.test(e||"")||t.error("unsupported lang: "+e),e=e.replace(_e,ge).toLowerCase(),function(t){var n;do{if(n=C?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===S},focus:function(e){return e===Y.activeElement&&(!Y.hasFocus||Y.hasFocus())&&!!(e.type||e.href||~e.tabIndex)},enabled:function(e){return!1===e.disabled},disabled:function(e){return!0===e.disabled},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!y.pseudos.empty(e)},header:function(e){return ce.test(e.nodeName)},input:function(e){return de.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:s(function(){return[0]}),last:s(function(e,t){return[t-1]}),eq:s(function(e,t,n){return[n<0?n+t:n]}),even:s(function(e,t){for(var n=0;n=0;)e.push(r);return e}),gt:s(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,p=0,m="0",_=r&&[],g=[],v=x,b=r||o&&y.find.TAG("*",l),M=N+=null==v?1:Math.random()||.1,w=b.length;for(l&&(x=a===Y||a||l);m!==w&&null!=(d=b[m]);m++){if(o&&d){for(c=0,a||d.ownerDocument===Y||(D(d),s=!C);f=e[c++];)if(f(d,a||Y,s)){u.push(d);break}l&&(N=M)}i&&((d=!f&&d)&&p--,r&&_.push(d))}if(p+=m,i&&m!==p){for(c=0;f=n[c++];)f(_,g,a,s);if(r){if(p>0)for(;m--;)_[m]||g[m]||(g[m]=U.call(u));g=h(g)}J.apply(u,g),l&&!r&&g.length>0&&p+n.length>1&&t.uniqueSort(u)}return l&&(N=M,x=v),_};return i?r(a):a}(a,o))).selector=e}return s},L=t.select=function(e,t,n,r){var i,o,a,s,l,c="function"==typeof e&&e,f=!r&&M(e=c.selector||e);if(n=n||[],1===f.length){if((o=f[0]=f[0].slice(0)).length>2&&"ID"===(a=o[0]).type&&g.getById&&9===t.nodeType&&C&&y.relative[o[1].type]){if(!(t=(y.find.ID(a.matches[0].replace(_e,ge),t)||[])[0]))return n;c&&(t=t.parentNode),e=e.slice(o.shift().value.length)}for(i=le.needsContext.test(e)?0:o.length;i--&&(a=o[i],!y.relative[s=a.type]);)if((l=y.find[s])&&(r=l(a.matches[0].replace(_e,ge),pe.test(o[0].type)&&u(t.parentNode)||t))){if(o.splice(i,1),!(e=r.length&&d(o)))return J.apply(n,r),n;break}}return(c||w(e,f))(r,t,!C,n,!t||pe.test(e)&&u(t.parentNode)||t),n},g.sortStable=A.split("").sort(F).join("")===A,g.detectDuplicates=!!T,D(),g.sortDetached=i(function(e){return 1&e.compareDocumentPosition(Y.createElement("div"))}),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)}),g.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(K,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);te.find=ae,te.expr=ae.selectors,te.expr[":"]=te.expr.pseudos,te.uniqueSort=te.unique=ae.uniqueSort,te.text=ae.getText,te.isXMLDoc=ae.isXML,te.contains=ae.contains;var se=function(e,t,n){for(var r=[],i=void 0!==n;(e=e[t])&&9!==e.nodeType;)if(1===e.nodeType){if(i&&te(e).is(n))break;r.push(e)}return r},ue=function(e,t){for(var n=[];e;e=e.nextSibling)1===e.nodeType&&e!==t&&n.push(e);return n},le=te.expr.match.needsContext,de=/^<([\w-]+)\s*\/?>(?:<\/\1>|)$/,ce=/^.[^:#\[\.,]*$/;te.filter=function(e,t,n){var r=t[0];return n&&(e=":not("+e+")"),1===t.length&&1===r.nodeType?te.find.matchesSelector(r,e)?[r]:[]:te.find.matches(e,te.grep(t,function(e){return 1===e.nodeType}))},te.fn.extend({find:function(e){var t,n=this.length,r=[],i=this;if("string"!=typeof e)return this.pushStack(te(e).filter(function(){for(t=0;t1?te.unique(r):r)).selector=this.selector?this.selector+" "+e:e,r},filter:function(e){return this.pushStack(a(this,e||[],!1))},not:function(e){return this.pushStack(a(this,e||[],!0))},is:function(e){return!!a(this,"string"==typeof e&&le.test(e)?te(e):e||[],!1).length}});var fe,he=/^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]*))$/;(te.fn.init=function(e,t,n){var r,i;if(!e)return this;if(n=n||fe,"string"==typeof e){if(!(r="<"===e[0]&&">"===e[e.length-1]&&e.length>=3?[null,e,null]:he.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 te?t[0]:t,te.merge(this,te.parseHTML(r[1],t&&t.nodeType?t.ownerDocument||t:U,!0)),de.test(r[1])&&te.isPlainObject(t))for(r in t)te.isFunction(this[r])?this[r](t[r]):this.attr(r,t[r]);return this}return(i=U.getElementById(r[2]))&&i.parentNode&&(this.length=1,this[0]=i),this.context=U,this.selector=e,this}return e.nodeType?(this.context=this[0]=e,this.length=1,this):te.isFunction(e)?void 0!==n.ready?n.ready(e):e(te):(void 0!==e.selector&&(this.selector=e.selector,this.context=e.context),te.makeArray(e,this))}).prototype=te.fn,fe=te(U);var pe=/^(?:parents|prev(?:Until|All))/,me={children:!0,contents:!0,next:!0,prev:!0};te.fn.extend({has:function(e){var t=te(e,this),n=t.length;return this.filter(function(){for(var e=0;e-1:1===n.nodeType&&te.find.matchesSelector(n,e))){o.push(n);break}return this.pushStack(o.length>1?te.uniqueSort(o):o)},index:function(e){return e?"string"==typeof e?X.call(te(e),this[0]):X.call(this,e.jquery?e[0]:e):this[0]&&this[0].parentNode?this.first().prevAll().length:-1},add:function(e,t){return this.pushStack(te.uniqueSort(te.merge(this.get(),te(e,t))))},addBack:function(e){return this.add(null==e?this.prevObject:this.prevObject.filter(e))}}),te.each({parent:function(e){var t=e.parentNode;return t&&11!==t.nodeType?t:null},parents:function(e){return se(e,"parentNode")},parentsUntil:function(e,t,n){return se(e,"parentNode",n)},next:function(e){return s(e,"nextSibling")},prev:function(e){return s(e,"previousSibling")},nextAll:function(e){return se(e,"nextSibling")},prevAll:function(e){return se(e,"previousSibling")},nextUntil:function(e,t,n){return se(e,"nextSibling",n)},prevUntil:function(e,t,n){return se(e,"previousSibling",n)},siblings:function(e){return ue((e.parentNode||{}).firstChild,e)},children:function(e){return ue(e.firstChild)},contents:function(e){return e.contentDocument||te.merge([],e.childNodes)}},function(e,t){te.fn[e]=function(n,r){var i=te.map(this,t,n);return"Until"!==e.slice(-5)&&(r=n),r&&"string"==typeof r&&(i=te.filter(r,i)),this.length>1&&(me[e]||te.uniqueSort(i),pe.test(e)&&i.reverse()),this.pushStack(i)}});var _e,ge=/\S+/g;te.Callbacks=function(e){e="string"==typeof e?function(e){var t={};return te.each(e.match(ge)||[],function(e,n){t[n]=!0}),t}(e):te.extend({},e);var t,n,r,i,o=[],a=[],s=-1,u=function(){for(i=e.once,r=t=!0;a.length;s=-1)for(n=a.shift();++s-1;)o.splice(n,1),n<=s&&s--}),this},has:function(e){return e?te.inArray(e,o)>-1:o.length>0},empty:function(){return o&&(o=[]),this},disable:function(){return i=a=[],o=n="",this},disabled:function(){return!o},lock:function(){return i=a=[],n||(o=n=""),this},locked:function(){return!!i},fireWith:function(e,n){return i||(n=[e,(n=n||[]).slice?n.slice():n],a.push(n),t||u()),this},fire:function(){return l.fireWith(this,arguments),this},fired:function(){return!!r}};return l},te.extend({Deferred:function(e){var t=[["resolve","done",te.Callbacks("once memory"),"resolved"],["reject","fail",te.Callbacks("once memory"),"rejected"],["notify","progress",te.Callbacks("memory")]],n="pending",r={state:function(){return n},always:function(){return i.done(arguments).fail(arguments),this},then:function(){var e=arguments;return te.Deferred(function(n){te.each(t,function(t,o){var a=te.isFunction(e[t])&&e[t];i[o[1]](function(){var e=a&&a.apply(this,arguments);e&&te.isFunction(e.promise)?e.promise().progress(n.notify).done(n.resolve).fail(n.reject):n[o[0]+"With"](this===r?n.promise():this,a?[e]:arguments)})}),e=null}).promise()},promise:function(e){return null!=e?te.extend(e,r):r}},i={};return r.pipe=r.then,te.each(t,function(e,o){var a=o[2],s=o[3];r[o[1]]=a.add,s&&a.add(function(){n=s},t[1^e][2].disable,t[2][2].lock),i[o[0]]=function(){return i[o[0]+"With"](this===i?r:this,arguments),this},i[o[0]+"With"]=a.fireWith}),r.promise(i),e&&e.call(i,i),i},when:function(e){var t,n,r,i=0,o=V.call(arguments),a=o.length,s=1!==a||e&&te.isFunction(e.promise)?a:0,u=1===s?e:te.Deferred(),l=function(e,n,r){return function(i){n[e]=this,r[e]=arguments.length>1?V.call(arguments):i,r===t?u.notifyWith(n,r):--s||u.resolveWith(n,r)}};if(a>1)for(t=new Array(a),n=new Array(a),r=new Array(a);i0||(_e.resolveWith(U,[te]),te.fn.triggerHandler&&(te(U).triggerHandler("ready"),te(U).off("ready"))))}}),te.ready.promise=function(e){return _e||(_e=te.Deferred(),"complete"===U.readyState||"loading"!==U.readyState&&!U.documentElement.doScroll?n.setTimeout(te.ready):(U.addEventListener("DOMContentLoaded",u),n.addEventListener("load",u))),_e.promise(e)},te.ready.promise();var ye=function(e,t,n,r,i,o,a){var s=0,u=e.length,l=null==n;if("object"===te.type(n))for(s in i=!0,n)ye(e,t,s,n[s],!0,o,a);else if(void 0!==r&&(i=!0,te.isFunction(r)||(a=!0),l&&(a?(t.call(e,r),t=null):(l=t,t=function(e,t,n){return l.call(te(e),n)})),t))for(;s-1&&void 0!==n&&Me.set(this,e,t)})},null,t,arguments.length>1,null,!0)},removeData:function(e){return this.each(function(){Me.remove(this,e)})}}),te.extend({queue:function(e,t,n){var r;if(e)return t=(t||"fx")+"queue",r=be.get(e,t),n&&(!r||te.isArray(n)?r=be.access(e,t,te.makeArray(n)):r.push(n)),r||[]},dequeue:function(e,t){t=t||"fx";var n=te.queue(e,t),r=n.length,i=n.shift(),o=te._queueHooks(e,t);"inprogress"===i&&(i=n.shift(),r--),i&&("fx"===t&&n.unshift("inprogress"),delete o.stop,i.call(e,function(){te.dequeue(e,t)},o)),!r&&o&&o.empty.fire()},_queueHooks:function(e,t){var n=t+"queueHooks";return be.get(e,n)||be.access(e,n,{empty:te.Callbacks("once memory").add(function(){be.remove(e,[t+"queue",n])})})}}),te.fn.extend({queue:function(e,t){var n=2;return"string"!=typeof e&&(t=e,e="fx",n--),arguments.length",""],thead:[1,"","
"],col:[2,"","
"],tr:[2,"","
"],td:[3,"","
"],_default:[0,"",""]};je.optgroup=je.option,je.tbody=je.tfoot=je.colgroup=je.caption=je.thead,je.th=je.td;var Ee,He,Oe=/<|&#?\w+;/;Ee=U.createDocumentFragment().appendChild(U.createElement("div")),(He=U.createElement("input")).setAttribute("type","radio"),He.setAttribute("checked","checked"),He.setAttribute("name","t"),Ee.appendChild(He), ee.checkClone=Ee.cloneNode(!0).cloneNode(!0).lastChild.checked,Ee.innerHTML="",ee.noCloneChecked=!!Ee.cloneNode(!0).lastChild.defaultValue;var Ae=/^key/,Pe=/^(?:mouse|pointer|contextmenu|drag|drop)|click/,Ne=/^([^.]*)(?:\.(.+)|)/;te.event={global:{},add:function(e,t,n,r,i){var o,a,s,u,l,d,c,f,h,p,m,_=be.get(e);if(_)for(n.handler&&(n=(o=n).handler,i=o.selector),n.guid||(n.guid=te.guid++),(u=_.events)||(u=_.events={}),(a=_.handle)||(a=_.handle=function(t){return void 0!==te&&te.event.triggered!==t.type?te.event.dispatch.apply(e,arguments):void 0}),l=(t=(t||"").match(ge)||[""]).length;l--;)h=m=(s=Ne.exec(t[l])||[])[1],p=(s[2]||"").split(".").sort(),h&&(c=te.event.special[h]||{},h=(i?c.delegateType:c.bindType)||h,c=te.event.special[h]||{},d=te.extend({type:h,origType:m,data:r,handler:n,guid:n.guid,selector:i,needsContext:i&&te.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),te.event.global[h]=!0)},remove:function(e,t,n,r,i){var o,a,s,u,l,d,c,f,h,p,m,_=be.hasData(e)&&be.get(e);if(_&&(u=_.events)){for(l=(t=(t||"").match(ge)||[""]).length;l--;)if(h=m=(s=Ne.exec(t[l])||[])[1],p=(s[2]||"").split(".").sort(),h){for(c=te.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)||te.removeEvent(e,h,_.handle),delete u[h])}else for(h in u)te.event.remove(e,h+t[l],n,r,!0);te.isEmptyObject(u)&&be.remove(e,"handle events")}},dispatch:function(e){e=te.event.fix(e);var t,n,r,i,o,a,s=V.call(arguments),u=(be.get(this,"events")||{})[e.type]||[],l=te.event.special[e.type]||{};if(s[0]=e,e.delegateTarget=this,!l.preDispatch||!1!==l.preDispatch.call(this,e)){for(a=te.event.handlers.call(this,e,u),t=0;(i=a[t++])&&!e.isPropagationStopped();)for(e.currentTarget=i.elem,n=0;(o=i.handlers[n++])&&!e.isImmediatePropagationStopped();)e.rnamespace&&!e.rnamespace.test(o.namespace)||(e.handleObj=o,e.data=o.data,void 0!==(r=((te.event.special[o.origType]||{}).handle||o.handler).apply(i.elem,s))&&!1===(e.result=r)&&(e.preventDefault(),e.stopPropagation()));return l.postDispatch&&l.postDispatch.call(this,e),e.result}},handlers:function(e,t){var n,r,i,o,a=[],s=t.delegateCount,u=e.target;if(s&&u.nodeType&&("click"!==e.type||isNaN(e.button)||e.button<1))for(;u!==this;u=u.parentNode||this)if(1===u.nodeType&&(!0!==u.disabled||"click"!==e.type)){for(r=[],n=0;n-1:te.find(i,this,null,[u]).length),r[i]&&r.push(o);r.length&&a.push({elem:u,handlers:r})}return s]*)\/>/gi,Re=/\s*$/g;te.extend({htmlPrefilter:function(e){return e.replace(Ie,"<$1>")},clone:function(e,t,n){var r,i,o,a,s,u,l,d=e.cloneNode(!0),c=te.contains(e.ownerDocument,e);if(!(ee.noCloneChecked||1!==e.nodeType&&11!==e.nodeType||te.isXMLDoc(e)))for(a=f(d),r=0,i=(o=f(e)).length;r0&&h(a,!c&&f(e,"script")),d},cleanData:function(e){for(var t,n,r,i=te.event.special,o=0;void 0!==(n=e[o]);o++)if(ve(n)){if(t=n[be.expando]){if(t.events)for(r in t.events)i[r]?te.event.remove(n,r):te.removeEvent(n,r,t.handle);n[be.expando]=void 0}n[Me.expando]&&(n[Me.expando]=void 0)}}}),te.fn.extend({domManip:L,detach:function(e){return x(this,e,!0)},remove:function(e){return x(this,e)},text:function(e){return ye(this,function(e){return void 0===e?te.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 L(this,arguments,function(e){1!==this.nodeType&&11!==this.nodeType&&9!==this.nodeType||v(this,e).appendChild(e)})},prepend:function(){return L(this,arguments,function(e){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var t=v(this,e);t.insertBefore(e,t.firstChild)}})},before:function(){return L(this,arguments,function(e){this.parentNode&&this.parentNode.insertBefore(e,this)})},after:function(){return L(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&&(te.cleanData(f(e,!1)),e.textContent="");return this},clone:function(e,t){return e=null!=e&&e,t=null==t?e:t,this.map(function(){return te.clone(this,e,t)})},html:function(e){return ye(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&&!Re.test(e)&&!je[(Se.exec(e)||["",""])[1].toLowerCase()]){e=te.htmlPrefilter(e);try{for(;n1)},show:function(){return H(this,!0)},hide:function(){return H(this)},toggle:function(e){return"boolean"==typeof e?e?this.show():this.hide():this.each(function(){De(this)?te(this).show():te(this).hide()})}}),te.Tween=O,O.prototype={constructor:O,init:function(e,t,n,r,i,o){this.elem=e,this.prop=n,this.easing=i||te.easing._default,this.options=t,this.start=this.now=this.cur(),this.end=r,this.unit=o||(te.cssNumber[n]?"":"px")},cur:function(){var e=O.propHooks[this.prop];return e&&e.get?e.get(this):O.propHooks._default.get(this)},run:function(e){var t,n=O.propHooks[this.prop];return this.options.duration?this.pos=t=te.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):O.propHooks._default.set(this),this}},O.prototype.init.prototype=O.prototype,O.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=te.css(e.elem,e.prop,""))&&"auto"!==t?t:0},set:function(e){te.fx.step[e.prop]?te.fx.step[e.prop](e):1!==e.elem.nodeType||null==e.elem.style[te.cssProps[e.prop]]&&!te.cssHooks[e.prop]?e.elem[e.prop]=e.now:te.style(e.elem,e.prop,e.now+e.unit)}}},O.propHooks.scrollTop=O.propHooks.scrollLeft={set:function(e){e.elem.nodeType&&e.elem.parentNode&&(e.elem[e.prop]=e.now)}},te.easing={linear:function(e){return e},swing:function(e){return.5-Math.cos(e*Math.PI)/2},_default:"swing"},te.fx=O.prototype.init,te.fx.step={};var tt,nt,rt=/^(?:toggle|show|hide)$/,it=/queueHooks$/;te.Animation=te.extend(I,{tweeners:{"*":[function(e,t){var n=this.createTween(e,t);return c(n.elem,e,ke.exec(t),n),n}]},tweener:function(e,t){te.isFunction(e)?(t=e,e=["*"]):e=e.match(ge);for(var n,r=0,i=e.length;r1)},removeAttr:function(e){return this.each(function(){te.removeAttr(this,e)})}}),te.extend({attr:function(e,t,n){var r,i,o=e.nodeType;if(3!==o&&8!==o&&2!==o)return void 0===e.getAttribute?te.prop(e,t,n):(1===o&&te.isXMLDoc(e)||(t=t.toLowerCase(),i=te.attrHooks[t]||(te.expr.match.bool.test(t)?ot:void 0)),void 0!==n?null===n?void te.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=te.find.attr(e,t))?void 0:r)},attrHooks:{type:{set:function(e,t){if(!ee.radioValue&&"radio"===t&&te.nodeName(e,"input")){var n=e.value;return e.setAttribute("type",t),n&&(e.value=n),t}}}},removeAttr:function(e,t){var n,r,i=0,o=t&&t.match(ge);if(o&&1===e.nodeType)for(;n=o[i++];)r=te.propFix[n]||n,te.expr.match.bool.test(n)&&(e[r]=!1),e.removeAttribute(n)}}),ot={set:function(e,t,n){return!1===t?te.removeAttr(e,n):e.setAttribute(n,n),n}},te.each(te.expr.match.bool.source.match(/\w+/g),function(e,t){var n=at[t]||te.find.attr;at[t]=function(e,t,r){var i,o;return r||(o=at[t],at[t]=i,i=null!=n(e,t,r)?t.toLowerCase():null,at[t]=o),i}});var st=/^(?:input|select|textarea|button)$/i,ut=/^(?:a|area)$/i;te.fn.extend({prop:function(e,t){return ye(this,te.prop,e,t,arguments.length>1)},removeProp:function(e){return this.each(function(){delete this[te.propFix[e]||e]})}}),te.extend({prop:function(e,t,n){var r,i,o=e.nodeType;if(3!==o&&8!==o&&2!==o)return 1===o&&te.isXMLDoc(e)||(t=te.propFix[t]||t,i=te.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=te.find.attr(e,"tabindex");return t?parseInt(t,10):st.test(e.nodeName)||ut.test(e.nodeName)&&e.href?0:-1}}},propFix:{for:"htmlFor",class:"className"}}),ee.optSelected||(te.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)}}),te.each(["tabIndex","readOnly","maxLength","cellSpacing","cellPadding","rowSpan","colSpan","useMap","frameBorder","contentEditable"],function(){te.propFix[this.toLowerCase()]=this});var lt=/[\t\r\n\f]/g;te.fn.extend({addClass:function(e){var t,n,r,i,o,a,s,u=0;if(te.isFunction(e))return this.each(function(t){te(this).addClass(e.call(this,t,R(this)))});if("string"==typeof e&&e)for(t=e.match(ge)||[];n=this[u++];)if(i=R(n),r=1===n.nodeType&&(" "+i+" ").replace(lt," ")){for(a=0;o=t[a++];)r.indexOf(" "+o+" ")<0&&(r+=o+" ");i!==(s=te.trim(r))&&n.setAttribute("class",s)}return this},removeClass:function(e){var t,n,r,i,o,a,s,u=0;if(te.isFunction(e))return this.each(function(t){te(this).removeClass(e.call(this,t,R(this)))});if(!arguments.length)return this.attr("class","");if("string"==typeof e&&e)for(t=e.match(ge)||[];n=this[u++];)if(i=R(n),r=1===n.nodeType&&(" "+i+" ").replace(lt," ")){for(a=0;o=t[a++];)for(;r.indexOf(" "+o+" ")>-1;)r=r.replace(" "+o+" "," ");i!==(s=te.trim(r))&&n.setAttribute("class",s)}return this},toggleClass:function(e,t){var n=typeof e;return"boolean"==typeof t&&"string"===n?t?this.addClass(e):this.removeClass(e):te.isFunction(e)?this.each(function(n){te(this).toggleClass(e.call(this,n,R(this),t),t)}):this.each(function(){var t,r,i,o;if("string"===n)for(r=0,i=te(this),o=e.match(ge)||[];t=o[r++];)i.hasClass(t)?i.removeClass(t):i.addClass(t);else void 0!==e&&"boolean"!==n||((t=R(this))&&be.set(this,"__className__",t),this.setAttribute&&this.setAttribute("class",t||!1===e?"":be.get(this,"__className__")||""))})},hasClass:function(e){var t,n,r=0;for(t=" "+e+" ";n=this[r++];)if(1===n.nodeType&&(" "+R(n)+" ").replace(lt," ").indexOf(t)>-1)return!0;return!1}});var dt=/\r/g,ct=/[\x20\t\r\n\f]+/g;te.fn.extend({val:function(e){var t,n,r,i=this[0];return arguments.length?(r=te.isFunction(e),this.each(function(n){var i;1===this.nodeType&&(null==(i=r?e.call(this,n,te(this).val()):e)?i="":"number"==typeof i?i+="":te.isArray(i)&&(i=te.map(i,function(e){return null==e?"":e+""})),(t=te.valHooks[this.type]||te.valHooks[this.nodeName.toLowerCase()])&&"set"in t&&void 0!==t.set(this,i,"value")||(this.value=i))})):i?(t=te.valHooks[i.type]||te.valHooks[i.nodeName.toLowerCase()])&&"get"in t&&void 0!==(n=t.get(i,"value"))?n:"string"==typeof(n=i.value)?n.replace(dt,""):null==n?"":n:void 0}}),te.extend({valHooks:{option:{get:function(e){var t=te.find.attr(e,"value");return null!=t?t:te.trim(te.text(e)).replace(ct," ")}},select:{get:function(e){for(var t,n,r=e.options,i=e.selectedIndex,o="select-one"===e.type||i<0,a=o?null:[],s=o?i+1:r.length,u=i<0?s:o?i:0;u-1)&&(n=!0);return n||(e.selectedIndex=-1),o}}}}),te.each(["radio","checkbox"],function(){te.valHooks[this]={set:function(e,t){if(te.isArray(t))return e.checked=te.inArray(te(e).val(),t)>-1}},ee.checkOn||(te.valHooks[this].get=function(e){return null===e.getAttribute("value")?"on":e.value})});var ft=/^(?:focusinfocus|focusoutblur)$/;te.extend(te.event,{trigger:function(e,t,r,i){var o,a,s,u,l,d,c,f=[r||U],h=Q.call(e,"type")?e.type:e,p=Q.call(e,"namespace")?e.namespace.split("."):[];if(a=s=r=r||U,3!==r.nodeType&&8!==r.nodeType&&!ft.test(h+te.event.triggered)&&(h.indexOf(".")>-1&&(h=(p=h.split(".")).shift(),p.sort()),l=h.indexOf(":")<0&&"on"+h,(e=e[te.expando]?e:new te.Event(h,"object"==typeof e&&e)).isTrigger=i?2:3,e.namespace=p.join("."),e.rnamespace=e.namespace?new RegExp("(^|\\.)"+p.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,e.result=void 0,e.target||(e.target=r),t=null==t?[e]:te.makeArray(t,[e]),c=te.event.special[h]||{},i||!c.trigger||!1!==c.trigger.apply(r,t))){if(!i&&!c.noBubble&&!te.isWindow(r)){for(u=c.delegateType||h,ft.test(u+h)||(a=a.parentNode);a;a=a.parentNode)f.push(a),s=a;s===(r.ownerDocument||U)&&f.push(s.defaultView||s.parentWindow||n)}for(o=0;(a=f[o++])&&!e.isPropagationStopped();)e.type=o>1?u:c.bindType||h,(d=(be.get(a,"events")||{})[e.type]&&be.get(a,"handle"))&&d.apply(a,t),(d=l&&a[l])&&d.apply&&ve(a)&&(e.result=d.apply(a,t),!1===e.result&&e.preventDefault());return e.type=h,i||e.isDefaultPrevented()||c._default&&!1!==c._default.apply(f.pop(),t)||!ve(r)||l&&te.isFunction(r[h])&&!te.isWindow(r)&&((s=r[l])&&(r[l]=null),te.event.triggered=h,r[h](),te.event.triggered=void 0,s&&(r[l]=s)),e.result}},simulate:function(e,t,n){var r=te.extend(new te.Event,n,{type:e,isSimulated:!0});te.event.trigger(r,null,t)}}),te.fn.extend({trigger:function(e,t){return this.each(function(){te.event.trigger(e,t,this)})},triggerHandler:function(e,t){var n=this[0];if(n)return te.event.trigger(e,t,n,!0)}}),te.each("blur focus focusin focusout load resize scroll unload click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup error contextmenu".split(" "),function(e,t){te.fn[t]=function(e,n){return arguments.length>0?this.on(t,null,e,n):this.trigger(t)}}),te.fn.extend({hover:function(e,t){return this.mouseenter(e).mouseleave(t||e)}}),ee.focusin="onfocusin"in n,ee.focusin||te.each({focus:"focusin",blur:"focusout"},function(e,t){var n=function(e){te.event.simulate(t,e.target,te.event.fix(e))};te.event.special[t]={setup:function(){var r=this.ownerDocument||this,i=be.access(r,t);i||r.addEventListener(e,n,!0),be.access(r,t,(i||0)+1)},teardown:function(){var r=this.ownerDocument||this,i=be.access(r,t)-1;i?be.access(r,t,i):(r.removeEventListener(e,n,!0),be.remove(r,t))}}});var ht=n.location,pt=te.now(),mt=/\?/;te.parseJSON=function(e){return JSON.parse(e+"")},te.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||te.error("Invalid XML: "+e),t};var _t=/#.*$/,gt=/([?&])_=[^&]*/,yt=/^(.*?):[ \t]*([^\r\n]*)$/gm,vt=/^(?:GET|HEAD)$/,bt=/^\/\//,Mt={},wt={},Lt="*/".concat("*"),xt=U.createElement("a");xt.href=ht.href,te.extend({active:0,lastModified:{},etag:{},ajaxSettings:{url:ht.href,type:"GET",isLocal:/^(?:about|app|app-storage|.+-extension|file|res|widget):$/.test(ht.protocol),global:!0,processData:!0,async:!0,contentType:"application/x-www-form-urlencoded; charset=UTF-8",accepts:{"*":Lt,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":te.parseJSON,"text xml":te.parseXML},flatOptions:{url:!0,context:!0}},ajaxSetup:function(e,t){return t?F(F(e,te.ajaxSettings),t):F(te.ajaxSettings,e)},ajaxPrefilter:W(Mt),ajaxTransport:W(wt),ajax:function(e,t){function r(e,t,r,s){var l,c,y,v,M,L=t;2!==b&&(b=2,u&&n.clearTimeout(u),i=void 0,a=s||"",w.readyState=e>0?4:0,l=e>=200&&e<300||304===e,r&&(v=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]}(f,w,r)),v=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}}(f,v,w,l),l?(f.ifModified&&((M=w.getResponseHeader("Last-Modified"))&&(te.lastModified[o]=M),(M=w.getResponseHeader("etag"))&&(te.etag[o]=M)),204===e||"HEAD"===f.type?L="nocontent":304===e?L="notmodified":(L=v.state,c=v.data,l=!(y=v.error))):(y=L,!e&&L||(L="error",e<0&&(e=0))),w.status=e,w.statusText=(t||L)+"",l?m.resolveWith(h,[c,L,w]):m.rejectWith(h,[w,L,y]),w.statusCode(g),g=void 0,d&&p.trigger(l?"ajaxSuccess":"ajaxError",[w,f,l?c:y]),_.fireWith(h,[w,L]),d&&(p.trigger("ajaxComplete",[w,f]),--te.active||te.event.trigger("ajaxStop")))}"object"==typeof e&&(t=e,e=void 0),t=t||{};var i,o,a,s,u,l,d,c,f=te.ajaxSetup({},t),h=f.context||f,p=f.context&&(h.nodeType||h.jquery)?te(h):te.event,m=te.Deferred(),_=te.Callbacks("once memory"),g=f.statusCode||{},y={},v={},b=0,M="canceled",w={readyState:0,getResponseHeader:function(e){var t;if(2===b){if(!s)for(s={};t=yt.exec(a);)s[t[1].toLowerCase()]=t[2];t=s[e.toLowerCase()]}return null==t?null:t},getAllResponseHeaders:function(){return 2===b?a:null},setRequestHeader:function(e,t){var n=e.toLowerCase();return b||(e=v[n]=v[n]||e,y[e]=t),this},overrideMimeType:function(e){return b||(f.mimeType=e),this},statusCode:function(e){var t;if(e)if(b<2)for(t in e)g[t]=[g[t],e[t]];else w.always(e[w.status]);return this},abort:function(e){var t=e||M;return i&&i.abort(t),r(0,t),this}};if(m.promise(w).complete=_.add,w.success=w.done,w.error=w.fail,f.url=((e||f.url||ht.href)+"").replace(_t,"").replace(bt,ht.protocol+"//"),f.type=t.method||t.type||f.method||f.type,f.dataTypes=te.trim(f.dataType||"*").toLowerCase().match(ge)||[""],null==f.crossDomain){l=U.createElement("a");try{l.href=f.url,l.href=l.href,f.crossDomain=xt.protocol+"//"+xt.host!=l.protocol+"//"+l.host}catch(e){f.crossDomain=!0}}if(f.data&&f.processData&&"string"!=typeof f.data&&(f.data=te.param(f.data,f.traditional)),$(Mt,f,t,w),2===b)return w ;for(c in(d=te.event&&f.global)&&0==te.active++&&te.event.trigger("ajaxStart"),f.type=f.type.toUpperCase(),f.hasContent=!vt.test(f.type),o=f.url,f.hasContent||(f.data&&(o=f.url+=(mt.test(o)?"&":"?")+f.data,delete f.data),!1===f.cache&&(f.url=gt.test(o)?o.replace(gt,"$1_="+pt++):o+(mt.test(o)?"&":"?")+"_="+pt++)),f.ifModified&&(te.lastModified[o]&&w.setRequestHeader("If-Modified-Since",te.lastModified[o]),te.etag[o]&&w.setRequestHeader("If-None-Match",te.etag[o])),(f.data&&f.hasContent&&!1!==f.contentType||t.contentType)&&w.setRequestHeader("Content-Type",f.contentType),w.setRequestHeader("Accept",f.dataTypes[0]&&f.accepts[f.dataTypes[0]]?f.accepts[f.dataTypes[0]]+("*"!==f.dataTypes[0]?", "+Lt+"; q=0.01":""):f.accepts["*"]),f.headers)w.setRequestHeader(c,f.headers[c]);if(f.beforeSend&&(!1===f.beforeSend.call(h,w,f)||2===b))return w.abort();for(c in M="abort",{success:1,error:1,complete:1})w[c](f[c]);if(i=$(wt,f,t,w)){if(w.readyState=1,d&&p.trigger("ajaxSend",[w,f]),2===b)return w;f.async&&f.timeout>0&&(u=n.setTimeout(function(){w.abort("timeout")},f.timeout));try{b=1,i.send(y,r)}catch(e){if(!(b<2))throw e;r(-1,e)}}else r(-1,"No Transport");return w},getJSON:function(e,t,n){return te.get(e,t,n,"json")},getScript:function(e,t){return te.get(e,void 0,t,"script")}}),te.each(["get","post"],function(e,t){te[t]=function(e,n,r,i){return te.isFunction(n)&&(i=i||r,r=n,n=void 0),te.ajax(te.extend({url:e,type:t,dataType:i,data:n,success:r},te.isPlainObject(e)&&e))}}),te._evalUrl=function(e){return te.ajax({url:e,type:"GET",dataType:"script",async:!1,global:!1,throws:!0})},te.fn.extend({wrapAll:function(e){var t;return te.isFunction(e)?this.each(function(t){te(this).wrapAll(e.call(this,t))}):(this[0]&&(t=te(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 te.isFunction(e)?this.each(function(t){te(this).wrapInner(e.call(this,t))}):this.each(function(){var t=te(this),n=t.contents();n.length?n.wrapAll(e):t.append(e)})},wrap:function(e){var t=te.isFunction(e);return this.each(function(n){te(this).wrapAll(t?e.call(this,n):e)})},unwrap:function(){return this.parent().each(function(){te.nodeName(this,"body")||te(this).replaceWith(this.childNodes)}).end()}}),te.expr.filters.hidden=function(e){return!te.expr.filters.visible(e)},te.expr.filters.visible=function(e){return e.offsetWidth>0||e.offsetHeight>0||e.getClientRects().length>0};var kt=/%20/g,Tt=/\[\]$/,Dt=/\r?\n/g,Yt=/^(?:submit|button|image|reset|file)$/i,St=/^(?:input|select|textarea|keygen)/i;te.param=function(e,t){var n,r=[],i=function(e,t){t=te.isFunction(t)?t():null==t?"":t,r[r.length]=encodeURIComponent(e)+"="+encodeURIComponent(t)};if(void 0===t&&(t=te.ajaxSettings&&te.ajaxSettings.traditional),te.isArray(e)||e.jquery&&!te.isPlainObject(e))te.each(e,function(){i(this.name,this.value)});else for(n in e)z(n,e[n],t,i);return r.join("&").replace(kt,"+")},te.fn.extend({serialize:function(){return te.param(this.serializeArray())},serializeArray:function(){return this.map(function(){var e=te.prop(this,"elements");return e?te.makeArray(e):this}).filter(function(){var e=this.type;return this.name&&!te(this).is(":disabled")&&St.test(this.nodeName)&&!Yt.test(e)&&(this.checked||!Ye.test(e))}).map(function(e,t){var n=te(this).val();return null==n?null:te.isArray(n)?te.map(n,function(e){return{name:t.name,value:e.replace(Dt,"\r\n")}}):{name:t.name,value:n.replace(Dt,"\r\n")}}).get()}}),te.ajaxSettings.xhr=function(){try{return new n.XMLHttpRequest}catch(e){}};var Ct={0:200,1223:204},jt=te.ajaxSettings.xhr();ee.cors=!!jt&&"withCredentials"in jt,ee.ajax=jt=!!jt,te.ajaxTransport(function(e){var t,r;if(ee.cors||jt&&!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.onreadystatechange=null,"abort"===e?s.abort():"error"===e?"number"!=typeof s.status?o(0,"error"):o(s.status,s.statusText):o(Ct[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=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()}}}),te.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 te.globalEval(e),e}}}),te.ajaxPrefilter("script",function(e){void 0===e.cache&&(e.cache=!1),e.crossDomain&&(e.type="GET")}),te.ajaxTransport("script",function(e){var t,n;if(e.crossDomain)return{send:function(r,i){t=te(" - - + + @@ -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 176/179] 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 177/179] 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 178/179] 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 179/179] 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)',