Sync develop with 2023.02 stable branch #6

Merged
fedward merged 102 commits from stable into develop 2023-02-12 19:20:33 +00:00
3 changed files with 3 additions and 2 deletions
Showing only changes of commit 6eafeed846 - Show all commits

View file

@ -92,6 +92,7 @@ export default {
editingAvailable () { return this.$store.state.instance.editingAvailable },
layoutType () { return this.$store.state.interface.layoutType },
privateMode () { return this.$store.state.instance.private },
showPublicExternalTimeline () {return currentUser() || !(privateMode || this.$store.state.instance.restrict_unauthenticated.timelines.federated) },
reverseLayout () {
const { thirdColumnMode, sidebarRight: reverseSetting } = this.$store.getters.mergedConfig
if (this.layoutType !== 'wide') {

View file

@ -67,7 +67,7 @@
/>
</router-link>
<router-link
v-if="currentUser"
v-if="showPublicExternalTimeline"
:to="{ name: 'public-external-timeline' }"
class="nav-icon"
>

View file

@ -48,7 +48,7 @@
>{{ $t("nav.public_tl") }}</span>
</router-link>
</li>
<li v-if="federating && (currentUser || !privateMode)">
<li v-if="federating && showPublicExternalTimeline">
<router-link
class="menu-item"
:to="{ name: 'public-external-timeline' }"