vbatts/mastodon
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Split public timeline into "public timeline" which is local, and

Browse source 
"whole known network" which is what public timeline used to be

Only domain blocks with suspend severity will block PuSH subscriptions
Silenced accounts should not appear in conversations unless followed
This commit is contained in:
Eugen Rochko 2017-02-19 20:25:54 +01:00
parent 9e99b8c068
commit 4aa5ebe591
12 changed files with 148 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

7
app/assets/javascripts/components/locales/en.jsx
View file

@ -28,8 +28,8 @@ const en = {
"getting_started.about_developer": "The developer of this project can be followed as Gargron@mastodon.social",
"getting_started.open_source_notice": "Mastodon is open source software. You can contribute or report issues on github at {github}.",
"column.home": "Home",
"column.mentions": "Mentions",
"column.public": "Public",
"column.community": "Public",
"column.public": "Whole Known Network",
"column.notifications": "Notifications",
"tabs_bar.compose": "Compose",
"tabs_bar.home": "Home",
@ -45,7 +45,8 @@ const en = {
"compose_form.unlisted": "Do not display in public timeline",
"navigation_bar.edit_profile": "Edit profile",
"navigation_bar.preferences": "Preferences",
"navigation_bar.public_timeline": "Public timeline",
"navigation_bar.community_timeline": "Public timeline",
"navigation_bar.public_timeline": "Whole Known Network",
"navigation_bar.logout": "Logout",
"reply_indicator.cancel": "Cancel",
"search.placeholder": "Search",