From 553ba55e8c3f482481042588b88ff025ce4e2103 Mon Sep 17 00:00:00 2001 From: Sven Fischer Date: Sat, 7 Dec 2019 11:37:54 +0100 Subject: [PATCH 1/3] docker.apache: remove imagick cause gd is sufficient. It's either imagick or gd required. --- contrib/docker/Dockerfile.apache | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/contrib/docker/Dockerfile.apache b/contrib/docker/Dockerfile.apache index 7485a3f4e..d34704a5e 100644 --- a/contrib/docker/Dockerfile.apache +++ b/contrib/docker/Dockerfile.apache @@ -18,8 +18,7 @@ RUN apt-get update \ --with-webp \ --with-xpm \ && docker-php-ext-install pdo_mysql pdo_pgsql pdo_sqlite pcntl gd exif bcmath intl zip curl \ - && pecl install imagick \ - && docker-php-ext-enable imagick pcntl imagick gd exif zip curl \ + && docker-php-ext-enable pcntl gd exif zip curl \ && a2enmod rewrite remoteip \ && {\ echo RemoteIPHeader X-Real-IP ;\ From c2826fd3fd51bef0e6cae7169e2a2ea26d5f96ba Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Sat, 7 Dec 2019 19:43:46 -0700 Subject: [PATCH 2/3] Update CollectionController, increase collection limit from 18 to 50 --- app/Http/Controllers/CollectionController.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Http/Controllers/CollectionController.php b/app/Http/Controllers/CollectionController.php index c2c62350d..588340a35 100644 --- a/app/Http/Controllers/CollectionController.php +++ b/app/Http/Controllers/CollectionController.php @@ -121,8 +121,8 @@ class CollectionController extends Controller $collection = Collection::whereProfileId($profileId)->findOrFail($collectionId); $count = $collection->items()->count(); - if($count >= 18) { - abort(400, 'You can only add 18 posts per collection'); + if($count >= 50) { + abort(400, 'You can only add 50 posts per collection'); } $status = Status::whereScope('public') From 73f2f98eb01caf3b7093d705df6216d22bea8d7f Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Sat, 7 Dec 2019 19:44:44 -0700 Subject: [PATCH 3/3] Update changelog --- CHANGELOG.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index dd6af630b..96fae72ae 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -52,7 +52,8 @@ - Updated ApiV1Controller, add ```mobile_apis``` to /api/v1/instance endpoint ([57407463](https://github.com/pixelfed/pixelfed/commit/57407463)) - Updated PublicTimelineService, add video media scopes ([7b00eba3](https://github.com/pixelfed/pixelfed/commit/7b00eba3)) - Updated PublicApiController, add AccountService ([5ebd2c8a](https://github.com/pixelfed/pixelfed/commit/5ebd2c8a)) -- Update CommentController, fix scope bug ([45ecad2a](https://github.com/pixelfed/pixelfed/45ecad2a)) +- Updated CommentController, fix scope bug ([45ecad2a](https://github.com/pixelfed/pixelfed/45ecad2a)) +- Updated CollectionController, increase limit from 18 to 50. ([c2826fd3](https://github.com/pixelfed/pixelfed/c2826fd3)) ## Deprecated