From 4668a06255dda0905036c25e2d78287662bab3a8 Mon Sep 17 00:00:00 2001 From: ThibG Date: Thu, 23 Jan 2020 21:32:00 +0100 Subject: [PATCH] =?UTF-8?q?[Glitch]=20Add=20=E2=80=9Caccount=20timeline?= =?UTF-8?q?=E2=80=9D=20filter=20category?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Port JS changes from 691b14aaf8adba5b3255041a6b843f14c2e1570e to glitch-soc Signed-off-by: Thibaut Girka --- .../flavours/glitch/features/account_timeline/index.js | 1 + app/javascript/flavours/glitch/selectors/index.js | 1 + 2 files changed, 2 insertions(+) diff --git a/app/javascript/flavours/glitch/features/account_timeline/index.js b/app/javascript/flavours/glitch/features/account_timeline/index.js index 2ef4ff6027..f25c82a006 100644 --- a/app/javascript/flavours/glitch/features/account_timeline/index.js +++ b/app/javascript/flavours/glitch/features/account_timeline/index.js @@ -112,6 +112,7 @@ class AccountTimeline extends ImmutablePureComponent { onLoadMore={this.handleLoadMore} emptyMessage={} bindToDocument={!multiColumn} + timelineId='account' /> ); diff --git a/app/javascript/flavours/glitch/selectors/index.js b/app/javascript/flavours/glitch/selectors/index.js index 8ceb71d032..ab7dac66ae 100644 --- a/app/javascript/flavours/glitch/selectors/index.js +++ b/app/javascript/flavours/glitch/selectors/index.js @@ -27,6 +27,7 @@ export const toServerSideType = columnType => { case 'notifications': case 'public': case 'thread': + case 'account': return columnType; default: if (columnType.indexOf('list:') > -1) {