From 99975da14042557a678e3bc0f7dd818c0a06128b Mon Sep 17 00:00:00 2001 From: Stasiek Michalski Date: Wed, 6 Jun 2018 06:58:39 +0200 Subject: [PATCH 001/253] Add classes for limiting height on breakpoints --- resources/assets/sass/custom.scss | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/resources/assets/sass/custom.scss b/resources/assets/sass/custom.scss index 33a15a998..2e95bda76 100644 --- a/resources/assets/sass/custom.scss +++ b/resources/assets/sass/custom.scss @@ -203,3 +203,26 @@ body, button, input, textarea { height: .25rem; animation: loading-bar 3s linear infinite; } + +.max-hide-overflow { + max-height: 500px; + overflow-y: hidden; +} + +@media (min-width: map-get($grid-breakpoints, "xs")) { + .max-hide-overflow { + max-height: 600px!important; + } +} + +@media (min-width: map-get($grid-breakpoints, "md")) { + .max-hide-overflow { + max-height: 800px!important; + } +} + +@media (min-width: map-get($grid-breakpoints, "xl")) { + .max-hide-overflow { + max-height: 1000px!important; + } +} From 28535a641603e9568d1c15ea958535b0228ea83b Mon Sep 17 00:00:00 2001 From: Stasiek Michalski Date: Wed, 6 Jun 2018 07:02:28 +0200 Subject: [PATCH 002/253] Fix squashed avatars and long images in timelines --- resources/views/status/template.blade.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/resources/views/status/template.blade.php b/resources/views/status/template.blade.php index b91ac18bc..f162b1fe7 100644 --- a/resources/views/status/template.blade.php +++ b/resources/views/status/template.blade.php @@ -1,6 +1,6 @@
- + {{$item->profile->username}} @@ -28,7 +28,7 @@
- +
@@ -100,4 +100,4 @@
- \ No newline at end of file + From c4b8f3dc790c245f8fba7e69331d17dd01f9fa57 Mon Sep 17 00:00:00 2001 From: Stasiek Michalski Date: Wed, 6 Jun 2018 16:03:35 +0200 Subject: [PATCH 003/253] Add titles to icons --- resources/views/layouts/partial/nav.blade.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/resources/views/layouts/partial/nav.blade.php b/resources/views/layouts/partial/nav.blade.php index bcb4bfbd2..d9015393b 100644 --- a/resources/views/layouts/partial/nav.blade.php +++ b/resources/views/layouts/partial/nav.blade.php @@ -1,6 +1,6 @@ +@auth +@endauth \ No newline at end of file From aa32b8020cbd78a29157a670d2fd0a636c07db9c Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Thu, 14 Jun 2018 01:42:47 -0600 Subject: [PATCH 057/253] Update status template --- app/Http/Controllers/AccountController.php | 6 +++--- resources/views/status/template.blade.php | 8 +------- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/app/Http/Controllers/AccountController.php b/app/Http/Controllers/AccountController.php index 999f6b711..9f03ef728 100644 --- a/app/Http/Controllers/AccountController.php +++ b/app/Http/Controllers/AccountController.php @@ -41,7 +41,7 @@ class AccountController extends Controller if(EmailVerification::whereUserId(Auth::id())->count() !== 0) { return redirect()->back()->with('status', 'A verification email has already been sent! Please check your email.'); } - + $user = User::whereNull('email_verified_at')->find(Auth::id()); $utoken = hash('sha512', $user->id); $rtoken = str_random(40); @@ -60,8 +60,8 @@ class AccountController extends Controller public function confirmVerifyEmail(Request $request, $userToken, $randomToken) { - $verify = EmailVerification::where(DB::raw('BINARY `user_token`'), $userToken) - ->where(DB::raw('BINARY `random_token`'), $randomToken) + $verify = EmailVerification::where(DB::raw('BINARY user_token'), $userToken) + ->where(DB::raw('BINARY random_token'), $randomToken) ->firstOrFail(); if(Auth::id() === $verify->user_id) { $user = User::find(Auth::id()); diff --git a/resources/views/status/template.blade.php b/resources/views/status/template.blade.php index 7a3910887..baf37c296 100644 --- a/resources/views/status/template.blade.php +++ b/resources/views/status/template.blade.php @@ -74,7 +74,7 @@ @if($item->comments()->count() > 3)
- Load more comments + Load more comments
@endif
@@ -93,12 +93,6 @@

@else - @foreach($item->comments->reverse()->take(3) as $comment) -

- {{$comment->profile->username}} - {!! str_limit($item->rendered ?? e($item->caption), 150) !!} -

- @endforeach @endif
From 56b18f3e08801dd6f4071eceae06d531a0a18c7c Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Thu, 14 Jun 2018 20:54:05 -0600 Subject: [PATCH 058/253] Update ImageOptimizePipeline, do not optimize gifs --- app/Jobs/ImageOptimizePipeline/ImageUpdate.php | 5 ++++- app/Util/Media/Image.php | 4 ++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/app/Jobs/ImageOptimizePipeline/ImageUpdate.php b/app/Jobs/ImageOptimizePipeline/ImageUpdate.php index fab0975ba..5b21ea7e9 100644 --- a/app/Jobs/ImageOptimizePipeline/ImageUpdate.php +++ b/app/Jobs/ImageOptimizePipeline/ImageUpdate.php @@ -38,7 +38,10 @@ class ImageUpdate implements ShouldQueue $thumb = storage_path('app/'. $media->thumbnail_path); try { ImageOptimizer::optimize($thumb); - ImageOptimizer::optimize($path); + if($media->mime !== 'image/gif') + { + ImageOptimizer::optimize($path); + } } catch (Exception $e) { return; } diff --git a/app/Util/Media/Image.php b/app/Util/Media/Image.php index db7641fd3..3f67d43f5 100644 --- a/app/Util/Media/Image.php +++ b/app/Util/Media/Image.php @@ -103,6 +103,10 @@ class Image { $ratio = $this->getAspectRatio($file, $thumbnail); $aspect = $ratio['dimensions']; $orientation = $ratio['orientation']; + if($media->mime === 'image/gif' && !$thumbnail) + { + return; + } try { $img = Intervention::make($file)->orientate(); From 3adcedc1a6fe353b798d985dca1726fb0df2fc83 Mon Sep 17 00:00:00 2001 From: Stasiek Michalski Date: Fri, 15 Jun 2018 08:05:37 +0200 Subject: [PATCH 059/253] Fix #269 --- resources/views/status/show.blade.php | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/resources/views/status/show.blade.php b/resources/views/status/show.blade.php index 8d2e27d67..a28930c03 100644 --- a/resources/views/status/show.blade.php +++ b/resources/views/status/show.blade.php @@ -87,23 +87,23 @@
-
+
- +

@if(Auth::check()) @if(Auth::user()->profile->id === $status->profile->id || Auth::user()->is_admin == true)
@csrf -
@endif @@ -112,8 +112,8 @@
@csrf -
From 34e3839141a6095847782069aae1e61b5274b41d Mon Sep 17 00:00:00 2001 From: Stasiek Michalski Date: Fri, 15 Jun 2018 08:16:44 +0200 Subject: [PATCH 060/253] Fix #369 in status template --- resources/views/status/template.blade.php | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/resources/views/status/template.blade.php b/resources/views/status/template.blade.php index baf37c296..8b8f03481 100644 --- a/resources/views/status/template.blade.php +++ b/resources/views/status/template.blade.php @@ -44,20 +44,22 @@ @endif
-
- From 58685f3b0e15db1087b4acb44db23e430d626a3a Mon Sep 17 00:00:00 2001 From: Stasiek Michalski Date: Fri, 15 Jun 2018 08:34:08 +0200 Subject: [PATCH 061/253] Make cards flush on mobile --- resources/views/timeline/personal.blade.php | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/resources/views/timeline/personal.blade.php b/resources/views/timeline/personal.blade.php index 48a061a96..4ba2e9ca4 100644 --- a/resources/views/timeline/personal.blade.php +++ b/resources/views/timeline/personal.blade.php @@ -6,8 +6,8 @@ @section('content') -
-
+
+
@if ($errors->any())