From b15cf4f37be0a1a67fc6e1254e15a22db76e78c6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 13 Mar 2020 22:53:40 +0000 Subject: [PATCH 01/89] Bump acorn from 6.4.0 to 6.4.1 Bumps [acorn](https://github.com/acornjs/acorn) from 6.4.0 to 6.4.1. - [Release notes](https://github.com/acornjs/acorn/releases) - [Commits](https://github.com/acornjs/acorn/compare/6.4.0...6.4.1) Signed-off-by: dependabot[bot] --- package-lock.json | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/package-lock.json b/package-lock.json index 4824dc1c4..b4f697680 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1080,9 +1080,9 @@ } }, "acorn": { - "version": "6.4.0", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.4.0.tgz", - "integrity": "sha512-gac8OEcQ2Li1dxIEWGZzsp2BitJxwkwcOm0zHAJLcPJaVvm58FRnk6RkuLRpU1EujipU2ZFODv2P9DLMfnV8mw==" + "version": "6.4.1", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.4.1.tgz", + "integrity": "sha512-ZVA9k326Nwrj3Cj9jlh3wGFutC2ZornPNARZwsNYqQYgN0EsV2d53w5RN/co65Ohn4sUAUtb1rSUAOD6XN9idA==" }, "adjust-sourcemap-loader": { "version": "1.2.0", @@ -1306,7 +1306,7 @@ }, "util": { "version": "0.10.3", - "resolved": "http://registry.npmjs.org/util/-/util-0.10.3.tgz", + "resolved": "https://registry.npmjs.org/util/-/util-0.10.3.tgz", "integrity": "sha1-evsa/lCAUkZInj23/g7TeTNqwPk=", "requires": { "inherits": "2.0.1" @@ -1430,7 +1430,7 @@ }, "chalk": { "version": "1.1.3", - "resolved": "http://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", "requires": { "ansi-styles": "^2.2.1", @@ -1447,7 +1447,7 @@ }, "supports-color": { "version": "2.0.0", - "resolved": "http://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz", "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=" } } @@ -2497,12 +2497,12 @@ "dependencies": { "jsesc": { "version": "0.5.0", - "resolved": "http://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz", + "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz", "integrity": "sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=" }, "regexpu-core": { "version": "1.0.0", - "resolved": "http://registry.npmjs.org/regexpu-core/-/regexpu-core-1.0.0.tgz", + "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-1.0.0.tgz", "integrity": "sha1-hqdj9Y7k18L2sQLkdkBQ3n7ZDGs=", "requires": { "regenerate": "^1.2.1", @@ -2512,12 +2512,12 @@ }, "regjsgen": { "version": "0.2.0", - "resolved": "http://registry.npmjs.org/regjsgen/-/regjsgen-0.2.0.tgz", + "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.2.0.tgz", "integrity": "sha1-bAFq3qxVT3WCP+N6wFuS1aTtsfc=" }, "regjsparser": { "version": "0.1.5", - "resolved": "http://registry.npmjs.org/regjsparser/-/regjsparser-0.1.5.tgz", + "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.1.5.tgz", "integrity": "sha1-fuj4Tcb6eS0/0K4ijSS9lJ6tIFw=", "requires": { "jsesc": "~0.5.0" @@ -2758,7 +2758,7 @@ "dependencies": { "globby": { "version": "6.1.0", - "resolved": "http://registry.npmjs.org/globby/-/globby-6.1.0.tgz", + "resolved": "https://registry.npmjs.org/globby/-/globby-6.1.0.tgz", "integrity": "sha1-9abXDoOV4hyFj7BInWTfAkJNUGw=", "requires": { "array-union": "^1.0.1", @@ -2770,7 +2770,7 @@ "dependencies": { "pify": { "version": "2.3.0", - "resolved": "http://registry.npmjs.org/pify/-/pify-2.3.0.tgz", + "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=" } } @@ -3263,7 +3263,7 @@ "dependencies": { "array-flatten": { "version": "1.1.1", - "resolved": "http://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz", + "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz", "integrity": "sha1-ml9pkFGx5wczKPKgCJaLZOopVdI=" }, "debug": { @@ -3606,7 +3606,7 @@ }, "chalk": { "version": "1.1.3", - "resolved": "http://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", "requires": { "ansi-styles": "^2.2.1", @@ -3618,7 +3618,7 @@ }, "supports-color": { "version": "2.0.0", - "resolved": "http://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz", "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=" } } @@ -4833,7 +4833,7 @@ }, "is-accessor-descriptor": { "version": "0.1.6", - "resolved": "http://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz", + "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz", "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=", "requires": { "kind-of": "^3.0.2" @@ -4887,7 +4887,7 @@ }, "is-data-descriptor": { "version": "0.1.4", - "resolved": "http://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz", + "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz", "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=", "requires": { "kind-of": "^3.0.2" @@ -7309,7 +7309,7 @@ }, "readable-stream": { "version": "2.3.6", - "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", "requires": { "core-util-is": "~1.0.0", @@ -7430,7 +7430,7 @@ "dependencies": { "jsesc": { "version": "0.5.0", - "resolved": "http://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz", + "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz", "integrity": "sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=" } } @@ -7611,7 +7611,7 @@ "dependencies": { "convert-source-map": { "version": "0.3.5", - "resolved": "http://registry.npmjs.org/convert-source-map/-/convert-source-map-0.3.5.tgz", + "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-0.3.5.tgz", "integrity": "sha1-8dgClQr33SYxof6+BZZVDIarMZA=", "dev": true } From 599f6a5273ee61fed7ad5f6f567e32cf242780d1 Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Sat, 14 Mar 2020 12:58:30 -0600 Subject: [PATCH 02/89] Remove unused config --- config/partialcache.php | 17 ----------------- 1 file changed, 17 deletions(-) delete mode 100644 config/partialcache.php diff --git a/config/partialcache.php b/config/partialcache.php deleted file mode 100644 index 7dce620b0..000000000 --- a/config/partialcache.php +++ /dev/null @@ -1,17 +0,0 @@ - true, - - // The name of the blade directive to register - 'directive' => 'cache', - - // The base key that used for cache items - 'key' => 'partialcache', - - // The default cache duration in minutes, set null to remember forever - 'default_duration' => null, - -]; From 664fd2724c77f2a53e198d9d262d09d030366d1e Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Sat, 14 Mar 2020 13:06:32 -0600 Subject: [PATCH 03/89] Update PostComponent, improve likes modal --- resources/assets/js/components/PostComponent.vue | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/resources/assets/js/components/PostComponent.vue b/resources/assets/js/components/PostComponent.vue index 9edc8ba86..4ecd02445 100644 --- a/resources/assets/js/components/PostComponent.vue +++ b/resources/assets/js/components/PostComponent.vue @@ -405,9 +405,9 @@ hide-footer centered title="Likes" - body-class="list-group-flush p-0"> + body-class="list-group-flush py-3 px-0">
-
+
@@ -418,9 +418,11 @@ {{user.username}}

-

- {{user.display_name}} - +

+ {{user.acct.split('@')[0]}}@{{user.acct.split('@')[1]}} +

+

+ {{user.display_name}}

@@ -959,7 +961,6 @@ export default { this.replyToIndex = index; this.replyingToId = e.id; this.reply_to_profile_id = e.account.id; - this.replyText = '@' + e.account.username + ' '; $('textarea[name="comment"]').focus(); }, From 336571d05acbe93195ab85980cd7b87a1a7c30bb Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Sat, 14 Mar 2020 13:12:54 -0600 Subject: [PATCH 04/89] Update StoryViewer, preload media --- .../assets/js/components/StoryViewer.vue | 47 +++++++++++++++---- 1 file changed, 37 insertions(+), 10 deletions(-) diff --git a/resources/assets/js/components/StoryViewer.vue b/resources/assets/js/components/StoryViewer.vue index 98361ed4f..9c7144d75 100644 --- a/resources/assets/js/components/StoryViewer.vue +++ b/resources/assets/js/components/StoryViewer.vue @@ -27,6 +27,7 @@ return { loading: true, stories: {}, + preloadIndex: null } }, @@ -36,14 +37,43 @@ methods: { fetchStories() { + let self = this; axios.get('/api/stories/v0/profile/' + this.pid) .then(res => { - let data = res.data; - if(data.length == 0) { + self.stories = res.data; + if(res.data.length == 0) { window.location.href = '/'; return; } - window._storyData = data; + self.preloadImages(); + }) + .catch(err => { + console.log(err); + // window.location.href = '/'; + return; + }); + }, + + preloadImages() { + let self = this; + for (var i = 0; i < this.stories[0].items.length; i++) { + var preload = new Image(); + $(preload).on('load', function() { + + self.preloadIndex = i; + if(i == self.stories[0].items.length) { + self.loadViewer(); + return; + } + }); + preload.src = self.stories[0].items[i].src; + } + }, + + loadViewer() { + let data = this.stories; + + if(!window.stories) { window.stories = new Zuck('storyContainer', { stories: data, localStorage: false, @@ -67,15 +97,12 @@ }, } }); - this.loading = false; + this.loading = false; // todo: refactor this mess - document.querySelectorAll('#storyContainer .story')[0].click() - }) - .catch(err => { - window.location.href = '/'; - return; - }); + document.querySelectorAll('#storyContainer .story')[0].click(); + } + return; } } } From fdf5975301b3b197784667dfd81bc29c5880564d Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Sat, 14 Mar 2020 13:14:26 -0600 Subject: [PATCH 05/89] Update StoryCompose, add expand label for lightbox preview --- resources/assets/js/components/StoryCompose.vue | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/resources/assets/js/components/StoryCompose.vue b/resources/assets/js/components/StoryCompose.vue index 84ac8072c..c3d7ae458 100644 --- a/resources/assets/js/components/StoryCompose.vue +++ b/resources/assets/js/components/StoryCompose.vue @@ -95,7 +95,10 @@
- +
+ +

(expand)

+

Expires

{{expiresTimestamp(story.expires_at)}}

From 44d70312aee304e14d51cf65bfc4ba1866167c78 Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Sat, 14 Mar 2020 13:15:27 -0600 Subject: [PATCH 06/89] Update changelog --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2642f52cd..3b01ebbb6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -25,6 +25,9 @@ - Updated AdminUserController, add account deletion handler ([9be19ad8](https://github.com/pixelfed/pixelfed/commit/9be19ad8)) - Updated ContactController, fixes #2042 ([c9057e87](https://github.com/pixelfed/pixelfed/commit/c9057e87)) - Updated Media model, fix remote media preview ([9947050b](https://github.com/pixelfed/pixelfed/commit/9947050b)) +- Updated PostComponent, improve likes modal ([664fd272](https://github.com/pixelfed/pixelfed/commit/664fd272)) +- Updated StoryViewer, preload media ([336571d0](https://github.com/pixelfed/pixelfed/commit/336571d0)) +- Updated StoryCompose, add expand label for lightbox preview ([fdf59753](https://github.com/pixelfed/pixelfed/commit/fdf59753)) ## [v0.10.8 (2020-01-29)](https://github.com/pixelfed/pixelfed/compare/v0.10.7...v0.10.8) ### Added From 7bf9e78f8e7de8d4ec0ec33d996c55055c59a7cc Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Sat, 14 Mar 2020 21:21:45 -0600 Subject: [PATCH 07/89] Update PublicApiController --- app/Http/Controllers/PublicApiController.php | 28 +++++++++++++++++--- 1 file changed, 24 insertions(+), 4 deletions(-) diff --git a/app/Http/Controllers/PublicApiController.php b/app/Http/Controllers/PublicApiController.php index 7c7f19464..865d9e919 100644 --- a/app/Http/Controllers/PublicApiController.php +++ b/app/Http/Controllers/PublicApiController.php @@ -499,11 +499,31 @@ class PublicApiController extends Controller public function accountFollowing(Request $request, $id) { abort_unless(Auth::check(), 403); - $profile = Profile::with('user')->whereNull('status')->whereNull('domain')->findOrFail($id); - if(Auth::id() != $profile->user_id && $profile->is_private || !$profile->user->settings->show_profile_following) { - return response()->json([]); + + $profile = Profile::with('user') + ->whereNull('status') + ->whereNull('domain') + ->findOrFail($id); + + // filter by username + $search = $request->input('fbu'); + $owner = Auth::id() == $profile->user_id; + $filter = ($owner == true) && ($search != null); + + abort_if($owner == false && $profile->is_private == true && !$profile->followedBy(Auth::user()->profile), 404); + abort_if($profile->user->settings->show_profile_following == false && $owner == false, 404); + + if($search) { + abort_if(!$owner, 404); + $following = $profile->following() + ->where('profiles.username', 'like', '%'.$search.'%') + ->orderByDesc('followers.created_at') + ->paginate(10); + } else { + $following = $profile->following() + ->orderByDesc('followers.created_at') + ->paginate(10); } - $following = $profile->following()->orderByDesc('followers.created_at')->paginate(10); $resource = new Fractal\Resource\Collection($following, new AccountTransformer()); $res = $this->fractal->createData($resource)->toArray(); From e3280c11ca6966c1f8343d635de38ead11520c99 Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Sat, 14 Mar 2020 21:22:13 -0600 Subject: [PATCH 08/89] Update Profile.vue component --- resources/assets/js/components/Profile.vue | 78 +++++++++++++++++++--- 1 file changed, 68 insertions(+), 10 deletions(-) diff --git a/resources/assets/js/components/Profile.vue b/resources/assets/js/components/Profile.vue index db2a13d29..ede8a1cdf 100644 --- a/resources/assets/js/components/Profile.vue +++ b/resources/assets/js/components/Profile.vue @@ -355,26 +355,47 @@
- -
+
+
+ + + + +
+
+ + +
+
+ +
-
+

{{user.username}}

-

+

+ {{user.acct.split('@')[0]}}@{{user.acct.split('@')[1]}} +

+

{{user.display_name}}

@@ -383,12 +404,12 @@
-
-
-

+
+
+

No Results Found

-
+

Load more

@@ -565,6 +586,14 @@ padding: 6px; background:#fff; } + .no-focus { + border-color: none; + outline: 0; + box-shadow: none; + } + .modal-tab-active { + border-bottom: 1px solid #08d; + } - \ No newline at end of file diff --git a/resources/assets/js/components/RemoteProfile.vue b/resources/assets/js/components/RemoteProfile.vue new file mode 100644 index 000000000..8bca17c0d --- /dev/null +++ b/resources/assets/js/components/RemoteProfile.vue @@ -0,0 +1,375 @@ + + + + + \ No newline at end of file diff --git a/resources/assets/js/rempos.js b/resources/assets/js/rempos.js new file mode 100644 index 000000000..41bf90d0b --- /dev/null +++ b/resources/assets/js/rempos.js @@ -0,0 +1,34 @@ +Vue.component( + 'photo-presenter', + require('./components/presenter/PhotoPresenter.vue').default +); + +Vue.component( + 'video-presenter', + require('./components/presenter/VideoPresenter.vue').default +); + +Vue.component( + 'photo-album-presenter', + require('./components/presenter/PhotoAlbumPresenter.vue').default +); + +Vue.component( + 'video-album-presenter', + require('./components/presenter/VideoAlbumPresenter.vue').default +); + +Vue.component( + 'mixed-album-presenter', + require('./components/presenter/MixedAlbumPresenter.vue').default +); + +Vue.component( + 'post-menu', + require('./components/PostMenu.vue').default +); + +Vue.component( + 'remote-post', + require('./components/RemotePost.vue').default +); \ No newline at end of file diff --git a/resources/assets/js/rempro.js b/resources/assets/js/rempro.js new file mode 100644 index 000000000..766b52ec3 --- /dev/null +++ b/resources/assets/js/rempro.js @@ -0,0 +1,4 @@ +Vue.component( + 'remote-profile', + require('./components/RemoteProfile.vue').default +); \ No newline at end of file diff --git a/resources/views/profile/remote.blade.php b/resources/views/profile/remote.blade.php new file mode 100644 index 000000000..106286b3e --- /dev/null +++ b/resources/views/profile/remote.blade.php @@ -0,0 +1,16 @@ +@extends('layouts.app') + +@section('content') + +@endsection + +@push('meta') + +@endpush + +@push('scripts') + + +@endpush diff --git a/resources/views/status/remote.blade.php b/resources/views/status/remote.blade.php new file mode 100644 index 000000000..f36a2f4be --- /dev/null +++ b/resources/views/status/remote.blade.php @@ -0,0 +1,17 @@ +@extends('layouts.app') + +@section('content') +
+ + + +@endsection + +@push('meta') + +@endpush + +@push('scripts') + + +@endpush diff --git a/routes/web.php b/routes/web.php index b1d9f11aa..487a38d7c 100644 --- a/routes/web.php +++ b/routes/web.php @@ -263,6 +263,8 @@ Route::domain(config('pixelfed.domain.app'))->middleware(['validemail', 'twofact Route::post('stories/viewed', 'StoryController@apiV1Viewed'); Route::get('stories/new', 'StoryController@compose'); Route::get('my/story', 'StoryController@iRedirect'); + Route::get('web/profile/_/{id}', 'InternalApiController@remoteProfile'); + Route::get('web/post/_/{profileId}/{statusid}', 'InternalApiController@remoteStatus'); }); Route::group(['prefix' => 'account'], function () { diff --git a/webpack.mix.js b/webpack.mix.js index c519076c5..315527f8c 100644 --- a/webpack.mix.js +++ b/webpack.mix.js @@ -38,6 +38,9 @@ mix.js('resources/assets/js/app.js', 'public/js') // .js('resources/assets/js/direct.js', 'public/js') // .js('resources/assets/js/admin.js', 'public/js') // .js('resources/assets/js/micro.js', 'public/js') +.js('resources/assets/js/rempro.js', 'public/js') +.js('resources/assets/js/rempos.js', 'public/js') +//.js('resources/assets/js/timeline_next.js', 'public/js') .extract([ 'lodash', From 59d14fd9a850edd73f08447ab905282e42558fab Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Wed, 8 Apr 2020 21:36:18 -0600 Subject: [PATCH 49/89] Update changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index e7e4a33b0..e9bd619e9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ - Added Profile Following Search ([e3280c11](https://github.com/pixelfed/pixelfed/commit/e3280c11)) - Added Trusted Devices to Sudo Mode ([0c82c970](https://github.com/pixelfed/pixelfed/commit/0c82c970)) - Added reply modal to posts and timelines ([974e6bda](https://github.com/pixelfed/pixelfed/commit/974e6bda)) +- Added remote posts and profiles ([95bce31e](https://github.com/pixelfed/pixelfed/commit/95bce31e)) ### Fixed - Stories on postgres instances ([5ffa71da](https://github.com/pixelfed/pixelfed/commit/5ffa71da)) From d41470830b7b78787f7586f2f4f30709afadefc6 Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Wed, 8 Apr 2020 21:42:02 -0600 Subject: [PATCH 50/89] Update Timeline.vue, add remote post/profile links --- resources/assets/js/components/Timeline.vue | 26 +++++++-------------- 1 file changed, 8 insertions(+), 18 deletions(-) diff --git a/resources/assets/js/components/Timeline.vue b/resources/assets/js/components/Timeline.vue index 8e8279f06..f9e6db660 100644 --- a/resources/assets/js/components/Timeline.vue +++ b/resources/assets/js/components/Timeline.vue @@ -1411,22 +1411,19 @@ }, statusUrl(status) { - return status.url; + if(status.local == true) { + return status.url; + } - // if(status.local == true) { - // return status.url; - // } - - // return '/i/web/post/_/' + status.account.id + '/' + status.id; + return '/i/web/post/_/' + status.account.id + '/' + status.id; }, profileUrl(status) { - return status.account.url; - // if(status.local == true) { - // return status.account.url; - // } + if(status.local == true) { + return status.account.url; + } - // return '/i/web/profile/_/' + status.account.id; + return '/i/web/profile/_/' + status.account.id; }, statusCardUsernameFormat(status) { @@ -1480,13 +1477,6 @@ .then(res => { this.userStory = res.data; }) - }, - - usernameLookup(text, cb) { - axios.get('/api/pixelfed/v2/username/lookup?q=' + text) - .then(res => { - cb(res.data); - }); } } } From 1692a95a98bd6f1256f8e17a30017225cde4e863 Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Wed, 8 Apr 2020 22:03:46 -0600 Subject: [PATCH 51/89] Update StoryTimelineComponent, added list prop for new timeline layout --- resources/assets/js/components/StoryTimelineComponent.vue | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/resources/assets/js/components/StoryTimelineComponent.vue b/resources/assets/js/components/StoryTimelineComponent.vue index bcc318bea..397d091b5 100644 --- a/resources/assets/js/components/StoryTimelineComponent.vue +++ b/resources/assets/js/components/StoryTimelineComponent.vue @@ -1,7 +1,7 @@ @@ -18,6 +18,7 @@ let Zuck = require('zuck.js'); export default { + props: ['list'], data() { return { stories: {}, @@ -34,6 +35,7 @@ .then(res => { let data = res.data; let stories = new Zuck('storyContainer', { + list: this.list == true ? true : false, stories: data, localStorage: true, callbacks: { From 2a3fd8771d106702577ddf8a25478fa16ca3aa3c Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Fri, 10 Apr 2020 21:23:48 -0600 Subject: [PATCH 52/89] Update StoryGC command --- app/Console/Commands/StoryGC.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/Console/Commands/StoryGC.php b/app/Console/Commands/StoryGC.php index 82eda89f9..685714a75 100644 --- a/app/Console/Commands/StoryGC.php +++ b/app/Console/Commands/StoryGC.php @@ -54,7 +54,7 @@ class StoryGC extends Command { $day = now()->day; - if($day !== 3) { + if($day != 3) { return; } @@ -81,12 +81,12 @@ class StoryGC extends Command protected function deleteViews() { - StoryView::where('created_at', '<', now()->subDays(2))->delete(); + StoryView::where('created_at', '<', now()->subMinutes(1441))->delete(); } protected function deleteStories() { - $stories = Story::where('expires_at', '<', now())->take(50)->get(); + $stories = Story::where('created_at', '<', now()->subMinutes(1441))->take(50)->get(); if($stories->count() == 0) { exit; From 4a293ed91127806bed718e3b73ff7138b975abee Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Fri, 10 Apr 2020 21:28:51 -0600 Subject: [PATCH 53/89] Update blank layout, add sharedData js --- resources/views/layouts/blank.blade.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/resources/views/layouts/blank.blade.php b/resources/views/layouts/blank.blade.php index 24f4bd6f3..2d38e319d 100644 --- a/resources/views/layouts/blank.blade.php +++ b/resources/views/layouts/blank.blade.php @@ -26,11 +26,11 @@ @stack('styles') - + - -
+ +
@yield('content')
From 9b215001e39c5bbf5fbca8ee663f159b6ed9dc1d Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Fri, 10 Apr 2020 21:59:15 -0600 Subject: [PATCH 54/89] Add Labs deprecation page --- resources/views/settings/labs.blade.php | 3 +++ .../site/help/labs-deprecation.blade.php | 21 +++++++++++++++++++ .../site/help/partial/template.blade.php | 6 ------ routes/web.php | 2 ++ 4 files changed, 26 insertions(+), 6 deletions(-) create mode 100644 resources/views/site/help/labs-deprecation.blade.php diff --git a/resources/views/settings/labs.blade.php b/resources/views/settings/labs.blade.php index 7afcda74d..9a74b1b9f 100644 --- a/resources/views/settings/labs.blade.php +++ b/resources/views/settings/labs.blade.php @@ -9,6 +9,9 @@
Warning: Some experimental features may contain bugs or missing functionality
+
+ We are deprecating Labs in a future version. Some features will no longer be supported. For more information, click here. +

UI


diff --git a/resources/views/site/help/labs-deprecation.blade.php b/resources/views/site/help/labs-deprecation.blade.php new file mode 100644 index 000000000..65f792200 --- /dev/null +++ b/resources/views/site/help/labs-deprecation.blade.php @@ -0,0 +1,21 @@ +@extends('site.help.partial.template', ['breadcrumb'=>'Labs Deprecation']) + +@section('section') + +
+

Labs Deprecation

+
+
+

We are deprecating Labs in a future version. No new experiments will be released. We will give 6 months notice before removing Labs.

+
+

When will labs be deprecated?

+

TBA

+
+

What features will be deprecated?

+

TBA

+
+

Why is Labs being deprecated?

+

Labs was started in early 2019 to test experimental designs and features. Now the project is more mature, we are outgrowing some of these experiments.

+
+

Last Updated: April 10/2020

+@endsection \ No newline at end of file diff --git a/resources/views/site/help/partial/template.blade.php b/resources/views/site/help/partial/template.blade.php index 3d309998b..72646709b 100644 --- a/resources/views/site/help/partial/template.blade.php +++ b/resources/views/site/help/partial/template.blade.php @@ -3,12 +3,6 @@ @section('content')
-
-
-

Some sections may contain out of date information

-

We apologize for any inconvenience, we are working on updating the Help Center.

-
-
diff --git a/routes/web.php b/routes/web.php index 487a38d7c..39f5cc402 100644 --- a/routes/web.php +++ b/routes/web.php @@ -395,6 +395,8 @@ Route::domain(config('pixelfed.domain.app'))->middleware(['validemail', 'twofact Route::view('blocking-accounts', 'site.help.blocking-accounts')->name('help.blocking-accounts'); Route::view('report-something', 'site.help.report-something')->name('help.report-something'); Route::view('data-policy', 'site.help.data-policy')->name('help.data-policy'); + Route::view('labs-deprecation', 'site.help.labs-deprecation')->name('help.labs-deprecation'); + }); Route::get('newsroom/{year}/{month}/{slug}', 'NewsroomController@show'); Route::get('newsroom/archive', 'NewsroomController@archive'); From 6a3bd3357acc3f79c77101a82b9467dd1f287136 Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Fri, 10 Apr 2020 22:00:11 -0600 Subject: [PATCH 55/89] Update changelog --- CHANGELOG.md | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e9bd619e9..07c794997 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,7 +6,8 @@ - Added Trusted Devices to Sudo Mode ([0c82c970](https://github.com/pixelfed/pixelfed/commit/0c82c970)) - Added reply modal to posts and timelines ([974e6bda](https://github.com/pixelfed/pixelfed/commit/974e6bda)) - Added remote posts and profiles ([95bce31e](https://github.com/pixelfed/pixelfed/commit/95bce31e)) - +- Added Labs deprecation page ([9b215001](https://github.com/pixelfed/pixelfed/commit/9b215001)) + ### Fixed - Stories on postgres instances ([5ffa71da](https://github.com/pixelfed/pixelfed/commit/5ffa71da)) @@ -45,6 +46,11 @@ - Updated PostComponent.vue, remove like count from title, fixes [#2091](https://github.com/pixelfed/pixelfed/issues/2091) ([6026998c](https://github.com/pixelfed/pixelfed/commit/6026998c)) - Updated SearchController, add WebfingerService support ([869b4ff7](https://github.com/pixelfed/pixelfed/commit/869b4ff7)) - Updated Profile model, use change_count for version ([0eae9f8b](https://github.com/pixelfed/pixelfed/commit/0eae9f8b)) +- Updated Timeline.vue, add remote post/profile links ([d4147083](https://github.com/pixelfed/pixelfed/commit/d4147083)) +- Updated StoryTimelineComponent, added list prop for new timeline layout ([1692a95a](https://github.com/pixelfed/pixelfed/commit/1692a95a)) +- Updated blank layout, add sharedData js ([4a293ed9](https://github.com/pixelfed/pixelfed/commit/4a293ed9)) +- ([](https://github.com/pixelfed/pixelfed/commit/)) +- ([](https://github.com/pixelfed/pixelfed/commit/)) ## [v0.10.8 (2020-01-29)](https://github.com/pixelfed/pixelfed/compare/v0.10.7...v0.10.8) ### Added From e004915aeba8845f968c73ef708b705edd45d278 Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Fri, 10 Apr 2020 22:07:04 -0600 Subject: [PATCH 56/89] Update help center --- resources/views/site/help/discover.blade.php | 2 +- resources/views/site/help/hashtags.blade.php | 2 +- resources/views/site/help/timelines.blade.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/resources/views/site/help/discover.blade.php b/resources/views/site/help/discover.blade.php index 2235b8b59..8d2666f93 100644 --- a/resources/views/site/help/discover.blade.php +++ b/resources/views/site/help/discover.blade.php @@ -23,7 +23,7 @@
-
Discover Tips
+
Discover Tips
  • To make your posts more discoverable, add hashtags to your posts.
  • diff --git a/resources/views/site/help/hashtags.blade.php b/resources/views/site/help/hashtags.blade.php index 13733e4ac..2aa619679 100644 --- a/resources/views/site/help/hashtags.blade.php +++ b/resources/views/site/help/hashtags.blade.php @@ -54,7 +54,7 @@

-
Hashtag Tips
+
Hashtag Tips
  • You cannot add spaces or punctuation in a hashtag, or it will not work properly.
  • diff --git a/resources/views/site/help/timelines.blade.php b/resources/views/site/help/timelines.blade.php index e3d5bffc0..ff200925f 100644 --- a/resources/views/site/help/timelines.blade.php +++ b/resources/views/site/help/timelines.blade.php @@ -28,7 +28,7 @@
-
Timeline Tips
+
Timeline Tips
-
@@ -1013,6 +1012,16 @@ export default { window.location.href = url; }, + purl(profile, showOrigin = false) { + if(profile.local == true) { + return profile.url; + } else { + return showOrigin ? + profile.url : + '/i/web/profile/_/' + profile.id; + } + } + }, } \ No newline at end of file diff --git a/resources/assets/js/components/RemoteProfile.vue b/resources/assets/js/components/RemoteProfile.vue index 8bca17c0d..6ca1ea1d5 100644 --- a/resources/assets/js/components/RemoteProfile.vue +++ b/resources/assets/js/components/RemoteProfile.vue @@ -11,7 +11,7 @@
-
+
@@ -34,7 +34,7 @@

{{profile.display_name}}

{{profile.acct}}

-

+

{{profile.statuses_count}} @@ -54,20 +54,7 @@

-
-
- - - -
-
-
- - - -
- -
+
@@ -75,6 +62,11 @@ {{profile.username}}
+
+ +
@@ -142,6 +134,25 @@
+ +
+
Report inappropriate
+
Unfollow
+
Follow
+
Go to post
+
Copy Link
+
Moderation Tools
+
Delete
+
Cancel
+
+
@@ -161,9 +172,11 @@ max_id: null, loading: true, owner: false, - layoutType: false, + layoutType: true, relationship: null, warning: false, + ctxMenuStatus: false, + ctxMenuRelationship: false, } }, @@ -361,7 +374,66 @@ reportProfile() { window.location.href = '/l/i/report?type=profile&id=' + this.profileId; this.$refs.visitorContextMenu.hide(); - } + }, + + ctxMenu(status) { + this.ctxMenuStatus = status; + let self = this; + axios.get('/api/pixelfed/v1/accounts/relationships', { + params: { + 'id[]': self.profileId + } + }).then(res => { + self.ctxMenuRelationship = res.data[0]; + self.$refs.ctxModal.show(); + }); + }, + + closeCtxMenu() { + this.ctxMenuStatus = false; + this.ctxMenuRelationship = false; + this.$refs.ctxModal.hide(); + }, + + ctxMenuCopyLink() { + let status = this.ctxMenuStatus; + navigator.clipboard.writeText(status.url); + this.closeCtxMenu(); + return; + }, + + ctxMenuGoToPost() { + let status = this.ctxMenuStatus; + window.location.href = this.statusUrl(status); + this.closeCtxMenu(); + return; + }, + + statusUrl(status) { + return '/i/web/post/_/' + this.profile.id + '/' + status.id; + }, + + deletePost(status) { + if(this.user.is_admin == false) { + return; + } + + if(window.confirm('Are you sure you want to delete this post?') == false) { + return; + } + + axios.post('/i/delete', { + type: 'status', + item: status.id + }).then(res => { + this.feed = this.feed.filter(s => { + return s.id != status.id; + }); + this.$refs.ctxModal.hide(); + }).catch(err => { + swal('Error', 'Something went wrong. Please try again later.', 'error'); + }); + }, } } From 23e90fc5dbfa1a895d00ebcdaf4b7aa9f4bfddf6 Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Fri, 17 Apr 2020 16:41:47 -0600 Subject: [PATCH 79/89] Update compiled assets --- public/css/landing.css | Bin 176517 -> 221593 bytes public/js/rempos.js | Bin 59903 -> 60057 bytes public/js/rempro.js | Bin 19624 -> 21426 bytes public/mix-manifest.json | Bin 1939 -> 1939 bytes 4 files changed, 0 insertions(+), 0 deletions(-) diff --git a/public/css/landing.css b/public/css/landing.css index e2974cc952570db58d6f63bf5581671cab440232..d22cbdab9f577f545d5ecd1d9e746aaed3edf148 100644 GIT binary patch literal 221593 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 I;dYe&2YjMPr2qf` delta 8817 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 diff --git a/public/js/rempos.js b/public/js/rempos.js index 4563d2aecf0d27df6f5db90cc29d530182f05303..27e9010a8c07fe7372d08ce7efcd8827b78b9480 100644 GIT binary patch delta 528 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 B0Q3L= delta 2652 zcmaJ@O>7&-6$T|$a$reSV_Om>TcRcvvlGs)NjqsOQe#GcHtbf8Y~>Qutg+l3iBm6U z=-r_tmLX)f1q!r4V`qQ@MG-V<8?=}7Cp_fZ6gdP4>J}(^D2g0%?4?M7HtiuP`gTbw zRD|@hFn0gjpF?TsX7ru>tbS#A;H0F&K+C~X8wlrwB@Brz z`@uI;0}IbDT#q)*^o_-2>ule%u^89;{ojdY^w7YW)>j9<)Zfpk&|+{>zdZDLc=`I! zOusa^emIl}e_Q_;dU1H9*(5$SAVw7R#^mXKP7HnT(Rk~n$!q))8J(;fVp{8Cs6K{Pqof~W|qM!8XH>YQgE4HUhhY7`eP399TwLr;==}4h` z=_Q=@GT7zHDWfJSKyc44F%OZ3zFcSn}c5 z=*=GIAyxYkMf)m9BhAhwLrsA7S@Es}~uIv|2o*SN+}><5Lnhe5Pu?NTlf@ zV)8G|PxMKm-fbJ(dL$a7mz+E02Y);nm!Ks{3osQpkp!V)5$8gg z^9LV4jV0k2^yx{*_JT-s(Ad&f0qq)blZ2l1tyuXJNPmc>^o7M2hb2{o^Tn_c=A{11 zqB+Q^0Y~*P{T2YcPc!iR9X$__Kcqhe6pbeIP&&sKRhb8t$HcZO=Xff0&^BN$aQ)VW zsa09&_^}WRt`d`bJ6QK_d6|<{V4<-^ML119iDsU+Tpc}5gw(={8JGy!no)=bezl0in zeRXyOh=QhXvVtmtVlZon?2gsXqQnoNbo7DXtaUyv4eqq1{AYx!&| zNTqUNp+aH6x|hvCey|S_{g?E~HaiOX|6`6Z)5H zLo={GI71l5xlT~pfGI8YpVrQ!UOJC310xWKG%l_TN&t|T`p(5TB>%mO58-*^(maxR zX$iPGH+jk9VmmJ^E&}GOWd;D5!H8_Vdg)$x%|CV-!*l)ee{zy`OJd+gI@g&C@S)%| z4Ulo9-)P)e0%j_s5;r@0O8V}VnOI5x_{#d&ZYYS(sE<_f(Un$Q(mkuhg=>U_fLa1F zmjUMJUhAE&ti<5t-7BXi;f8?g;P#=7VB&gVJ^!erE4?p5^LN*$Aluj0Z;pTnDeH`A z-Wt8S8{3Ca0D~N4q;R9lAhc`9bJ!^2NM!>mLd_dC=pYDnfFl8zCIQAmDs9|U$)szP zqdXx-M0wjCbakicCc0f`hwTfqm4ZhJoK0_B9judE)TnE@5kFQBwaG|b-`{wAVz1jv z?ef7FR~{jd!@~^=DEfF~KBVhf9Xg#^73T8DH}ImYfT<<8^?9kLn1P~qh)DhRweOGL zZaZzegpRPBAb{ePuV?ys&d_(SPsCq%!N`v{XaGG(*eeC(E87BgTl2cPH n5{-;4C;w*E5-~F|Pc$<(N-<9}Nl8sgGD@>BGTv;-7R3kvVWb(F From dda5be75deb05b61c7d9f46b9da1e1e46e9332fe Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Fri, 17 Apr 2020 16:48:22 -0600 Subject: [PATCH 80/89] Update landing page, fix hardcoded values --- resources/views/site/index.blade.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/resources/views/site/index.blade.php b/resources/views/site/index.blade.php index 0af494e78..5168c09fa 100644 --- a/resources/views/site/index.blade.php +++ b/resources/views/site/index.blade.php @@ -230,7 +230,7 @@

Albums

- Create an album with up to 10 photos + Create an album with up to {{config('pixelfed.max_album_length')}} photos
@@ -281,6 +281,7 @@
+ @if(config('instance.stories.enabled'))
@@ -292,6 +293,7 @@
+ @endif
From d5e16ac04f6b903a99d8b94d6889c3fbbf035553 Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Fri, 17 Apr 2020 16:51:42 -0600 Subject: [PATCH 81/89] Update landing page, fix hardcoded values --- resources/views/site/index.blade.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/resources/views/site/index.blade.php b/resources/views/site/index.blade.php index 5168c09fa..4583ae939 100644 --- a/resources/views/site/index.blade.php +++ b/resources/views/site/index.blade.php @@ -123,8 +123,10 @@

+ @if(config('pixelfed.open_registration')) Register · + @endif Password Reset

From 32beaad5b7adbc4af628109203bba8545e078c82 Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Fri, 17 Apr 2020 17:25:31 -0600 Subject: [PATCH 82/89] Update NotificationCard, fix pagination bug #2019 --- resources/assets/js/components/NotificationCard.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/assets/js/components/NotificationCard.vue b/resources/assets/js/components/NotificationCard.vue index f2ed52669..b82d98770 100644 --- a/resources/assets/js/components/NotificationCard.vue +++ b/resources/assets/js/components/NotificationCard.vue @@ -88,7 +88,7 @@ methods: { fetchNotifications() { - axios.get('/api/pixelfed/v1/notifications') + axios.get('/api/pixelfed/v1/notifications?pg=true') .then(res => { let data = res.data; let ids = res.data.map(n => n.id); From 8c898a091c07d73fd27f5dd7f6e6ca877155ded5 Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Fri, 17 Apr 2020 17:39:30 -0600 Subject: [PATCH 83/89] Update compiled assets --- public/js/timeline.js | Bin 118765 -> 118773 bytes public/mix-manifest.json | Bin 1939 -> 1939 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/public/js/timeline.js b/public/js/timeline.js index 3e4d129a1e180cc65e3d73cecb3c70fcc9189a0d..8f71e86b879252a76b437ea50de87b0af14a9f27 100644 GIT binary patch delta 58 zcmV-A0LB09p9l4y2Y|Ezwpa;2aA!Sqa&=`QlMyQvlTPvmldk*;x7t_%BNzxbFgIZ_ QF*G=n`o0~vB5?uBUb1c$hyVZp delta 37 tcmex5pZ)E8_J%Et+ajii#WN~yzaPP Date: Fri, 17 Apr 2020 19:16:13 -0600 Subject: [PATCH 84/89] Update RemotePost.vue --- resources/assets/js/components/RemotePost.vue | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/resources/assets/js/components/RemotePost.vue b/resources/assets/js/components/RemotePost.vue index daba8bec1..ddd7b1368 100644 --- a/resources/assets/js/components/RemotePost.vue +++ b/resources/assets/js/components/RemotePost.vue @@ -170,7 +170,7 @@

- + {{reply.favourites_count == 1 ? '1 like' : reply.favourites_count + ' likes'}} Reply

@@ -1012,13 +1012,14 @@ export default { window.location.href = url; }, - purl(profile, showOrigin = false) { + permalinkUrl(reply, showOrigin = false) { + let profile = reply.account; if(profile.local == true) { return profile.url; } else { return showOrigin ? - profile.url : - '/i/web/profile/_/' + profile.id; + reply.url : + '/i/web/post/_/' + profile.id + '/' + reply.id; } } From c502230ea06729989a90c01d9642feb0fb5e4bf9 Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Fri, 17 Apr 2020 19:19:03 -0600 Subject: [PATCH 85/89] Update compiled assets --- public/js/rempos.js | Bin 60057 -> 60081 bytes public/mix-manifest.json | Bin 1939 -> 1939 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/public/js/rempos.js b/public/js/rempos.js index 27e9010a8c07fe7372d08ce7efcd8827b78b9480..70817e0b0154205d26e890e6218b7757c4f7142a 100644 GIT binary patch delta 1488 zcmZuxU1%It6lSt%*0nUY`RQ)fY<9D?%S>l7o87eenay-#i%m<7X;PHHWEy98? z_bzj1lfZVZ4?ZYTq+F1e_C-)=X)Tcf6$GiJ^u;_xp*~3?z7zt22#O-Mp4m;DqMe6( zzwexL&zbXc@8$cxPw)FyA8{OZ9&?k;uuZnCHF21A2RxVa-$F2J~HgRO9)7>h#zK`wx%-270`r=r) zc`5zc{KYfxvcGnJvxBIH6lb>vMfUri@m3XB8hg;S?86daGvO5o`)xSXj0K4}KZpGsN1WfDpYpK>R)G1N zK6HMGF75!EGyCr~PtoxdyM4E3*OFny43+Zn6Oc1IomgnWYPALqzD`8kYHaX5IimJw z$fzlo4a=r-3E_ErAwxt_*b-?(=Z%IIppYpNi-!YSqNf~aq>%Ftu{j}>ZiIQtDeHgs zx`YHFgV}Xq_B>W?&D15LA~|PJl*Le6v4IsAOO{&AQwlhxON*#r8UWL}L`lWUqY0x7 zbU?3VpeuUTUAFS9m)Q~&+KBFI)T&ufh*YnGqFH)Ps9Db22Q-*W_M;qu^^t4_am_69 zNTw#9FCm*?q3RZyus4(Yf<)>~36iNEm2)t$Jg$^V5`}7ikv!#t83_!0u#2b^^2zX) ziZ#M+4!jR;M-Sd=!YXSW4E34NUDcNJ3udYC3Mn9(AsT|AvSkY`k|lK1RlpD-9Sm9O zP%sG7;WEXRjdB^`Lc;>HxkG<|>zTnUtd|DggYYj5y#(vop=fhKJaLfqhNJ9Mq=zjJ zhus-+{7siQC#`($&c){F4Cmg;3!Jll_^Kc9;<1sP&tjFz1;aL=H>*=3*!?iI`J`}t zS_0F*r?b%jvKEb!iQjmYsn*NqB??Iy`8=s$J7XccV&Pay1#cyiH%eJ5SFDnPvUYus zC(YzC$|cK$+R3>j+zr_*h;aZmfErv3tnx6^?v%ro0d(>>=mocQlex1fZ}V6-1m2YR zVg=`I6Ovv#;tbQ*g+2fNmQ~`B+buTr(TMZYRb~G(sdWFq&`>JR%A4KJ*qyPa`UAn{ zT1Hs0BbeA$>(VTSW*DwtOf|P0eM^1YTK2Fb!ftm&J#P;?W;`<9DS4#YIqQ*)&MVJt zJJDm+SsaV8FI%GQ+TJ$L=+52|kNARv9(ggC_DD5&!y|Gi>yb)G^GLNb%zh1(JVCMR t3DZxy2AsF16-_ delta 1562 zcmZuxU1%It6lRh&X=-9LO&5P_c~yjWi_-2`Fhc3n$T++Fsg$XQUt@V$@KUKH(Q}3tF33{>3k{JMc!{v9 zy?x<*>vb8!f6|=r*lUR~Hn0{??ax|c&*h4yAO$U`gpXsw^s z)&_TMQ_M!-!I~U_m5n`Y`ucdJSiSy11l09I5qN!lECS!JABe!c^;`r-Z+sDf-)?9T z7}?Mxu(I)H1O_&@ZNrJcTj$a=hhh!x*8i3hnWr&7KG zheAe+LQ{B8(9u1@&-Ww-!GAqgsI-(R{6bPhRD#;!c z>dWC{t-$O1Bky$)6tXifxQOb6eXP6-)y|}^!g@R1H%kzlI`5S1SE!A>Jkc@m(1)6q z=>k3y8i04$fbMBlM)P6lc-ZyFG29vp(0QR<^%b*H!NlJ3q3mSlZ#ZHqtHF9P`wm>@ zncR!8p2`iz!nV4sJsS&&d->GcY&ka<_G8fAa)k@d@Bc2Gb=iZnTsZ$Oajd)ZHv2Q^ zX7@YeL7%$X2KuiLk3GJVB2Nh$9IE=)Q3-tZPW`c68K0J6>kHG`AXjA^W1h1*OB^5WneA-Db;zGLO(xOws>C^BSS;eL<4h6<3uBKOQWRJBxB3XzgcH60syNe3O@h< delta 33 pcmbQtKbe2Sb5;>EBa>v4Gz+8TL{n4C)U*_10~3qQzgcH60syp=3aJ19 From 43c7bda6636a261d03bde0d83a7f0c9ca26253a4 Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Fri, 17 Apr 2020 19:35:36 -0600 Subject: [PATCH 86/89] Update search results view --- resources/views/search/results.blade.php | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/resources/views/search/results.blade.php b/resources/views/search/results.blade.php index ca0aade32..46843f8c9 100644 --- a/resources/views/search/results.blade.php +++ b/resources/views/search/results.blade.php @@ -4,12 +4,9 @@ @endsection + @push('scripts') - + @endpush \ No newline at end of file From 4182d7efa5bcc92d0a8c527c756517f93c6e5f88 Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Fri, 17 Apr 2020 19:36:12 -0600 Subject: [PATCH 87/89] Update profile story view --- resources/views/profile/story.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/views/profile/story.blade.php b/resources/views/profile/story.blade.php index 93d3a6966..c4b61d047 100644 --- a/resources/views/profile/story.blade.php +++ b/resources/views/profile/story.blade.php @@ -1,7 +1,7 @@ @extends('layouts.app') @section('content') - + @endsection @push('scripts') From 14f4237b0dec8e37260dd6ad49a4a05485913cd9 Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Fri, 17 Apr 2020 19:36:58 -0600 Subject: [PATCH 88/89] Update privacy settings view --- resources/views/settings/privacy.blade.php | 2 -- 1 file changed, 2 deletions(-) diff --git a/resources/views/settings/privacy.blade.php b/resources/views/settings/privacy.blade.php index 584529f49..a29574fef 100644 --- a/resources/views/settings/privacy.blade.php +++ b/resources/views/settings/privacy.blade.php @@ -10,8 +10,6 @@

Muted Users Blocked Users - Blocked keywords - Blocked instances

From d610ac80fb901ac09c11d16055279287cdd459f3 Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Fri, 17 Apr 2020 19:43:33 -0600 Subject: [PATCH 89/89] Update changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0997e7515..b006fc7d8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -55,6 +55,7 @@ - Updated ApiV1Controller, fixes #[2112](https://github.com/pixelfed/pixelfed/issues/2112) ([324ccd0a](https://github.com/pixelfed/pixelfed/commit/324ccd0a)) - Updated StatusTransformer, fixes #[2113](https://github.com/pixelfed/pixelfed/issues/2113) ([eefa6e0d](https://github.com/pixelfed/pixelfed/commit/eefa6e0d)) - Updated InternalApiController, limit remote profile ui to remote profiles ([d918a68e](https://github.com/pixelfed/pixelfed/commit/d918a68e)) +- Updated NotificationCard, fix pagination bug #[2019](https://github.com/pixelfed/pixelfed/issues/2019) ([32beaad5](https://github.com/pixelfed/pixelfed/commit/32beaad5)) ## [v0.10.8 (2020-01-29)](https://github.com/pixelfed/pixelfed/compare/v0.10.7...v0.10.8)