From c3d3dc14031c44510b948ad17b4c395906603cc6 Mon Sep 17 00:00:00 2001 From: Sjors Ottjes Date: Thu, 21 Dec 2017 17:00:07 +0100 Subject: [PATCH 1/7] Add comment with the value of the hashed password --- database/factories/UserFactory.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/database/factories/UserFactory.php b/database/factories/UserFactory.php index 7cf91833..facf2337 100644 --- a/database/factories/UserFactory.php +++ b/database/factories/UserFactory.php @@ -17,7 +17,7 @@ return [ 'name' => $faker->name, 'email' => $faker->unique()->safeEmail, - 'password' => '$2y$10$TKh8H1.PfQx37YgCzwiKb.KjNyWgaHb9cbcoQgdIVFlYg7B77UdFm', + 'password' => '$2y$10$TKh8H1.PfQx37YgCzwiKb.KjNyWgaHb9cbcoQgdIVFlYg7B77UdFm', // secret 'remember_token' => str_random(10), ]; }); From a38c115f4bd02dca5e90865e6631113f68bbd5f8 Mon Sep 17 00:00:00 2001 From: Przemek Dziewa Date: Sat, 23 Dec 2017 23:41:57 +0100 Subject: [PATCH 2/7] Update Echo options for pusher in bootstrap.js --- resources/assets/js/bootstrap.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/resources/assets/js/bootstrap.js b/resources/assets/js/bootstrap.js index 8e0f04e5..a4a44980 100644 --- a/resources/assets/js/bootstrap.js +++ b/resources/assets/js/bootstrap.js @@ -49,5 +49,7 @@ if (token) { // window.Echo = new Echo({ // broadcaster: 'pusher', -// key: 'your-pusher-key' +// key: 'your-pusher-key', +// cluster: 'eu', +// encrypted: true // }); From aad59400e2d69727224a3ca9b6aa9f9d7c87e9f7 Mon Sep 17 00:00:00 2001 From: Taylor Otwell Date: Sat, 23 Dec 2017 20:08:55 -0600 Subject: [PATCH 3/7] Update bootstrap.js --- resources/assets/js/bootstrap.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/assets/js/bootstrap.js b/resources/assets/js/bootstrap.js index a4a44980..bd954e90 100644 --- a/resources/assets/js/bootstrap.js +++ b/resources/assets/js/bootstrap.js @@ -50,6 +50,6 @@ if (token) { // window.Echo = new Echo({ // broadcaster: 'pusher', // key: 'your-pusher-key', -// cluster: 'eu', +// cluster: 'mt1', // encrypted: true // }); From 84b126d90df59c5ac1946978b8f7bc265b019117 Mon Sep 17 00:00:00 2001 From: Mohamed Said Date: Sun, 24 Dec 2017 13:22:35 +0200 Subject: [PATCH 4/7] include cluster in pusher config --- .env.example | 1 + config/broadcasting.php | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.env.example b/.env.example index 91ba58f0..c18e2f74 100644 --- a/.env.example +++ b/.env.example @@ -32,3 +32,4 @@ MAIL_ENCRYPTION=null PUSHER_APP_ID= PUSHER_APP_KEY= PUSHER_APP_SECRET= +PUSHER_APP_CLUSTER= diff --git a/config/broadcasting.php b/config/broadcasting.php index 5eecd2b2..4db108db 100644 --- a/config/broadcasting.php +++ b/config/broadcasting.php @@ -36,7 +36,8 @@ 'secret' => env('PUSHER_APP_SECRET'), 'app_id' => env('PUSHER_APP_ID'), 'options' => [ - // + 'encrypted' => true, + 'cluster' => env('PUSHER_APP_CLUSTER') ], ], From 80b59fd375effd36e56fec87112e7fc4dbc12283 Mon Sep 17 00:00:00 2001 From: Mohamed Said Date: Sun, 24 Dec 2017 13:24:14 +0200 Subject: [PATCH 5/7] fix style --- config/broadcasting.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/broadcasting.php b/config/broadcasting.php index 4db108db..ea52e630 100644 --- a/config/broadcasting.php +++ b/config/broadcasting.php @@ -37,7 +37,7 @@ 'app_id' => env('PUSHER_APP_ID'), 'options' => [ 'encrypted' => true, - 'cluster' => env('PUSHER_APP_CLUSTER') + 'cluster' => env('PUSHER_APP_CLUSTER'), ], ], From a4af0b53185416e2278d577170c5f67bdada5d0c Mon Sep 17 00:00:00 2001 From: Taylor Otwell Date: Sun, 24 Dec 2017 08:11:34 -0600 Subject: [PATCH 6/7] Update broadcasting.php --- config/broadcasting.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/broadcasting.php b/config/broadcasting.php index ea52e630..3ca45eaa 100644 --- a/config/broadcasting.php +++ b/config/broadcasting.php @@ -36,8 +36,8 @@ 'secret' => env('PUSHER_APP_SECRET'), 'app_id' => env('PUSHER_APP_ID'), 'options' => [ - 'encrypted' => true, 'cluster' => env('PUSHER_APP_CLUSTER'), + 'encrypted' => true, ], ], From a32af97ede49fdd57e8217a9fd484b4cb4ab1bbf Mon Sep 17 00:00:00 2001 From: Taylor Otwell Date: Sun, 24 Dec 2017 08:11:41 -0600 Subject: [PATCH 7/7] Update .env.example --- .env.example | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.env.example b/.env.example index c18e2f74..cd06cc8d 100644 --- a/.env.example +++ b/.env.example @@ -32,4 +32,4 @@ MAIL_ENCRYPTION=null PUSHER_APP_ID= PUSHER_APP_KEY= PUSHER_APP_SECRET= -PUSHER_APP_CLUSTER= +PUSHER_APP_CLUSTER=mt1