Merge pull request 'Sync develop with 2023.02 stable branch' (#6 ) from stable into develop

Reviewed-on: fedward/pleroma-fe#6
Merge pull request 'Catch up to 2023.02 stable release' (#5 ) from AkkomaGang/akkoma-fe:stable into stable
2023-02-12 19:20:33 +00:00 · 2023-02-12 19:15:20 +00:00 · 2023-02-11 10:50:04 +00:00 · 2022-12-10 14:52:00 +00:00 · 2022-11-16 19:11:56 +00:00 · 2022-11-16 18:40:51 +00:00
5 changed files with 5 additions and 3 deletions
--- a/src/App.js
+++ b/src/App.js
@ -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') {
--- a/src/components/about/about.vue
+++ b/src/components/about/about.vue
@ -1,6 +1,6 @@
 <template>
  <div class="column-inner">
-    <instance-specific-panel v-if="showInstanceSpecificPanel" />
+    <instance-specific-panel />
    <staff-panel />
    <terms-of-service-panel />
    <LocalBubblePanel v-if="showLocalBubblePanel" />
--- a/src/components/desktop_nav/desktop_nav.vue
+++ b/src/components/desktop_nav/desktop_nav.vue
@ -67,6 +67,7 @@
            />
          </router-link>
          <router-link
+            v-if="showPublicExternalTimeline"
            :to="{ name: 'public-external-timeline' }"
            class="nav-icon"
          >
--- a/src/components/timeline_menu/timeline_menu_content.vue
+++ b/src/components/timeline_menu/timeline_menu_content.vue
@ -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' }"
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@ -379,7 +379,7 @@
            "text/x.misskeymarkdown": "MFM"
        },
        "content_warning": "Content Warning (optional)",
-        "default": "Just arrived at Luna Nova Academy",
+        "default": "(Content goes here)",
        "direct_warning_to_all": "This post will be visible to all the mentioned users.",
        "direct_warning_to_first_only": "This post will only be visible to the mentioned users at the beginning of the message.",
        "edit_remote_warning": "Changes made to the post may not be visible on some instances!",
Author	SHA1	Message	Date
fedward	c83291ecff	Merge pull request 'Sync develop with 2023.02 stable branch' (#6 ) from stable into develop Reviewed-on: fedward/pleroma-fe#6	2023-02-12 19:20:33 +00:00
fedward	0ba3fa2311	Merge pull request 'Catch up to 2023.02 stable release' (#5 ) from AkkomaGang/akkoma-fe:stable into stable Reviewed-on: fedward/pleroma-fe#5	2023-02-12 19:15:20 +00:00
FloatingGhost	8569b5946e	Merge branch 'develop' into stable	2023-02-11 10:50:04 +00:00
FloatingGhost	9c9b4cc07c	Merge branch 'develop' into stable	2022-12-10 14:52:00 +00:00
fedward	6eafeed846	Merge pull request 'Merge changes from unauth-global-timeline branch' (#4 ) from develop into stable Reviewed-on: fedward/pleroma-fe#4	2022-11-16 19:11:56 +00:00
fedward	5e514e8f0a	Merge pull request 'unauth-global-timeline' (#3 ) from unauth-global-timeline into develop Reviewed-on: fedward/pleroma-fe#3	2022-11-16 18:40:51 +00:00
fedward	ce6d06f998	revert `328fef9163` This work went into a feature branch. Revert dev before applying the changes from that branch.	2022-11-16 18:38:13 +00:00
Ed Poe	cde3e55634	Fix style of new setter and refer to new value in desktop_nav	2022-11-16 13:28:58 -05:00
Ed Poe	021216d5e3	Missed a comma. Oops.	2022-11-16 13:19:12 -05:00
Ed Poe	c7d8cabe9c	Testing method for setting when to display global timeline.	2022-11-16 13:07:57 -05:00
fedward	9c623de28c	Merge pull request 'Hide global timeline for unauthorized users' (#2 ) from develop into stable Reviewed-on: fedward/pleroma-fe#2	2022-11-15 18:14:25 +00:00
fedward	328fef9163	Hide global timeline for unauthorized users The better way to make this change would be to have it set automatically in association with the Restrict Unauthenticated setting for the federated timeline, but for the moment this hack will do.	2022-11-15 18:13:45 +00:00
fedward	1ae90fb953	Merge pull request 'Change UI defaults for local instance' (#1 ) from develop into stable Reviewed-on: fedward/pleroma-fe#1	2022-11-15 17:24:54 +00:00
fedward	27f3549f26	Update default text for new posts	2022-11-15 17:21:30 +00:00
fedward	d1a1e10c8b	Always show instance panel on about page	2022-11-15 17:16:57 +00:00
floatingghost	2c9b73646c	Merge pull request 'hotfix: mfm mysteries' (#215 ) from develop into stable Reviewed-on: AkkomaGang/pleroma-fe#215	2022-11-15 16:01:07 +00:00
floatingghost	80a519d7e4	Merge pull request 'hotfix: translation' (#207 ) from develop into stable Reviewed-on: AkkomaGang/pleroma-fe#207	2022-11-12 19:08:20 +00:00
floatingghost	975f04bf5a	Merge pull request '2022.11 stable release' (#202 ) from develop into stable Reviewed-on: AkkomaGang/pleroma-fe#202	2022-11-12 15:33:57 +00:00
floatingghost	c8c8d40827	Merge pull request '2022.10 stable' (#177 ) from develop into stable Reviewed-on: AkkomaGang/pleroma-fe#177	2022-10-08 11:13:01 +00:00
floatingghost	d7499a1f91	Merge pull request '2022.09 stable' (#160 ) from develop into stable Reviewed-on: AkkomaGang/pleroma-fe#160	2022-09-10 14:39:13 +00:00
floatingghost	5972d89117	Merge pull request 'stable release' (#130 ) from develop into stable Reviewed-on: AkkomaGang/pleroma-fe#130	2022-08-12 15:26:51 +00:00
floatingghost	d03872d598	Merge pull request 'port MFM link into stable docs' (#38 ) from develop into stable Reviewed-on: AkkomaGang/pleroma-fe#38	2022-07-15 13:02:06 +00:00