alex
/
mastodon
forked from treehouse/mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add “account timeline” filter category (#12918) 

* Add “account timeline” filter category

Previously, no filter category applied to account timelines.

* Rename “Account timelines” into “Profiles”
signup-info-prompt
ThibG 2020-01-23 21:32:00 +01:00 committed by Eugen Rochko
parent a8e46cf7a1
commit 43daeccccb
4 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/javascript/mastodon/features/account_timeline/index.js
View File

@ -115,6 +115,7 @@ class AccountTimeline extends ImmutablePureComponent {
shouldUpdateScroll={shouldUpdateScroll} shouldUpdateScroll={shouldUpdateScroll}
emptyMessage={emptyMessage} emptyMessage={emptyMessage}
bindToDocument={!multiColumn} bindToDocument={!multiColumn}
timelineId='account'
/> />
</Column> </Column>
); );

1
app/javascript/mastodon/selectors/index.js
View File

@ -26,6 +26,7 @@ const toServerSideType = columnType => {
case 'notifications': case 'notifications':
case 'public': case 'public':
case 'thread': case 'thread':
case 'account':
return columnType; return columnType;
default: default:
if (columnType.indexOf('list:') > -1) { if (columnType.indexOf('list:') > -1) {

1
app/models/custom_filter.rb
View File

@ -20,6 +20,7 @@ class CustomFilter < ApplicationRecord
notifications notifications
public public
thread thread
account
).freeze ).freeze
include Expireable include Expireable

1
config/locales/en.yml
View File

@ -733,6 +733,7 @@ en:
hint_html: "<strong>What are featured hashtags?</strong> They are displayed prominently on your public profile and allow people to browse your public posts specifically under those hashtags. They are a great tool for keeping track of creative works or long-term projects." hint_html: "<strong>What are featured hashtags?</strong> They are displayed prominently on your public profile and allow people to browse your public posts specifically under those hashtags. They are a great tool for keeping track of creative works or long-term projects."
filters: filters:
contexts: contexts:
account: Profiles
home: Home timeline home: Home timeline
notifications: Notifications notifications: Notifications
public: Public timelines public: Public timelines