From a66835fbfda7639b048947df9ef4c597b4eb3728 Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Tue, 10 Sep 2019 22:41:53 -0600 Subject: [PATCH 1/3] Update changelog --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7b5d230f9..465a0092c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,9 @@ ### Changed - Updated EmailService, added new domains [#1690](https://github.com/pixelfed/pixelfed/pull/1690) - Updated quill.js to v1.3.7 [#1692](https://github.com/pixelfed/pixelfed/pull/1690) + +## Deprecated +- Remove deprecated profile following/followers [#1697](https://github.com/pixelfed/pixelfed/pull/1697) ## [v0.10.3 (2019-09-08)](https://github.com/pixelfed/pixelfed/compare/v0.10.2...v0.10.3) From 39394327f06a8ddb266d20f51410d630a7b92e18 Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Tue, 10 Sep 2019 23:33:51 -0600 Subject: [PATCH 2/3] Update FollowController, fix private account bug --- app/Http/Controllers/FollowerController.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/app/Http/Controllers/FollowerController.php b/app/Http/Controllers/FollowerController.php index bd3f4b674..dfac38ce4 100644 --- a/app/Http/Controllers/FollowerController.php +++ b/app/Http/Controllers/FollowerController.php @@ -27,7 +27,11 @@ class FollowerController extends Controller ]); $item = (int) $request->input('item'); $this->handleFollowRequest($item); - return response()->json(200); + if($request->wantsJson()) { + return response()->json(200); + } else { + return redirect()->back(); + } } protected function handleFollowRequest($item) From 23bb12413b93267bb586bcf2b4324f7b1735febc Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Tue, 10 Sep 2019 23:36:02 -0600 Subject: [PATCH 3/3] Update changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 465a0092c..eb207ae36 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ ### Fixed - Fixed count bug in StatusHashtagService [#1694](https://github.com/pixelfed/pixelfed/pull/1694) +- Fixed private account bug [#1699](https://github.com/pixelfed/pixelfed/pull/1699) ### Changed - Updated EmailService, added new domains [#1690](https://github.com/pixelfed/pixelfed/pull/1690)