From d020b4fcc878dee59b3fbe4d14ec755169c74729 Mon Sep 17 00:00:00 2001 From: Shleeble Date: Tue, 30 Apr 2019 15:17:39 +0800 Subject: [PATCH 01/26] Delete recaptcha.php --- config/recaptcha.php | 66 -------------------------------------------- 1 file changed, 66 deletions(-) delete mode 100644 config/recaptcha.php diff --git a/config/recaptcha.php b/config/recaptcha.php deleted file mode 100644 index 049af6d52..000000000 --- a/config/recaptcha.php +++ /dev/null @@ -1,66 +0,0 @@ - env('RECAPTCHA_PUBLIC_KEY', ''), - 'private_key' => env('RECAPTCHA_PRIVATE_KEY', ''), - - /* - |-------------------------------------------------------------------------- - | Template - |-------------------------------------------------------------------------- - | - | Set a template to use if you don't want to use the standard one. - | - */ - 'template' => '', - - /* - |-------------------------------------------------------------------------- - | Driver - |-------------------------------------------------------------------------- - | - | Determine how to call out to get response; values are 'curl' or 'native'. - | Only applies to v2. - | - */ - 'driver' => 'curl', - - /* - |-------------------------------------------------------------------------- - | Options - |-------------------------------------------------------------------------- - | - | Various options for the driver - | - */ - 'options' => [ - - 'curl_timeout' => 1, - 'curl_verify' => true, - - ], - - /* - |-------------------------------------------------------------------------- - | Version - |-------------------------------------------------------------------------- - | - | Set which version of ReCaptcha to use. - | - */ - - 'version' => 2, - -]; From 64c7a8ceaee376ab74ddb320d2f5aa73c67aff66 Mon Sep 17 00:00:00 2001 From: Shleeble Date: Tue, 30 Apr 2019 15:19:35 +0800 Subject: [PATCH 02/26] Update FederationController.php --- app/Http/Controllers/FederationController.php | 1 - 1 file changed, 1 deletion(-) diff --git a/app/Http/Controllers/FederationController.php b/app/Http/Controllers/FederationController.php index ccba79d20..b6918fc42 100644 --- a/app/Http/Controllers/FederationController.php +++ b/app/Http/Controllers/FederationController.php @@ -118,7 +118,6 @@ class FederationController extends Controller 'homepage' => 'https://pixelfed.org', 'repo' => 'https://github.com/pixelfed/pixelfed', ], - 'captcha' => (bool) config('pixelfed.recaptcha'), ], 'protocols' => [ 'activitypub', From 7953be29fe23793850a47c434a986b4687f5c939 Mon Sep 17 00:00:00 2001 From: Shleeble Date: Tue, 30 Apr 2019 15:20:26 +0800 Subject: [PATCH 03/26] Update LoginController.php --- app/Http/Controllers/Auth/LoginController.php | 4 ---- 1 file changed, 4 deletions(-) diff --git a/app/Http/Controllers/Auth/LoginController.php b/app/Http/Controllers/Auth/LoginController.php index 6cea5e8a3..c47bf9ab7 100644 --- a/app/Http/Controllers/Auth/LoginController.php +++ b/app/Http/Controllers/Auth/LoginController.php @@ -53,10 +53,6 @@ class LoginController extends Controller 'password' => 'required|string|min:6', ]; - if (config('pixelfed.recaptcha')) { - $rules['g-recaptcha-response'] = 'required|recaptcha'; - } - $this->validate($request, $rules); } From b2e79b9bc63b705018dd10f1198e06906662c2e5 Mon Sep 17 00:00:00 2001 From: Shleeble Date: Tue, 30 Apr 2019 15:21:55 +0800 Subject: [PATCH 04/26] Update pixelfed.php --- config/pixelfed.php | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/config/pixelfed.php b/config/pixelfed.php index 10df33777..2e1286536 100644 --- a/config/pixelfed.php +++ b/config/pixelfed.php @@ -74,15 +74,15 @@ return [ /* |-------------------------------------------------------------------------- - | Enable Google Recaptcha v2 + | ActivityPud |-------------------------------------------------------------------------- | - | Enable/disable recaptcha on login/registration forms. API Keys required. - | */ - 'recaptcha' => env('RECAPTCHA_ENABLED', false), - - + 'ap_inbox' => env('ACTIVITYPUB_INBOX', false), + 'ap_shared' => env('ACTIVITYPUB_SHAREDINBOX', false), + 'ap_delivery_timeout' => env('ACTIVITYPUB_DELIVERY_TIMEOUT', 2.0), + 'ap_delivery_concurrency' => env('ACTIVITYPUB_DELIVERY_CONCURRENCY', 10), + 'remote_follow_enabled' => env('REMOTE_FOLLOW', false), 'activitypub_enabled' => env('ACTIVITY_PUB', false), @@ -262,11 +262,6 @@ return [ 'enforce_account_limit' => env('LIMIT_ACCOUNT_SIZE', true), - 'ap_inbox' => env('ACTIVITYPUB_INBOX', false), - 'ap_shared' => env('ACTIVITYPUB_SHAREDINBOX', false), - 'ap_delivery_timeout' => env('ACTIVITYPUB_DELIVERY_TIMEOUT', 2.0), - 'ap_delivery_concurrency' => env('ACTIVITYPUB_DELIVERY_CONCURRENCY', 10), - 'import' => [ 'instagram' => [ 'enabled' => false, From 44b5f91713384e497de8439f3a14d40f53718fb2 Mon Sep 17 00:00:00 2001 From: Shleeble Date: Tue, 30 Apr 2019 15:22:59 +0800 Subject: [PATCH 05/26] Update app.php --- config/app.php | 2 -- 1 file changed, 2 deletions(-) diff --git a/config/app.php b/config/app.php index 5bcac1d35..5aa786fbe 100644 --- a/config/app.php +++ b/config/app.php @@ -150,7 +150,6 @@ return [ /* * Package Service Providers... */ - Greggilbert\Recaptcha\RecaptchaServiceProvider::class, Jackiedo\DotenvEditor\DotenvEditorServiceProvider::class, /* @@ -211,7 +210,6 @@ return [ 'Validator' => Illuminate\Support\Facades\Validator::class, 'View' => Illuminate\Support\Facades\View::class, - 'Recaptcha' => Greggilbert\Recaptcha\Facades\Recaptcha::class, 'DotenvEditor' => Jackiedo\DotenvEditor\Facades\DotenvEditor::class, 'PrettyNumber' => App\Util\Lexer\PrettyNumber::class, 'Purify' => Stevebauman\Purify\Facades\Purify::class, From 24a1b2713f3c272e2555444a72646923de902597 Mon Sep 17 00:00:00 2001 From: Shleeble Date: Tue, 30 Apr 2019 15:24:36 +0800 Subject: [PATCH 06/26] Update general.blade.php --- .../views/admin/settings/config/general.blade.php | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/resources/views/admin/settings/config/general.blade.php b/resources/views/admin/settings/config/general.blade.php index 51597a015..480ec2dad 100644 --- a/resources/views/admin/settings/config/general.blade.php +++ b/resources/views/admin/settings/config/general.blade.php @@ -24,18 +24,6 @@ -
- -
-
- - -

When this option is enabled, new user registration is open.

-
-
-
@@ -100,4 +88,4 @@
- \ No newline at end of file + From d61c48c62b60fe62222e8de01b043b5a4cd44d76 Mon Sep 17 00:00:00 2001 From: Shleeble Date: Tue, 30 Apr 2019 15:25:02 +0800 Subject: [PATCH 07/26] Update RegisterController.php --- app/Http/Controllers/Auth/RegisterController.php | 4 ---- 1 file changed, 4 deletions(-) diff --git a/app/Http/Controllers/Auth/RegisterController.php b/app/Http/Controllers/Auth/RegisterController.php index 4ce5538e9..d40c855dd 100644 --- a/app/Http/Controllers/Auth/RegisterController.php +++ b/app/Http/Controllers/Auth/RegisterController.php @@ -76,10 +76,6 @@ class RegisterController extends Controller 'password' => 'required|string|min:6|confirmed', ]; - if (config('pixelfed.recaptcha')) { - $rules['g-recaptcha-response'] = 'required|recaptcha'; - } - return Validator::make($data, $rules); } From 8ad077ecfaf4c6fcd5294711de95d3f96606774c Mon Sep 17 00:00:00 2001 From: Shleeble Date: Tue, 30 Apr 2019 15:25:29 +0800 Subject: [PATCH 08/26] Update sudo.blade.php --- resources/views/auth/sudo.blade.php | 6 ------ 1 file changed, 6 deletions(-) diff --git a/resources/views/auth/sudo.blade.php b/resources/views/auth/sudo.blade.php index 79f2917cb..9a253c32a 100644 --- a/resources/views/auth/sudo.blade.php +++ b/resources/views/auth/sudo.blade.php @@ -26,12 +26,6 @@ - @if(config('pixelfed.recaptcha')) -
- {!! Recaptcha::render() !!} -
- @endif -
- @if(config('pixelfed.recaptcha')) -
- {!! Recaptcha::render() !!} -
- @endif -
- @if(config('pixelfed.recaptcha')) -
- {!! Recaptcha::render() !!} -
- @endif -
- - @if(config('pixelfed.recaptcha')) -
- {!! Recaptcha::render() !!} -
- @endif
From d94539a2cb2099797dc5a2f598d11e606f473a05 Mon Sep 17 00:00:00 2001 From: Shleeble Date: Tue, 30 Apr 2019 15:28:10 +0800 Subject: [PATCH 12/26] Update .env.testing --- .env.testing | 1 - 1 file changed, 1 deletion(-) diff --git a/.env.testing b/.env.testing index ef7f69cf1..e28316175 100644 --- a/.env.testing +++ b/.env.testing @@ -41,7 +41,6 @@ API_BASE="/api/1/" API_SEARCH="/api/search" OPEN_REGISTRATION=false -RECAPTCHA_ENABLED=false ENFORCE_EMAIL_VERIFICATION=true MAX_PHOTO_SIZE=15000 From de8a1d47da7d08251bf85332b0e2bdf09520bb66 Mon Sep 17 00:00:00 2001 From: Shleeble Date: Tue, 30 Apr 2019 15:28:32 +0800 Subject: [PATCH 13/26] Update .env.example --- .env.example | 1 - 1 file changed, 1 deletion(-) diff --git a/.env.example b/.env.example index 725299e28..335af878e 100644 --- a/.env.example +++ b/.env.example @@ -42,7 +42,6 @@ API_BASE="/api/1/" API_SEARCH="/api/search" OPEN_REGISTRATION=true -RECAPTCHA_ENABLED=false ENFORCE_EMAIL_VERIFICATION=true MAX_PHOTO_SIZE=15000 From 1f3f17c51e683bb2ff888bf1e233e1be1ef09acd Mon Sep 17 00:00:00 2001 From: Shleeble Date: Tue, 30 Apr 2019 15:29:02 +0800 Subject: [PATCH 14/26] Update index.blade.php --- resources/views/site/index.blade.php | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/resources/views/site/index.blade.php b/resources/views/site/index.blade.php index ebe13c1f2..6c2ec894e 100644 --- a/resources/views/site/index.blade.php +++ b/resources/views/site/index.blade.php @@ -140,11 +140,6 @@
- @if(config('pixelfed.recaptcha')) -
- {!! Recaptcha::render() !!} -
- @endif
- \ No newline at end of file + From 9b03c30d6fc14a327f15eb548757bccebaecadc6 Mon Sep 17 00:00:00 2001 From: Shleeble Date: Tue, 30 Apr 2019 15:29:32 +0800 Subject: [PATCH 15/26] Update composer.json --- composer.json | 1 - 1 file changed, 1 deletion(-) diff --git a/composer.json b/composer.json index 9d942579a..0e7e1e844 100644 --- a/composer.json +++ b/composer.json @@ -16,7 +16,6 @@ "beyondcode/laravel-self-diagnosis": "^1.0.2", "doctrine/dbal": "^2.7", "fideloper/proxy": "^4.0", - "greggilbert/recaptcha": "dev-master", "intervention/image": "^2.4", "jenssegers/agent": "^2.6", "laravel/framework": "5.8.*", From a50a8b1cf6c1bde611f364e1f38c1f31ef8417cb Mon Sep 17 00:00:00 2001 From: Shleeble Date: Tue, 30 Apr 2019 18:07:49 +0800 Subject: [PATCH 16/26] Update pixelfed.php --- config/pixelfed.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/pixelfed.php b/config/pixelfed.php index 2e1286536..b9156cd56 100644 --- a/config/pixelfed.php +++ b/config/pixelfed.php @@ -74,7 +74,7 @@ return [ /* |-------------------------------------------------------------------------- - | ActivityPud + | ActivityPub |-------------------------------------------------------------------------- | */ From 904a90a8498e5f60e13923a12d6c1c0b77c03d9c Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Tue, 30 Apr 2019 20:48:35 -0600 Subject: [PATCH 17/26] Update NotificationTransformer --- app/Transformer/Api/NotificationTransformer.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Transformer/Api/NotificationTransformer.php b/app/Transformer/Api/NotificationTransformer.php index ce1ae74cf..5a9e4cf40 100644 --- a/app/Transformer/Api/NotificationTransformer.php +++ b/app/Transformer/Api/NotificationTransformer.php @@ -17,7 +17,7 @@ class NotificationTransformer extends Fractal\TransformerAbstract return [ 'id' => (string) $notification->id, 'type' => $this->replaceTypeVerb($notification->action), - 'created_at' => (string) $notification->created_at, + 'created_at' => (string) $notification->created_at->format('c'), 'account' => null, 'status' => null ]; From f093bf05a9e80d55a7f89104768a5c2ba6d490a0 Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Tue, 30 Apr 2019 22:37:53 -0600 Subject: [PATCH 18/26] Update NotificationCard.vue --- .../assets/js/components/NotificationCard.vue | 33 +++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/resources/assets/js/components/NotificationCard.vue b/resources/assets/js/components/NotificationCard.vue index b5894f38d..d84fad229 100644 --- a/resources/assets/js/components/NotificationCard.vue +++ b/resources/assets/js/components/NotificationCard.vue @@ -42,6 +42,7 @@

+
{{timeAgo(n.created_at)}}
@@ -127,6 +128,38 @@ } return text.slice(0,15) + '...' + }, + + timeAgo(ts) { + let date = Date.parse(ts); + let seconds = Math.floor((new Date() - date) / 1000); + let interval = Math.floor(seconds / 31536000); + if (interval >= 1) { + return interval + "y"; + } + interval = Math.floor(seconds / 604800); + if (interval >= 1) { + return interval + "w"; + } + interval = Math.floor(seconds / 86400); + if (interval >= 1) { + return interval + "d"; + } + interval = Math.floor(seconds / 3600); + if (interval >= 1) { + return interval + "h"; + } + interval = Math.floor(seconds / 60); + if (interval >= 1) { + return interval + "m"; + } + return Math.floor(seconds) + "s"; + }, + + mentionUrl(status) { + let username = status.account.username; + let id = status.id; + return '/p/' + username + '/' + id; } } } From 21c900e493135b7d49f72af81a9236ea2f26912a Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Tue, 30 Apr 2019 22:38:14 -0600 Subject: [PATCH 19/26] Update Timeline.vue --- resources/assets/js/components/Timeline.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/assets/js/components/Timeline.vue b/resources/assets/js/components/Timeline.vue index 59db1302f..cc34c4376 100644 --- a/resources/assets/js/components/Timeline.vue +++ b/resources/assets/js/components/Timeline.vue @@ -132,7 +132,7 @@
- +
No more posts to load
No posts found
 From b3a9587756c39d11d131306a8da45f19171bfe62 Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Tue, 30 Apr 2019 22:40:15 -0600 Subject: [PATCH 20/26] Add NotificationService --- app/Services/NotificationService.php | 98 ++++++++++++++++++++++++++++ 1 file changed, 98 insertions(+) create mode 100644 app/Services/NotificationService.php diff --git a/app/Services/NotificationService.php b/app/Services/NotificationService.php new file mode 100644 index 000000000..91b2d21c7 --- /dev/null +++ b/app/Services/NotificationService.php @@ -0,0 +1,98 @@ + 300 ? 300 : $stop; + $ids = Redis::zrangebyscore($key, $start, $stop); + if(empty($ids)) { + $ids = self::coldGet($id, $start, $stop); + } + foreach($ids as $id) { + $res->push(self::getNotification($id)); + } + return $res; + } + + public static function coldGet($id, $start = 0, $stop = 300) + { + $stop = $stop > 300 ? 300 : $stop; + $ids = Notification::whereProfileId($id) + ->latest() + ->skip($start) + ->take($stop) + ->pluck('id'); + foreach($ids as $key) { + self::set($id, $key); + } + return $ids; + } + + public static function set($id, $val) + { + return Redis::zadd(self::CACHE_KEY . $id, $val, $val); + } + + public static function del($id, $val) + { + return Redis::zrem(self::CACHE_KEY . $id, $val); + } + + public static function add($id, $val) + { + return self::set($id, $val); + } + + public static function rem($id, $val) + { + return self::del($id, $val); + } + + public static function count($id) + { + return Redis::zcount(self::CACHE_KEY . $id, '-inf', '+inf'); + } + + public static function getNotification($id) + { + return Cache::remember('service:notification:'.$id, now()->addDays(7), function() use($id) { + $n = Notification::findOrFail($id); + $fractal = new Fractal\Manager(); + $fractal->setSerializer(new ArraySerializer()); + $resource = new Fractal\Resource\Item($n, new NotificationTransformer()); + return $fractal->createData($resource)->toArray(); + }); + } + + public static function warmCache($id, $stop = 100, $force = false) + { + if(self::count($id) == 0 || $force == true) { + $ids = Notification::whereProfileId($id) + ->latest() + ->limit($stop) + ->pluck('id'); + foreach($ids as $key) { + self::set($id, $key); + } + return 1; + } + return 0; + } +} \ No newline at end of file From 64462cdb94cf445d43f63dcc0d42e24d8d5b531b Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Tue, 30 Apr 2019 22:41:38 -0600 Subject: [PATCH 21/26] Add NotificationObserver --- app/Observers/NotificationObserver.php | 64 ++++++++++++++++++++++++++ 1 file changed, 64 insertions(+) create mode 100644 app/Observers/NotificationObserver.php diff --git a/app/Observers/NotificationObserver.php b/app/Observers/NotificationObserver.php new file mode 100644 index 000000000..7cc91a853 --- /dev/null +++ b/app/Observers/NotificationObserver.php @@ -0,0 +1,64 @@ +profile_id, $notification->id); + } + + /** + * Handle the notification "updated" event. + * + * @param \App\Notification $notification + * @return void + */ + public function updated(Notification $notification) + { + NotificationService::set($notification->profile_id, $notification->id); + } + + /** + * Handle the notification "deleted" event. + * + * @param \App\Notification $notification + * @return void + */ + public function deleted(Notification $notification) + { + NotificationService::del($notification->profile_id, $notification->id); + } + + /** + * Handle the notification "restored" event. + * + * @param \App\Notification $notification + * @return void + */ + public function restored(Notification $notification) + { + NotificationService::set($notification->profile_id, $notification->id); + } + + /** + * Handle the notification "force deleted" event. + * + * @param \App\Notification $notification + * @return void + */ + public function forceDeleted(Notification $notification) + { + NotificationService::del($notification->profile_id, $notification->id); + } +} From cddb88352bd5356bf488d26250be29dfecdd2eac Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Tue, 30 Apr 2019 22:44:20 -0600 Subject: [PATCH 22/26] Update AppServiceProvider --- app/Providers/AppServiceProvider.php | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php index 859791319..cf52e7fd4 100644 --- a/app/Providers/AppServiceProvider.php +++ b/app/Providers/AppServiceProvider.php @@ -4,9 +4,14 @@ namespace App\Providers; use App\Observers\{ AvatarObserver, + NotificationObserver, UserObserver }; -use App\{Avatar,User}; +use App\{ + Avatar, + Notification, + User +}; use Auth, Horizon, URL; use Illuminate\Support\Facades\Blade; use Illuminate\Support\Facades\Schema; @@ -25,6 +30,7 @@ class AppServiceProvider extends ServiceProvider Schema::defaultStringLength(191); Avatar::observe(AvatarObserver::class); + Notification::observe(NotificationObserver::class); User::observe(UserObserver::class); Horizon::auth(function ($request) { From 4b1ac4a6ef07a70db1fcdc69cce08ef128c8185b Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Tue, 30 Apr 2019 22:48:01 -0600 Subject: [PATCH 23/26] Update config --- config/exp.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/config/exp.php b/config/exp.php index 8101428c3..3c8d7f8a5 100644 --- a/config/exp.php +++ b/config/exp.php @@ -3,6 +3,7 @@ return [ 'lc' => env('EXP_LC', false), - 'rec' => env('EXP_REC', false) + 'rec' => env('EXP_REC', false), + 'ns' => env('EXP_NS', false) ]; \ No newline at end of file From 60ead2bab3b5206652828678a12d695cea94c054 Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Tue, 30 Apr 2019 22:51:50 -0600 Subject: [PATCH 24/26] Update BaseApiController --- .../Controllers/Api/BaseApiController.php | 30 ++++++++++++++----- 1 file changed, 23 insertions(+), 7 deletions(-) diff --git a/app/Http/Controllers/Api/BaseApiController.php b/app/Http/Controllers/Api/BaseApiController.php index 5ae8f9f68..3110aad7d 100644 --- a/app/Http/Controllers/Api/BaseApiController.php +++ b/app/Http/Controllers/Api/BaseApiController.php @@ -32,6 +32,7 @@ use App\Jobs\VideoPipeline\{ VideoPostProcess, VideoThumbnail }; +use App\Services\NotificationService; class BaseApiController extends Controller { @@ -47,13 +48,28 @@ class BaseApiController extends Controller public function notifications(Request $request) { $pid = Auth::user()->profile->id; - $timeago = Carbon::now()->subMonths(6); - $notifications = Notification::whereProfileId($pid) - ->whereDate('created_at', '>', $timeago) - ->latest() - ->simplePaginate(10); - $resource = new Fractal\Resource\Collection($notifications, new NotificationTransformer()); - $res = $this->fractal->createData($resource)->toArray(); + if(config('exp.ns') == false) { + $timeago = Carbon::now()->subMonths(6); + $notifications = Notification::whereProfileId($pid) + ->whereDate('created_at', '>', $timeago) + ->latest() + ->simplePaginate(10); + $resource = new Fractal\Resource\Collection($notifications, new NotificationTransformer()); + $res = $this->fractal->createData($resource)->toArray(); + } else { + $this->validate($request, [ + 'page' => 'nullable|integer|min:1', + 'limit' => 'nullable|integer|min:1|max:10' + ]); + $limit = $request->input('limit') ?? 10; + $page = $request->input('page') ?? 1; + if($page > 3) { + return response()->json([]); + } + $end = (int) $page * $limit; + $start = (int) $end - $limit; + $res = NotificationService::get($pid, $start, $end); + } return response()->json($res); } From 466f1e7f1b894809cf76c100638fe9ad82975648 Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Tue, 30 Apr 2019 22:53:46 -0600 Subject: [PATCH 25/26] Update composer.lock --- composer.lock | 334 +++++++++++++++++++++----------------------------- 1 file changed, 142 insertions(+), 192 deletions(-) diff --git a/composer.lock b/composer.lock index f8741864b..731ff762e 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "702a3ed0b8499d50323723eb4fb41965", + "content-hash": "f11a1ada5d055b3fb00a5f3aeab6e49a", "packages": [ { "name": "alchemy/binary-driver", @@ -71,16 +71,16 @@ }, { "name": "aws/aws-sdk-php", - "version": "3.91.4", + "version": "3.93.0", "source": { "type": "git", "url": "https://github.com/aws/aws-sdk-php.git", - "reference": "41b67dce3c86da61137b47054d9d52c6ef57b5ec" + "reference": "021c540f24391e883e15c801d03cbebee1206df1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/41b67dce3c86da61137b47054d9d52c6ef57b5ec", - "reference": "41b67dce3c86da61137b47054d9d52c6ef57b5ec", + "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/021c540f24391e883e15c801d03cbebee1206df1", + "reference": "021c540f24391e883e15c801d03cbebee1206df1", "shasum": "" }, "require": { @@ -104,7 +104,8 @@ "ext-sockets": "*", "nette/neon": "^2.3", "phpunit/phpunit": "^4.8.35|^5.4.3", - "psr/cache": "^1.0" + "psr/cache": "^1.0", + "psr/simple-cache": "^1.0" }, "suggest": { "aws/aws-php-sns-message-validator": "To validate incoming SNS notifications", @@ -149,7 +150,7 @@ "s3", "sdk" ], - "time": "2019-04-05T18:10:20+00:00" + "time": "2019-04-30T18:24:07+00:00" }, { "name": "beyondcode/laravel-self-diagnosis", @@ -215,16 +216,16 @@ }, { "name": "cakephp/chronos", - "version": "1.2.4", + "version": "1.2.5", "source": { "type": "git", "url": "https://github.com/cakephp/chronos.git", - "reference": "ebda7326d4a65e53bc5bb915ebbbeee98f1926b0" + "reference": "8a2b005a2db173e1b5493002afb8e1e13c71a62a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/cakephp/chronos/zipball/ebda7326d4a65e53bc5bb915ebbbeee98f1926b0", - "reference": "ebda7326d4a65e53bc5bb915ebbbeee98f1926b0", + "url": "https://api.github.com/repos/cakephp/chronos/zipball/8a2b005a2db173e1b5493002afb8e1e13c71a62a", + "reference": "8a2b005a2db173e1b5493002afb8e1e13c71a62a", "shasum": "" }, "require": { @@ -268,7 +269,7 @@ "datetime", "time" ], - "time": "2019-02-11T02:08:31+00:00" + "time": "2019-04-23T19:00:57+00:00" }, { "name": "composer/semver", @@ -1165,58 +1166,6 @@ "description": "A PHP class to ping hosts.", "time": "2017-02-02T15:38:40+00:00" }, - { - "name": "greggilbert/recaptcha", - "version": "dev-master", - "source": { - "type": "git", - "url": "https://github.com/greggilbert/recaptcha.git", - "reference": "c2ed383785a4fe20467ce470c97c303e5c5b85de" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/greggilbert/recaptcha/zipball/c2ed383785a4fe20467ce470c97c303e5c5b85de", - "reference": "c2ed383785a4fe20467ce470c97c303e5c5b85de", - "shasum": "" - }, - "require": { - "illuminate/support": "~5.1", - "php": ">=5.3.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.2-dev" - } - }, - "autoload": { - "classmap": [ - "src/migrations" - ], - "psr-4": { - "Greggilbert\\Recaptcha\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Greg Gilbert", - "email": "greg@greg-gilbert.com" - } - ], - "description": "reCAPTCHA Validator for Laravel 5", - "homepage": "http://github.com/greggilbert/recaptcha", - "keywords": [ - "captcha", - "laravel", - "laravel5", - "recaptcha" - ], - "time": "2017-08-31T03:39:47+00:00" - }, { "name": "guzzlehttp/guzzle", "version": "6.3.3", @@ -1560,16 +1509,16 @@ }, { "name": "jaybizzle/crawler-detect", - "version": "v1.2.80", + "version": "v1.2.81", "source": { "type": "git", "url": "https://github.com/JayBizzle/Crawler-Detect.git", - "reference": "af6a36e6d69670df3f0a3ed8e21d4b8cc67a7847" + "reference": "ffb1880f8e9610569d3bc70dc90bf07db311471d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/JayBizzle/Crawler-Detect/zipball/af6a36e6d69670df3f0a3ed8e21d4b8cc67a7847", - "reference": "af6a36e6d69670df3f0a3ed8e21d4b8cc67a7847", + "url": "https://api.github.com/repos/JayBizzle/Crawler-Detect/zipball/ffb1880f8e9610569d3bc70dc90bf07db311471d", + "reference": "ffb1880f8e9610569d3bc70dc90bf07db311471d", "shasum": "" }, "require": { @@ -1605,7 +1554,7 @@ "crawlerdetect", "php crawler detect" ], - "time": "2019-04-05T19:52:02+00:00" + "time": "2019-04-23T20:02:21+00:00" }, { "name": "jenssegers/agent", @@ -1678,16 +1627,16 @@ }, { "name": "laravel/framework", - "version": "v5.8.10", + "version": "v5.8.15", "source": { "type": "git", "url": "https://github.com/laravel/framework.git", - "reference": "505325b4577968750e622d7a5a271cf8785a7a1a" + "reference": "8a34004aed6ff0aa4072360e3e5bd875edebc223" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/framework/zipball/505325b4577968750e622d7a5a271cf8785a7a1a", - "reference": "505325b4577968750e622d7a5a271cf8785a7a1a", + "url": "https://api.github.com/repos/laravel/framework/zipball/8a34004aed6ff0aa4072360e3e5bd875edebc223", + "reference": "8a34004aed6ff0aa4072360e3e5bd875edebc223", "shasum": "" }, "require": { @@ -1821,20 +1770,20 @@ "framework", "laravel" ], - "time": "2019-04-04T13:39:49+00:00" + "time": "2019-04-30T14:05:03+00:00" }, { "name": "laravel/horizon", - "version": "v3.1.1", + "version": "v3.1.2", "source": { "type": "git", "url": "https://github.com/laravel/horizon.git", - "reference": "62ba971c2b180fe54dd3e0cde418c7181a481460" + "reference": "32313d787a7a7575c1866e8ed12ec944c1513b7f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/horizon/zipball/62ba971c2b180fe54dd3e0cde418c7181a481460", - "reference": "62ba971c2b180fe54dd3e0cde418c7181a481460", + "url": "https://api.github.com/repos/laravel/horizon/zipball/32313d787a7a7575c1866e8ed12ec944c1513b7f", + "reference": "32313d787a7a7575c1866e8ed12ec944c1513b7f", "shasum": "" }, "require": { @@ -1890,7 +1839,7 @@ "laravel", "queue" ], - "time": "2019-04-02T16:09:07+00:00" + "time": "2019-04-30T15:20:11+00:00" }, { "name": "laravel/passport", @@ -2624,16 +2573,16 @@ }, { "name": "nesbot/carbon", - "version": "2.16.3", + "version": "2.17.1", "source": { "type": "git", "url": "https://github.com/briannesbitt/Carbon.git", - "reference": "373d9f0d58651af366435148c39beb702c2b7ef4" + "reference": "96acbc0c03782e8115156dd4dd8b736267155066" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/373d9f0d58651af366435148c39beb702c2b7ef4", - "reference": "373d9f0d58651af366435148c39beb702c2b7ef4", + "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/96acbc0c03782e8115156dd4dd8b736267155066", + "reference": "96acbc0c03782e8115156dd4dd8b736267155066", "shasum": "" }, "require": { @@ -2643,9 +2592,9 @@ }, "require-dev": { "friendsofphp/php-cs-fixer": "^2.14 || ^3.0", - "kylekatarnls/multi-tester": "^0.1", + "kylekatarnls/multi-tester": "^1.1", "phpmd/phpmd": "^2.6", - "phpstan/phpstan": "^0.10.8", + "phpstan/phpstan": "^0.11", "phpunit/phpunit": "^7.5 || ^8.0", "squizlabs/php_codesniffer": "^3.4" }, @@ -2680,7 +2629,7 @@ "datetime", "time" ], - "time": "2019-04-06T17:09:23+00:00" + "time": "2019-04-27T18:04:27+00:00" }, { "name": "neutron/temporary-filesystem", @@ -3701,16 +3650,16 @@ }, { "name": "psr/http-factory", - "version": "1.0.0", + "version": "1.0.1", "source": { "type": "git", "url": "https://github.com/php-fig/http-factory.git", - "reference": "378bfe27931ecc54ff824a20d6f6bfc303bbd04c" + "reference": "12ac7fcd07e5b077433f5f2bee95b3a771bf61be" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/http-factory/zipball/378bfe27931ecc54ff824a20d6f6bfc303bbd04c", - "reference": "378bfe27931ecc54ff824a20d6f6bfc303bbd04c", + "url": "https://api.github.com/repos/php-fig/http-factory/zipball/12ac7fcd07e5b077433f5f2bee95b3a771bf61be", + "reference": "12ac7fcd07e5b077433f5f2bee95b3a771bf61be", "shasum": "" }, "require": { @@ -3749,7 +3698,7 @@ "request", "response" ], - "time": "2018-07-30T21:54:04+00:00" + "time": "2019-04-30T12:38:16+00:00" }, { "name": "psr/http-message", @@ -4094,16 +4043,16 @@ }, { "name": "spatie/db-dumper", - "version": "2.13.2", + "version": "2.14.0", "source": { "type": "git", "url": "https://github.com/spatie/db-dumper.git", - "reference": "c0eb0e16d73af665e23bf5b92d1ab2079ab8df91" + "reference": "eec21c55012b02fb8453c9929fa1c3150ca184ac" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spatie/db-dumper/zipball/c0eb0e16d73af665e23bf5b92d1ab2079ab8df91", - "reference": "c0eb0e16d73af665e23bf5b92d1ab2079ab8df91", + "url": "https://api.github.com/repos/spatie/db-dumper/zipball/eec21c55012b02fb8453c9929fa1c3150ca184ac", + "reference": "eec21c55012b02fb8453c9929fa1c3150ca184ac", "shasum": "" }, "require": { @@ -4140,7 +4089,7 @@ "mysqldump", "spatie" ], - "time": "2019-03-03T10:52:00+00:00" + "time": "2019-04-17T07:03:19+00:00" }, { "name": "spatie/image-optimizer", @@ -4194,16 +4143,16 @@ }, { "name": "spatie/laravel-backup", - "version": "6.1.2", + "version": "6.2.0", "source": { "type": "git", "url": "https://github.com/spatie/laravel-backup.git", - "reference": "3b223bf8355d97c4bb9c0afbd7b4c4f7952fc529" + "reference": "d706e64c2500fda276d421551c140693156c0195" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spatie/laravel-backup/zipball/3b223bf8355d97c4bb9c0afbd7b4c4f7952fc529", - "reference": "3b223bf8355d97c4bb9c0afbd7b4c4f7952fc529", + "url": "https://api.github.com/repos/spatie/laravel-backup/zipball/d706e64c2500fda276d421551c140693156c0195", + "reference": "d706e64c2500fda276d421551c140693156c0195", "shasum": "" }, "require": { @@ -4264,7 +4213,7 @@ "laravel-backup", "spatie" ], - "time": "2019-04-05T13:08:54+00:00" + "time": "2019-04-25T11:01:00+00:00" }, { "name": "spatie/laravel-image-optimizer", @@ -4433,16 +4382,16 @@ }, { "name": "swiftmailer/swiftmailer", - "version": "v6.2.0", + "version": "v6.2.1", "source": { "type": "git", "url": "https://github.com/swiftmailer/swiftmailer.git", - "reference": "6fa3232ff9d3f8237c0fae4b7ff05e1baa4cd707" + "reference": "5397cd05b0a0f7937c47b0adcb4c60e5ab936b6a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/swiftmailer/swiftmailer/zipball/6fa3232ff9d3f8237c0fae4b7ff05e1baa4cd707", - "reference": "6fa3232ff9d3f8237c0fae4b7ff05e1baa4cd707", + "url": "https://api.github.com/repos/swiftmailer/swiftmailer/zipball/5397cd05b0a0f7937c47b0adcb4c60e5ab936b6a", + "reference": "5397cd05b0a0f7937c47b0adcb4c60e5ab936b6a", "shasum": "" }, "require": { @@ -4491,20 +4440,20 @@ "mail", "mailer" ], - "time": "2019-03-10T07:52:41+00:00" + "time": "2019-04-21T09:21:45+00:00" }, { "name": "symfony/console", - "version": "v4.2.5", + "version": "v4.2.7", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "24206aff3efe6962593297e57ef697ebb220e384" + "reference": "e2840bb38bddad7a0feaf85931e38fdcffdb2f81" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/24206aff3efe6962593297e57ef697ebb220e384", - "reference": "24206aff3efe6962593297e57ef697ebb220e384", + "url": "https://api.github.com/repos/symfony/console/zipball/e2840bb38bddad7a0feaf85931e38fdcffdb2f81", + "reference": "e2840bb38bddad7a0feaf85931e38fdcffdb2f81", "shasum": "" }, "require": { @@ -4563,7 +4512,7 @@ ], "description": "Symfony Console Component", "homepage": "https://symfony.com", - "time": "2019-04-01T07:32:59+00:00" + "time": "2019-04-08T14:23:48+00:00" }, { "name": "symfony/contracts", @@ -4635,7 +4584,7 @@ }, { "name": "symfony/css-selector", - "version": "v4.2.5", + "version": "v4.2.7", "source": { "type": "git", "url": "https://github.com/symfony/css-selector.git", @@ -4688,16 +4637,16 @@ }, { "name": "symfony/debug", - "version": "v4.2.5", + "version": "v4.2.7", "source": { "type": "git", "url": "https://github.com/symfony/debug.git", - "reference": "43ce8ab34c734dcc8a4af576cb86711daab964c5" + "reference": "2d279b6bb1d582dd5740d4d3251ae8c18812ed37" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/debug/zipball/43ce8ab34c734dcc8a4af576cb86711daab964c5", - "reference": "43ce8ab34c734dcc8a4af576cb86711daab964c5", + "url": "https://api.github.com/repos/symfony/debug/zipball/2d279b6bb1d582dd5740d4d3251ae8c18812ed37", + "reference": "2d279b6bb1d582dd5740d4d3251ae8c18812ed37", "shasum": "" }, "require": { @@ -4740,20 +4689,20 @@ ], "description": "Symfony Debug Component", "homepage": "https://symfony.com", - "time": "2019-03-10T17:09:50+00:00" + "time": "2019-04-11T11:27:41+00:00" }, { "name": "symfony/event-dispatcher", - "version": "v4.2.5", + "version": "v4.2.7", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher.git", - "reference": "ca5af306fbc37f3cf597e91bc9cfa0c7d3f33544" + "reference": "fbce53cd74ac509cbe74b6f227622650ab759b02" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/ca5af306fbc37f3cf597e91bc9cfa0c7d3f33544", - "reference": "ca5af306fbc37f3cf597e91bc9cfa0c7d3f33544", + "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/fbce53cd74ac509cbe74b6f227622650ab759b02", + "reference": "fbce53cd74ac509cbe74b6f227622650ab759b02", "shasum": "" }, "require": { @@ -4804,11 +4753,11 @@ ], "description": "Symfony EventDispatcher Component", "homepage": "https://symfony.com", - "time": "2019-03-30T15:58:42+00:00" + "time": "2019-04-06T13:51:08+00:00" }, { "name": "symfony/filesystem", - "version": "v4.2.5", + "version": "v4.2.7", "source": { "type": "git", "url": "https://github.com/symfony/filesystem.git", @@ -4858,16 +4807,16 @@ }, { "name": "symfony/finder", - "version": "v4.2.5", + "version": "v4.2.7", "source": { "type": "git", "url": "https://github.com/symfony/finder.git", - "reference": "267b7002c1b70ea80db0833c3afe05f0fbde580a" + "reference": "e45135658bd6c14b61850bf131c4f09a55133f69" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/finder/zipball/267b7002c1b70ea80db0833c3afe05f0fbde580a", - "reference": "267b7002c1b70ea80db0833c3afe05f0fbde580a", + "url": "https://api.github.com/repos/symfony/finder/zipball/e45135658bd6c14b61850bf131c4f09a55133f69", + "reference": "e45135658bd6c14b61850bf131c4f09a55133f69", "shasum": "" }, "require": { @@ -4903,20 +4852,20 @@ ], "description": "Symfony Finder Component", "homepage": "https://symfony.com", - "time": "2019-02-23T15:42:05+00:00" + "time": "2019-04-06T13:51:08+00:00" }, { "name": "symfony/http-foundation", - "version": "v4.2.5", + "version": "v4.2.7", "source": { "type": "git", "url": "https://github.com/symfony/http-foundation.git", - "reference": "5b7ab6beaa5b053b8d3c9b13367ada9b292e12e1" + "reference": "6ebbe61f48069033225c9d3fa7eb5ed116d766d6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-foundation/zipball/5b7ab6beaa5b053b8d3c9b13367ada9b292e12e1", - "reference": "5b7ab6beaa5b053b8d3c9b13367ada9b292e12e1", + "url": "https://api.github.com/repos/symfony/http-foundation/zipball/6ebbe61f48069033225c9d3fa7eb5ed116d766d6", + "reference": "6ebbe61f48069033225c9d3fa7eb5ed116d766d6", "shasum": "" }, "require": { @@ -4957,20 +4906,20 @@ ], "description": "Symfony HttpFoundation Component", "homepage": "https://symfony.com", - "time": "2019-03-30T15:58:42+00:00" + "time": "2019-04-17T14:56:00+00:00" }, { "name": "symfony/http-kernel", - "version": "v4.2.5", + "version": "v4.2.7", "source": { "type": "git", "url": "https://github.com/symfony/http-kernel.git", - "reference": "e8b940bbeebf0f96789b5d17d9d77f8b2613960b" + "reference": "3db83303dbc1da9777e5ff63423b8b7fde423a1b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-kernel/zipball/e8b940bbeebf0f96789b5d17d9d77f8b2613960b", - "reference": "e8b940bbeebf0f96789b5d17d9d77f8b2613960b", + "url": "https://api.github.com/repos/symfony/http-kernel/zipball/3db83303dbc1da9777e5ff63423b8b7fde423a1b", + "reference": "3db83303dbc1da9777e5ff63423b8b7fde423a1b", "shasum": "" }, "require": { @@ -5046,7 +4995,7 @@ ], "description": "Symfony HttpKernel Component", "homepage": "https://symfony.com", - "time": "2019-04-02T19:03:51+00:00" + "time": "2019-04-17T16:17:13+00:00" }, { "name": "symfony/polyfill-ctype", @@ -5451,16 +5400,16 @@ }, { "name": "symfony/process", - "version": "v4.2.5", + "version": "v4.2.7", "source": { "type": "git", "url": "https://github.com/symfony/process.git", - "reference": "1e6cbb41dadcaf29e0db034d6ad0d039a9df06e6" + "reference": "8cf39fb4ccff793340c258ee7760fd40bfe745fe" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/process/zipball/1e6cbb41dadcaf29e0db034d6ad0d039a9df06e6", - "reference": "1e6cbb41dadcaf29e0db034d6ad0d039a9df06e6", + "url": "https://api.github.com/repos/symfony/process/zipball/8cf39fb4ccff793340c258ee7760fd40bfe745fe", + "reference": "8cf39fb4ccff793340c258ee7760fd40bfe745fe", "shasum": "" }, "require": { @@ -5496,7 +5445,7 @@ ], "description": "Symfony Process Component", "homepage": "https://symfony.com", - "time": "2019-03-10T20:07:02+00:00" + "time": "2019-04-10T16:20:36+00:00" }, { "name": "symfony/psr-http-message-bridge", @@ -5565,16 +5514,16 @@ }, { "name": "symfony/routing", - "version": "v4.2.5", + "version": "v4.2.7", "source": { "type": "git", "url": "https://github.com/symfony/routing.git", - "reference": "319f600c1ea0f981f6bdc2f042cfc1690957c0e0" + "reference": "0e5719d216017b1a0342fa48e86467cedca1c954" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/routing/zipball/319f600c1ea0f981f6bdc2f042cfc1690957c0e0", - "reference": "319f600c1ea0f981f6bdc2f042cfc1690957c0e0", + "url": "https://api.github.com/repos/symfony/routing/zipball/0e5719d216017b1a0342fa48e86467cedca1c954", + "reference": "0e5719d216017b1a0342fa48e86467cedca1c954", "shasum": "" }, "require": { @@ -5637,20 +5586,20 @@ "uri", "url" ], - "time": "2019-03-30T15:58:42+00:00" + "time": "2019-04-14T18:04:59+00:00" }, { "name": "symfony/translation", - "version": "v4.2.5", + "version": "v4.2.7", "source": { "type": "git", "url": "https://github.com/symfony/translation.git", - "reference": "e46933cc31b68f51f7fc5470fb55550407520f56" + "reference": "46c0dede1f925383d13dc783857be2c41efd0b24" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/translation/zipball/e46933cc31b68f51f7fc5470fb55550407520f56", - "reference": "e46933cc31b68f51f7fc5470fb55550407520f56", + "url": "https://api.github.com/repos/symfony/translation/zipball/46c0dede1f925383d13dc783857be2c41efd0b24", + "reference": "46c0dede1f925383d13dc783857be2c41efd0b24", "shasum": "" }, "require": { @@ -5672,7 +5621,9 @@ "symfony/console": "~3.4|~4.0", "symfony/dependency-injection": "~3.4|~4.0", "symfony/finder": "~2.8|~3.0|~4.0", + "symfony/http-kernel": "~3.4|~4.0", "symfony/intl": "~3.4|~4.0", + "symfony/var-dumper": "~3.4|~4.0", "symfony/yaml": "~3.4|~4.0" }, "suggest": { @@ -5710,20 +5661,20 @@ ], "description": "Symfony Translation Component", "homepage": "https://symfony.com", - "time": "2019-04-01T14:13:08+00:00" + "time": "2019-04-10T16:20:36+00:00" }, { "name": "symfony/var-dumper", - "version": "v4.2.5", + "version": "v4.2.7", "source": { "type": "git", "url": "https://github.com/symfony/var-dumper.git", - "reference": "9f87189ac10b42edf7fb8edc846f1937c6d157cf" + "reference": "e760a38e12b15032325e64be63f7ffc1817af617" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-dumper/zipball/9f87189ac10b42edf7fb8edc846f1937c6d157cf", - "reference": "9f87189ac10b42edf7fb8edc846f1937c6d157cf", + "url": "https://api.github.com/repos/symfony/var-dumper/zipball/e760a38e12b15032325e64be63f7ffc1817af617", + "reference": "e760a38e12b15032325e64be63f7ffc1817af617", "shasum": "" }, "require": { @@ -5786,20 +5737,20 @@ "debug", "dump" ], - "time": "2019-02-23T15:17:42+00:00" + "time": "2019-04-17T14:57:01+00:00" }, { "name": "tightenco/collect", - "version": "v5.8.10", + "version": "v5.8.15", "source": { "type": "git", "url": "https://github.com/tightenco/collect.git", - "reference": "1e4120c90b3536a9ebd080d50ecaae7b75719054" + "reference": "d1d78dbdd8884c35a79f9750743177297e7f31a9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/tightenco/collect/zipball/1e4120c90b3536a9ebd080d50ecaae7b75719054", - "reference": "1e4120c90b3536a9ebd080d50ecaae7b75719054", + "url": "https://api.github.com/repos/tightenco/collect/zipball/d1d78dbdd8884c35a79f9750743177297e7f31a9", + "reference": "d1d78dbdd8884c35a79f9750743177297e7f31a9", "shasum": "" }, "require": { @@ -5836,7 +5787,7 @@ "collection", "laravel" ], - "time": "2019-04-02T20:31:59+00:00" + "time": "2019-04-18T18:52:05+00:00" }, { "name": "tijsverkoyen/css-to-inline-styles", @@ -5939,16 +5890,16 @@ }, { "name": "zendframework/zend-diactoros", - "version": "2.1.1", + "version": "2.1.2", "source": { "type": "git", "url": "https://github.com/zendframework/zend-diactoros.git", - "reference": "c3c330192bc9cc51b7e9ce968ff721dc32ffa986" + "reference": "37bf68b428850ee26ed7c3be6c26236dd95a95f1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zendframework/zend-diactoros/zipball/c3c330192bc9cc51b7e9ce968ff721dc32ffa986", - "reference": "c3c330192bc9cc51b7e9ce968ff721dc32ffa986", + "url": "https://api.github.com/repos/zendframework/zend-diactoros/zipball/37bf68b428850ee26ed7c3be6c26236dd95a95f1", + "reference": "37bf68b428850ee26ed7c3be6c26236dd95a95f1", "shasum": "" }, "require": { @@ -6001,7 +5952,7 @@ "psr", "psr-7" ], - "time": "2019-01-05T20:13:32+00:00" + "time": "2019-04-29T21:11:00+00:00" } ], "packages-dev": [ @@ -6287,16 +6238,16 @@ }, { "name": "myclabs/deep-copy", - "version": "1.8.1", + "version": "1.9.1", "source": { "type": "git", "url": "https://github.com/myclabs/DeepCopy.git", - "reference": "3e01bdad3e18354c3dce54466b7fbe33a9f9f7f8" + "reference": "e6828efaba2c9b79f4499dae1d66ef8bfa7b2b72" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/3e01bdad3e18354c3dce54466b7fbe33a9f9f7f8", - "reference": "3e01bdad3e18354c3dce54466b7fbe33a9f9f7f8", + "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/e6828efaba2c9b79f4499dae1d66ef8bfa7b2b72", + "reference": "e6828efaba2c9b79f4499dae1d66ef8bfa7b2b72", "shasum": "" }, "require": { @@ -6331,7 +6282,7 @@ "object", "object graph" ], - "time": "2018-06-11T23:09:50+00:00" + "time": "2019-04-07T13:18:21+00:00" }, { "name": "nunomaduro/collision", @@ -6555,16 +6506,16 @@ }, { "name": "phpdocumentor/reflection-docblock", - "version": "4.3.0", + "version": "4.3.1", "source": { "type": "git", "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git", - "reference": "94fd0001232e47129dd3504189fa1c7225010d08" + "reference": "bdd9f737ebc2a01c06ea7ff4308ec6697db9b53c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/94fd0001232e47129dd3504189fa1c7225010d08", - "reference": "94fd0001232e47129dd3504189fa1c7225010d08", + "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/bdd9f737ebc2a01c06ea7ff4308ec6697db9b53c", + "reference": "bdd9f737ebc2a01c06ea7ff4308ec6697db9b53c", "shasum": "" }, "require": { @@ -6602,7 +6553,7 @@ } ], "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.", - "time": "2017-11-30T07:14:17+00:00" + "time": "2019-04-30T17:48:53+00:00" }, { "name": "phpdocumentor/type-resolver", @@ -6968,16 +6919,16 @@ }, { "name": "phpunit/phpunit", - "version": "7.5.8", + "version": "7.5.9", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "c29c0525cf4572c11efe1db49a8b8aee9dfac58a" + "reference": "134669cf0eeac3f79bc7f0c793efbc158bffc160" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/c29c0525cf4572c11efe1db49a8b8aee9dfac58a", - "reference": "c29c0525cf4572c11efe1db49a8b8aee9dfac58a", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/134669cf0eeac3f79bc7f0c793efbc158bffc160", + "reference": "134669cf0eeac3f79bc7f0c793efbc158bffc160", "shasum": "" }, "require": { @@ -7048,7 +6999,7 @@ "testing", "xunit" ], - "time": "2019-03-26T13:23:54+00:00" + "time": "2019-04-19T15:50:46+00:00" }, { "name": "sebastian/code-unit-reverse-lookup", @@ -7217,16 +7168,16 @@ }, { "name": "sebastian/environment", - "version": "4.1.0", + "version": "4.2.1", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/environment.git", - "reference": "6fda8ce1974b62b14935adc02a9ed38252eca656" + "reference": "3095910f0f0fb155ac4021fc51a4a7a39ac04e8a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/6fda8ce1974b62b14935adc02a9ed38252eca656", - "reference": "6fda8ce1974b62b14935adc02a9ed38252eca656", + "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/3095910f0f0fb155ac4021fc51a4a7a39ac04e8a", + "reference": "3095910f0f0fb155ac4021fc51a4a7a39ac04e8a", "shasum": "" }, "require": { @@ -7241,7 +7192,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "4.1-dev" + "dev-master": "4.2-dev" } }, "autoload": { @@ -7266,7 +7217,7 @@ "environment", "hhvm" ], - "time": "2019-02-01T05:27:49+00:00" + "time": "2019-04-25T07:55:20+00:00" }, { "name": "sebastian/exporter", @@ -7710,9 +7661,7 @@ ], "aliases": [], "minimum-stability": "dev", - "stability-flags": { - "greggilbert/recaptcha": 20 - }, + "stability-flags": [], "prefer-stable": true, "prefer-lowest": false, "platform": { @@ -7720,6 +7669,7 @@ "ext-bcmath": "*", "ext-ctype": "*", "ext-curl": "*", + "ext-intl": "*", "ext-json": "*", "ext-mbstring": "*", "ext-openssl": "*" From c2534368080f61d180121e13bf1e1e5f2531a106 Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Tue, 30 Apr 2019 22:55:01 -0600 Subject: [PATCH 26/26] Update compiled assets --- public/js/timeline.js | Bin 58421 -> 58913 bytes public/mix-manifest.json | Bin 845 -> 845 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/public/js/timeline.js b/public/js/timeline.js index 5b9d3faba97e11e5628c958f58b9a252bad80daa..140d3f5f75bd4a1ae50f047f013d48bd7a56f23c 100644 GIT binary patch delta 3120 zcmb7GeQaCR71y(q)cGuFK1;srN0YvXU!Lv6aT7bQZqu%7%SZTweH6!dH}Q3R7w6gW zdv2OVUZ`MIw|uneU6U3{CAy6PVX*YUA8ZIMC`?pB8)y=LR2`i*fhM61I!)R%f!MjW z6Pu+>;6JYKJNKM(&pjW%b6$Sa{M1|Kvo;xt(KPDfBICXfv#iAedqCc;Ndu{kBONIN*R_^Un+t^Tu_;}ESjHNz^K z8e#pq>EL!^C8|{yH90IGP(n{eYv~K7?G;26eK}(gy=J;r?3g(GAWzpCTj?X!MfFJ0 z1YS=#?7ZmHWK}?-jM5TaG&?}=nz^=~Fot^$hk-$gD}%$|#Ur{vXw}t2hVzQT8ESEt z30R-n*1QvSbO=ZZ1az55NaFcmP|UuWhGzGafK{Ro(Ff{kIb;YH3wwmC^bwBGtEJDv zI#ebDWwxvn_OFzAzs&VbCS#`3ZKe-bcifqI$dRLCU7vf%5!b-iXvkux*Q!GmNYMk` zK_7(3hNyc-X9-aRRY7!g$D?rDhdZ3GHrI5){ev}EW{@(SmWbl?k$yc&G&zRVQ9bG- zcDp#uA{kd0IY5E|XVAy1sqtZ)YE&?a+(rRS z)RurfleH08->dy9-le#%t2*P4V-rV)H~c}Lsp~37f-Yf6gYXdge%&ajzOVl8MWmyH zP=CWvEo_9ClJrMX>WEI_ssIU1Uu=-TB{v#w0QW169*Ew@je{IVjD2@His2;DX01d5 z%d@Oo2>r;`Mqh1f0siZ4Jn(9#-A|3g_8CZ^B92Vt7N{h-Uk%&zRkTmo! zw!RqxG392ZH(ich_WxMv4H9(YQ5{AfOSx3oHti!##AY(&v z2WUGbBhdC&xwV|gNvvUAfEuIKj-x=WT5qD0j(xzjy}OAXTdxM%*t!kA=hyG1@43#? z-#T{yZE+8w_j@Yn{jQ1}?{QbtHe~0meqN#z>rI;yzsz%&r_>nHbR6crO#hzS@}H-I zdwX7n{=!|Fy`elzG&CH;R^E>2AKk1*vNl~dGs?R?^EpdqJY^tX$Z@`0OKAzLhBLD7 z_M9;OvxnOT{{3Wc1Js~VyRVWJFh9VG;OT+(A_frj_XEwe_{jmI^MIXe1YFBO2w*{& z9OtF!F+Al(M&e)#tLBAohf2)7PN(sYhp(63f%2Xwip_@Tji?J$R}p68TI@Tr)^A#j_tSr75c1}X2h@HxV}&&f zN>iM1^Q4)b-8!|KmOZ*=LP7fW&vsMiX+K?lwueR^ySE4+I!)83&lyL5@HF$ntyA?} zj?ZwOj&MZ}+=~y=k5>BVOV73DFTVcVL-~*Xl|%WDAFZ?(eWTAk#$=2?{P3IX{<~+t zQrWJ~wpTLjjx*#@6#>d&cF4+Vk|-!wBn)#TNbA%%R&@=k0TO#IYC;Nqr?j5loD0CU zzIoA%7_QB?RU$=A#bRk3(1Sps^FhEhJ)i}lKH>ocg_6NT0(B1M5Yg;*9|J2^$SOde z+E3&Jg5I?OTPmPmjucRX0?MAkR?NtOK#p`9flRFn<`BFqxd7daUR-Eu&TEh`AV|(8 z=#OD9qHiyB^Mx?Hp|lW#1BAApIZ%SY20xZdkcWvH z7MObhP*ut1f?ybHKMt|T+m`A|0fFTaO#=b{k_#@KSOT0>QqW>W9}6m?mzN08Ez7Kv zw=YLvKez0M{aedT?W~H%ahM=xiY^0E?FVDXa7xDlpE=+GFDouAHIu@JLk1arIHqAMF?L@($Mr&+W+}j$+h%Mxy{am#t@(r`q=?E=M9kzyXD3{E>+$B@ zSvj;N8cEh#orB!alOpZIAFKu31$(fmB`Ma&_z@8OQra?i9Eu}MFW$4i3(F%(44w&xkPaGQ zBn=&hdJbu@f(`={fziMA4oj-4bq54&>rmj&QD;0B b`tf@8)|Ot9h9BhlgKuQBdeB&ZW1{uHa^fUX delta 2793 zcmbtWeQZ=!7SEe$OFN~O(kX4}*UT#|@6p%Sq3yOZ!*if2g1R;u$u3MsyzRVc?{;`^ zc<;3Vhk}T@z|t=cwNzl)RimP)z|%iOjrb8N(HL3Xn5Y{F|7cV&hMU&dw%Es^#kWC?>Wc3G8GdvDyShE77f)JFf5934Nmilb-#Tgh=0iX4?FWk(sx z+Z?ytKs;3QSfVLM1S%1jax7a&L@|)|gTh6}Mfk`m`>2wL8+zRIhj`N>)_}=}ha{qy z0)NN)NCPiQy3*PG2erpSpNJ?>o8<4};L1J4_M6!?4m|Agg35AQUoTK46tZM0QHkfn zVKEgQ2nXA9@O&{q;qF{FN9|~CE^}AUdypgWW!_1YkGo{tx#()d_17-{FL7xsyYtqK zzq{8T9ng9#s%wHJsgfxsSc)kNCfeOT$cq7t(V$u{uPD}zxT;4zKh^U*D#vszjVZ#+ zBB3aWx#9NyX2djQO`sqY!9uE7p_Xs}Ywo2mUDTLE6hTuc{I6&)2Dodn59LdXn=#C* zi=V)RC0M3?0kYcaqoy2FwO*?)KpGlSe(MU`4iPw2ymSQ(>0vCqI26?lA#HS>g@)&2 zQj5#+9G5$aa+~|-6bHU>H>X0|v~5FoCbU3Fb3RRF6st>Mdr2=sUn#kkMe6Gb{B22> z8y7-MF@l-=iwOc9r4oj!mwtiTcb2tb@!c*>V0`@38CEt#_Gja$uuK6k;+ElcFHt?PxAAl>(6}Y=-dIh}KIsuz} zi&4|Jq61#^1(VvCC%AUOo6-3*6gJQ4wB!$HF=|?Bg!iYg-)LryKi^^kUTZ1Lptiu8 z*1RNgt&?w{5N~CDmOB40s6~G>ocvpnZw{DoRf~AOuQdU#c2`n!yFJ{_Ex=rk-c*WR zY(En$U=;AmT6Vuzb<|Z38cpkvGcxQUO4=-a=s>3Lf{V1!{B=%Rf=PUc3r@EAh}1edxX2NY^=jT%#I3 z?%#zmHq!g;v#}En*WB4~_a~*cp+AIC*k5hy%Fk^h>dLluH46WDyUHFMy2`j})9yC3 z9^387$xz@q&W`VKvY+P*YT@*=S#b2Bw;VJKh0iUANA{l2LdqY48}=QtKY#e?`D!O0 zotaY$p53>cv$q@ot}RI@8&|dV{~D4)cOE!cSAac=cNED*Q;?WW9qd}b+LIs=6%Lo> zkReerlyR;EI)?8;i}7ItW!8x3q^RK=sVSg}HV}&qsUa(jJ6$8;GDd7>7<)huQEY}J z#SzxxmqwNV87*E*pP8-6m1>y1Z(4yu4hau=yd6xJqN)d(dxa9=yZ2EpHtJcf#~ zsinC7<5X7xGP$CPLu$-aJ;eTU>JWD$j&4?5Hi@nuLz;p!C>#(BEWXByFCx)J&BjKg z*KYoC6$#{tKmnZd-QKF1tc?41DKKdpku{^~h0 zIIw^7+{eH7ubcbuAE<*h&(|+a_HS!{-=^8ADavF>+S<0cIf?e_^EH=n6;vVr!%nFRRlDp05Ifb#p6!t3_CXtC$z zCv)xh-*9E;`r6d)_O_NDTS1lI+p2!H4