From 1bf256b34b020622718d4dcdcae4153a6f75e060 Mon Sep 17 00:00:00 2001
From: Xnuk Shuman <admin@xnu.kr>
Date: Tue, 20 Dec 2022 02:03:35 +0900
Subject: [PATCH 01/12] use normal checkbox component label in announcement

---
 src/components/announcement_editor/announcement_editor.vue | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/components/announcement_editor/announcement_editor.vue b/src/components/announcement_editor/announcement_editor.vue
index 0f29f9f7..32b05bb2 100644
--- a/src/components/announcement_editor/announcement_editor.vue
+++ b/src/components/announcement_editor/announcement_editor.vue
@@ -32,8 +32,9 @@
         id="announcement-all-day"
         v-model="announcement.allDay"
         :disabled="disabled"
-      />
-      <label for="announcement-all-day">{{ $t('announcements.all_day_prompt') }}</label>
+      >
+        {{ $t('announcements.all_day_prompt') }}
+      </Checkbox>
     </span>
   </div>
 </template>

From f8a0cd2dd3e298b2a771d786033a7c29df8dcbfc Mon Sep 17 00:00:00 2001
From: Xnuk Shuman <admin@xnu.kr>
Date: Tue, 20 Dec 2022 02:34:11 +0900
Subject: [PATCH 02/12] vertical centering the checkbox

---
 src/components/checkbox/checkbox.vue | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/components/checkbox/checkbox.vue b/src/components/checkbox/checkbox.vue
index b6768d67..d7839e82 100644
--- a/src/components/checkbox/checkbox.vue
+++ b/src/components/checkbox/checkbox.vue
@@ -39,20 +39,23 @@ export default {
   display: inline-block;
   min-height: 1.2em;
 
+  & > * {
+    vertical-align: middle;
+  }
+
   &-indicator {
+    display: inline-block;
     position: relative;
-    padding-left: 1.2em;
+    width: 1.2em;
+    height: 1.2em;
   }
 
   &-indicator::before {
     position: absolute;
-    right: 0;
-    top: 0;
+    inset: 0;
     display: block;
     content: '✓';
     transition: color 200ms;
-    width: 1.1em;
-    height: 1.1em;
     border-radius: $fallback--checkboxRadius;
     border-radius: var(--checkboxRadius, $fallback--checkboxRadius);
     box-shadow: 0px 0px 2px black inset;

From 1506d2421d9a16867c5d3f39fbbc650952c2849a Mon Sep 17 00:00:00 2001
From: tusooa <tusooa@kazv.moe>
Date: Sat, 28 Jan 2023 21:44:24 -0500
Subject: [PATCH 03/12] Get rid of *

---
 src/components/checkbox/checkbox.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/checkbox/checkbox.vue b/src/components/checkbox/checkbox.vue
index cbebe578..6c23d9e4 100644
--- a/src/components/checkbox/checkbox.vue
+++ b/src/components/checkbox/checkbox.vue
@@ -39,7 +39,7 @@ export default {
   display: inline-block;
   min-height: 1.2em;
 
-  & > * {
+  .checkbox-indicator, .label {
     vertical-align: middle;
   }
 

From f7daaead6f16d87aef5a6a26fa8f8cfe7f7caf10 Mon Sep 17 00:00:00 2001
From: tusooa <tusooa@kazv.moe>
Date: Sat, 28 Jan 2023 21:54:08 -0500
Subject: [PATCH 04/12] Fix stylelint

---
 src/components/checkbox/checkbox.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/components/checkbox/checkbox.vue b/src/components/checkbox/checkbox.vue
index 6c23d9e4..32c8f79c 100644
--- a/src/components/checkbox/checkbox.vue
+++ b/src/components/checkbox/checkbox.vue
@@ -39,7 +39,8 @@ export default {
   display: inline-block;
   min-height: 1.2em;
 
-  .checkbox-indicator, .label {
+  &-indicator,
+  & .label {
     vertical-align: middle;
   }
 

From 84cab03a1d2643481bdb686d839a95973788ae02 Mon Sep 17 00:00:00 2001
From: "Haelwenn (lanodan) Monnier" <contact@hacktivis.me>
Date: Thu, 9 Nov 2023 08:27:58 +0100
Subject: [PATCH 05/12] Extract backend repository from nodeinfo

Also removes extractCommit, could be kept when the forge is git.pleroma.social

Partial fix of https://git.pleroma.social/pleroma/pleroma-fe/-/issues/1283
---
 changelog.d/backend-repo-url.skip                     |  0
 src/boot/after_store.js                               |  3 ++-
 src/components/settings_modal/tabs/version_tab.js     |  7 +------
 src/components/settings_modal/tabs/version_tab.vue    |  2 +-
 src/modules/instance.js                               |  1 +
 src/services/version/version.service.js               |  6 ------
 .../specs/services/version/version.service.spec.js    | 11 -----------
 7 files changed, 5 insertions(+), 25 deletions(-)
 create mode 100644 changelog.d/backend-repo-url.skip
 delete mode 100644 src/services/version/version.service.js
 delete mode 100644 test/unit/specs/services/version/version.service.spec.js

diff --git a/changelog.d/backend-repo-url.skip b/changelog.d/backend-repo-url.skip
new file mode 100644
index 00000000..e69de29b
diff --git a/src/boot/after_store.js b/src/boot/after_store.js
index 395d4834..aa204f53 100644
--- a/src/boot/after_store.js
+++ b/src/boot/after_store.js
@@ -242,7 +242,7 @@ const resolveStaffAccounts = ({ store, accounts }) => {
 
 const getNodeInfo = async ({ store }) => {
   try {
-    const res = await preloadFetch('/nodeinfo/2.0.json')
+    const res = await preloadFetch('/nodeinfo/2.1.json')
     if (res.ok) {
       const data = await res.json()
       const metadata = data.metadata
@@ -277,6 +277,7 @@ const getNodeInfo = async ({ store }) => {
 
       const software = data.software
       store.dispatch('setInstanceOption', { name: 'backendVersion', value: software.version })
+      store.dispatch('setInstanceOption', { name: 'backendRepository', value: software.repository })
       store.dispatch('setInstanceOption', { name: 'pleromaBackend', value: software.name === 'pleroma' })
 
       const priv = metadata.private
diff --git a/src/components/settings_modal/tabs/version_tab.js b/src/components/settings_modal/tabs/version_tab.js
index 616bdadf..20a67173 100644
--- a/src/components/settings_modal/tabs/version_tab.js
+++ b/src/components/settings_modal/tabs/version_tab.js
@@ -1,22 +1,17 @@
-import { extractCommit } from 'src/services/version/version.service'
-
 const pleromaFeCommitUrl = 'https://git.pleroma.social/pleroma/pleroma-fe/commit/'
-const pleromaBeCommitUrl = 'https://git.pleroma.social/pleroma/pleroma/commit/'
 
 const VersionTab = {
   data () {
     const instance = this.$store.state.instance
     return {
       backendVersion: instance.backendVersion,
+      backendRepository: instance.backendRepository,
       frontendVersion: instance.frontendVersion
     }
   },
   computed: {
     frontendVersionLink () {
       return pleromaFeCommitUrl + this.frontendVersion
-    },
-    backendVersionLink () {
-      return pleromaBeCommitUrl + extractCommit(this.backendVersion)
     }
   }
 }
diff --git a/src/components/settings_modal/tabs/version_tab.vue b/src/components/settings_modal/tabs/version_tab.vue
index 0330d49f..917a618e 100644
--- a/src/components/settings_modal/tabs/version_tab.vue
+++ b/src/components/settings_modal/tabs/version_tab.vue
@@ -7,7 +7,7 @@
           <ul class="option-list">
             <li>
               <a
-                :href="backendVersionLink"
+                :href="backendRepository"
                 target="_blank"
               >{{ backendVersion }}</a>
             </li>
diff --git a/src/modules/instance.js b/src/modules/instance.js
index 034348ff..f908f16c 100644
--- a/src/modules/instance.js
+++ b/src/modules/instance.js
@@ -141,6 +141,7 @@ const defaultState = {
 
   // Version Information
   backendVersion: '',
+  backendRepository: '',
   frontendVersion: '',
 
   pollsAvailable: false,
diff --git a/src/services/version/version.service.js b/src/services/version/version.service.js
deleted file mode 100644
index 2e11bf3a..00000000
--- a/src/services/version/version.service.js
+++ /dev/null
@@ -1,6 +0,0 @@
-
-export const extractCommit = versionString => {
-  const regex = /-g(\w+)/i
-  const matches = versionString.match(regex)
-  return matches ? matches[1] : ''
-}
diff --git a/test/unit/specs/services/version/version.service.spec.js b/test/unit/specs/services/version/version.service.spec.js
deleted file mode 100644
index 519145ee..00000000
--- a/test/unit/specs/services/version/version.service.spec.js
+++ /dev/null
@@ -1,11 +0,0 @@
-import { extractCommit } from 'src/services/version/version.service.js'
-
-describe('extractCommit', () => {
-  it('return short commit hash following "-g" characters', () => {
-    expect(extractCommit('1.0.0-45-g5e7aeebc')).to.eql('5e7aeebc')
-  })
-
-  it('return short commit hash without branch name', () => {
-    expect(extractCommit('1.0.0-45-g5e7aeebc-branch')).to.eql('5e7aeebc')
-  })
-})

From d67d24757f16bbbafc950e2b2b8261c6a7edd938 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?marcin=20miko=C5=82ajczak?= <git@mkljczk.pl>
Date: Tue, 13 Aug 2024 19:26:43 +0200
Subject: [PATCH 06/12] Use /api/v1/accounts/:id/follow for account
 subscriptions instead of the deprecated routes
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
---
 changelog.d/deprecate-subscribe.change |  1 +
 src/components/user_card/user_card.vue |  2 +-
 src/modules/users.js                   |  4 ++--
 src/services/api/api.service.js        | 13 +------------
 4 files changed, 5 insertions(+), 15 deletions(-)
 create mode 100644 changelog.d/deprecate-subscribe.change

diff --git a/changelog.d/deprecate-subscribe.change b/changelog.d/deprecate-subscribe.change
new file mode 100644
index 00000000..10fb34f4
--- /dev/null
+++ b/changelog.d/deprecate-subscribe.change
@@ -0,0 +1 @@
+Use /api/v1/accounts/:id/follow for account subscriptions instead of the deprecated routes
\ No newline at end of file
diff --git a/src/components/user_card/user_card.vue b/src/components/user_card/user_card.vue
index 70c4f67d..87af9d0f 100644
--- a/src/components/user_card/user_card.vue
+++ b/src/components/user_card/user_card.vue
@@ -208,7 +208,7 @@
             />
             <template v-if="relationship.following">
               <ProgressButton
-                v-if="!relationship.subscribing"
+                v-if="!relationship.notifying"
                 class="btn button-default"
                 :click="subscribeUser"
                 :title="$t('user_card.subscribe')"
diff --git a/src/modules/users.js b/src/modules/users.js
index b8f49f15..4e12ff86 100644
--- a/src/modules/users.js
+++ b/src/modules/users.js
@@ -452,11 +452,11 @@ const users = {
       commit('clearFollowers', userId)
     },
     subscribeUser ({ rootState, commit }, id) {
-      return rootState.api.backendInteractor.subscribeUser({ id })
+      return rootState.api.backendInteractor.followUser({ id, notify: true })
         .then((relationship) => commit('updateUserRelationship', [relationship]))
     },
     unsubscribeUser ({ rootState, commit }, id) {
-      return rootState.api.backendInteractor.unsubscribeUser({ id })
+      return rootState.api.backendInteractor.followUser({ id, notify: false })
         .then((relationship) => commit('updateUserRelationship', [relationship]))
     },
     toggleActivationStatus ({ rootState, commit }, { user }) {
diff --git a/src/services/api/api.service.js b/src/services/api/api.service.js
index fa417193..9e8c757c 100644
--- a/src/services/api/api.service.js
+++ b/src/services/api/api.service.js
@@ -68,8 +68,6 @@ const MASTODON_UNBLOCK_USER_URL = id => `/api/v1/accounts/${id}/unblock`
 const MASTODON_MUTE_USER_URL = id => `/api/v1/accounts/${id}/mute`
 const MASTODON_UNMUTE_USER_URL = id => `/api/v1/accounts/${id}/unmute`
 const MASTODON_REMOVE_USER_FROM_FOLLOWERS = id => `/api/v1/accounts/${id}/remove_from_followers`
-const MASTODON_SUBSCRIBE_USER = id => `/api/v1/pleroma/accounts/${id}/subscribe`
-const MASTODON_UNSUBSCRIBE_USER = id => `/api/v1/pleroma/accounts/${id}/unsubscribe`
 const MASTODON_USER_NOTE_URL = id => `/api/v1/accounts/${id}/note`
 const MASTODON_BOOKMARK_STATUS_URL = id => `/api/v1/statuses/${id}/bookmark`
 const MASTODON_UNBOOKMARK_STATUS_URL = id => `/api/v1/statuses/${id}/unbookmark`
@@ -273,6 +271,7 @@ const followUser = ({ id, credentials, ...options }) => {
   const url = MASTODON_FOLLOW_URL(id)
   const form = {}
   if (options.reblogs !== undefined) { form.reblogs = options.reblogs }
+  if (options.notify !== undefined) { form.notify = options.notify }
   return fetch(url, {
     body: JSON.stringify(form),
     headers: {
@@ -1171,14 +1170,6 @@ const unmuteUser = ({ id, credentials }) => {
   return promisedRequest({ url: MASTODON_UNMUTE_USER_URL(id), credentials, method: 'POST' })
 }
 
-const subscribeUser = ({ id, credentials }) => {
-  return promisedRequest({ url: MASTODON_SUBSCRIBE_USER(id), credentials, method: 'POST' })
-}
-
-const unsubscribeUser = ({ id, credentials }) => {
-  return promisedRequest({ url: MASTODON_UNSUBSCRIBE_USER(id), credentials, method: 'POST' })
-}
-
 const fetchBlocks = ({ maxId, credentials }) => {
   const query = new URLSearchParams({ with_relationships: true })
   if (maxId) {
@@ -1931,8 +1922,6 @@ const apiService = {
   fetchMutes,
   muteUser,
   unmuteUser,
-  subscribeUser,
-  unsubscribeUser,
   fetchBlocks,
   fetchOAuthTokens,
   revokeOAuthToken,

From 2bd16bedcea4cef113c008bd6368f1094c808b3a Mon Sep 17 00:00:00 2001
From: Pleroma User <66706-pleromian@users.noreply.git.pleroma.social>
Date: Tue, 22 Oct 2024 08:24:06 +0000
Subject: [PATCH 07/12] Markup inconsistencies

---
 changelog.d/misc-markup.fix                   |  1 +
 changelog.d/user-link.add                     |  1 +
 .../announcements_page/announcements_page.vue |  4 ++--
 .../bookmark_folder_edit.vue                  |  4 ++--
 .../bookmark_folders/bookmark_folders.vue     |  4 ++--
 src/components/chat_list/chat_list.vue        |  4 ++--
 src/components/conversation/conversation.vue  |  4 +++-
 src/components/dialog_modal/dialog_modal.vue  |  4 ++--
 .../edit_status_modal/edit_status_modal.vue   |  4 +++-
 .../features_panel/features_panel.vue         |  4 ++--
 .../follow_requests/follow_requests.vue       |  4 ++--
 src/components/interactions/interactions.vue  |  4 ++--
 src/components/lists/lists.vue                |  4 +++-
 src/components/login_form/login_form.vue      |  2 +-
 src/components/mfa_form/recovery_form.vue     |  4 +++-
 src/components/mfa_form/totp_form.vue         |  4 +++-
 src/components/mobile_nav/mobile_nav.vue      |  4 ++--
 .../notifications/notifications.vue           |  4 ++--
 .../password_reset/password_reset.vue         |  4 +++-
 .../post_status_modal/post_status_modal.vue   |  4 +++-
 src/components/registration/registration.vue  |  4 +++-
 .../remote_user_resolver.vue                  |  4 +++-
 src/components/search/search.vue              |  4 ++--
 .../settings_modal/settings_modal.vue         |  4 ++--
 .../tabs/theme_tab/theme_preview.vue          |  4 ++--
 src/components/shout_panel/shout_panel.vue    |  4 ++--
 .../status_history_modal.vue                  |  4 +++-
 .../timeline_menu/timeline_menu.vue           |  4 ++--
 .../update_notification.vue                   |  4 ++--
 src/components/user_link/user_link.vue        | 20 +++++++++++--------
 src/components/user_profile/user_profile.vue  |  4 ++--
 .../user_reporting_modal.vue                  |  2 +-
 .../who_to_follow/who_to_follow.vue           |  4 +++-
 .../who_to_follow_panel.vue                   |  4 ++--
 src/panel.scss                                |  2 ++
 35 files changed, 87 insertions(+), 57 deletions(-)
 create mode 100644 changelog.d/misc-markup.fix
 create mode 100644 changelog.d/user-link.add

diff --git a/changelog.d/misc-markup.fix b/changelog.d/misc-markup.fix
new file mode 100644
index 00000000..7af934a2
--- /dev/null
+++ b/changelog.d/misc-markup.fix
@@ -0,0 +1 @@
+Fix small markup inconsistencies
diff --git a/changelog.d/user-link.add b/changelog.d/user-link.add
new file mode 100644
index 00000000..ca65aa5f
--- /dev/null
+++ b/changelog.d/user-link.add
@@ -0,0 +1 @@
+Make UserLink wrappable
diff --git a/src/components/announcements_page/announcements_page.vue b/src/components/announcements_page/announcements_page.vue
index 25f830ff..44e2cf46 100644
--- a/src/components/announcements_page/announcements_page.vue
+++ b/src/components/announcements_page/announcements_page.vue
@@ -1,9 +1,9 @@
 <template>
   <div class="panel panel-default announcements-page">
     <div class="panel-heading">
-      <span>
+      <h1 class="title">
         {{ $t('announcements.page_header') }}
-      </span>
+      </h1>
     </div>
     <div class="panel-body">
       <section
diff --git a/src/components/bookmark_folder_edit/bookmark_folder_edit.vue b/src/components/bookmark_folder_edit/bookmark_folder_edit.vue
index b6a768d4..709df402 100644
--- a/src/components/bookmark_folder_edit/bookmark_folder_edit.vue
+++ b/src/components/bookmark_folder_edit/bookmark_folder_edit.vue
@@ -13,7 +13,7 @@
           icon="chevron-left"
         />
       </button>
-      <div class="title">
+      <h1 class="title">
         <i18n-t
           v-if="id"
           keypath="bookmark_folders.editing_folder"
@@ -26,7 +26,7 @@
           v-else
           keypath="bookmark_folders.creating_folder"
         />
-      </div>
+      </h1>
     </div>
     <div class="panel-body">
       <div class="input-wrap">
diff --git a/src/components/bookmark_folders/bookmark_folders.vue b/src/components/bookmark_folders/bookmark_folders.vue
index d92e95df..fdd46106 100644
--- a/src/components/bookmark_folders/bookmark_folders.vue
+++ b/src/components/bookmark_folders/bookmark_folders.vue
@@ -1,9 +1,9 @@
 <template>
   <div class="Bookmark-folders panel panel-default">
     <div class="panel-heading">
-      <div class="title">
+      <h1 class="title">
         {{ $t('nav.bookmark_folders') }}
-      </div>
+      </h1>
       <router-link
         :to="{ name: 'bookmark-folder-new' }"
         class="button-default btn new-folder-button"
diff --git a/src/components/chat_list/chat_list.vue b/src/components/chat_list/chat_list.vue
index b33ea67e..24bbc9f4 100644
--- a/src/components/chat_list/chat_list.vue
+++ b/src/components/chat_list/chat_list.vue
@@ -7,9 +7,9 @@
     class="chat-list panel panel-default"
   >
     <div class="panel-heading -sticky">
-      <span class="title">
+      <h1 class="title">
         {{ $t("chats.chats") }}
-      </span>
+      </h1>
       <button
         class="button-default"
         @click="newChat"
diff --git a/src/components/conversation/conversation.vue b/src/components/conversation/conversation.vue
index 526de5c3..1c290b90 100644
--- a/src/components/conversation/conversation.vue
+++ b/src/components/conversation/conversation.vue
@@ -9,7 +9,9 @@
       v-if="isExpanded"
       class="panel-heading conversation-heading -sticky"
     >
-      <span class="title"> {{ $t('timeline.conversation') }} </span>
+      <h1 class="title">
+        {{ $t('timeline.conversation') }}
+      </h1>
       <button
         v-if="collapsable"
         class="button-unstyled -link"
diff --git a/src/components/dialog_modal/dialog_modal.vue b/src/components/dialog_modal/dialog_modal.vue
index 3bceff22..93b8ac0f 100644
--- a/src/components/dialog_modal/dialog_modal.vue
+++ b/src/components/dialog_modal/dialog_modal.vue
@@ -8,9 +8,9 @@
       @click.stop=""
     >
       <div class="panel-heading dialog-modal-heading">
-        <div class="title">
+        <h1 class="title">
           <slot name="header" />
-        </div>
+        </h1>
       </div>
       <div class="panel-body dialog-modal-content">
         <slot name="default" />
diff --git a/src/components/edit_status_modal/edit_status_modal.vue b/src/components/edit_status_modal/edit_status_modal.vue
index db62972d..5001bd46 100644
--- a/src/components/edit_status_modal/edit_status_modal.vue
+++ b/src/components/edit_status_modal/edit_status_modal.vue
@@ -6,7 +6,9 @@
   >
     <div class="edit-form-modal-panel panel">
       <div class="panel-heading">
-        {{ $t('post_status.edit_status') }}
+        <h1 class="title">
+          {{ $t('post_status.edit_status') }}
+        </h1>
       </div>
       <PostStatusForm
         class="panel-body"
diff --git a/src/components/features_panel/features_panel.vue b/src/components/features_panel/features_panel.vue
index 4cdf56d0..cde8d6e4 100644
--- a/src/components/features_panel/features_panel.vue
+++ b/src/components/features_panel/features_panel.vue
@@ -2,9 +2,9 @@
   <div class="features-panel">
     <div class="panel panel-default base01-background">
       <div class="panel-heading timeline-heading base02-background base04">
-        <div class="title">
+        <h1 class="title">
           {{ $t('features_panel.title') }}
-        </div>
+        </h1>
       </div>
       <div class="panel-body features-panel">
         <ul>
diff --git a/src/components/follow_requests/follow_requests.vue b/src/components/follow_requests/follow_requests.vue
index 41f19db8..b678364c 100644
--- a/src/components/follow_requests/follow_requests.vue
+++ b/src/components/follow_requests/follow_requests.vue
@@ -1,9 +1,9 @@
 <template>
   <div class="settings panel panel-default">
     <div class="panel-heading">
-      <div class="title">
+      <h1 class="title">
         {{ $t('nav.friend_requests') }}
-      </div>
+      </h1>
     </div>
     <div class="panel-body">
       <FollowRequestCard
diff --git a/src/components/interactions/interactions.vue b/src/components/interactions/interactions.vue
index a2c56af4..1e2efe40 100644
--- a/src/components/interactions/interactions.vue
+++ b/src/components/interactions/interactions.vue
@@ -1,9 +1,9 @@
 <template>
   <div class="panel panel-default">
     <div class="panel-heading">
-      <div class="title">
+      <h1 class="title">
         {{ $t("nav.interactions") }}
-      </div>
+      </h1>
     </div>
     <tab-switcher
       ref="tabSwitcher"
diff --git a/src/components/lists/lists.vue b/src/components/lists/lists.vue
index b8bab0a0..05df5b72 100644
--- a/src/components/lists/lists.vue
+++ b/src/components/lists/lists.vue
@@ -2,7 +2,9 @@
   <div class="Lists panel panel-default">
     <div class="panel-heading">
       <div class="title">
-        {{ $t('lists.lists') }}
+        <h1 class="title">
+          {{ $t('lists.lists') }}
+        </h1>
       </div>
       <router-link
         :to="{ name: 'lists-new' }"
diff --git a/src/components/login_form/login_form.vue b/src/components/login_form/login_form.vue
index adc2dd5b..3c152b2e 100644
--- a/src/components/login_form/login_form.vue
+++ b/src/components/login_form/login_form.vue
@@ -3,7 +3,7 @@
     <!-- Default panel contents -->
 
     <div class="panel-heading">
-      {{ $t('login.login') }}
+      <h1 class="title">{{ $t('login.login') }}</h1>
     </div>
 
     <div class="panel-body">
diff --git a/src/components/mfa_form/recovery_form.vue b/src/components/mfa_form/recovery_form.vue
index 27184fb4..f8c3e6a0 100644
--- a/src/components/mfa_form/recovery_form.vue
+++ b/src/components/mfa_form/recovery_form.vue
@@ -3,7 +3,9 @@
     <!-- Default panel contents -->
 
     <div class="panel-heading">
-      {{ $t('login.heading.recovery') }}
+      <h1 class="title">
+        {{ $t('login.heading.recovery') }}
+      </h1>
     </div>
 
     <div class="panel-body">
diff --git a/src/components/mfa_form/totp_form.vue b/src/components/mfa_form/totp_form.vue
index 3ec617e9..26fc1e80 100644
--- a/src/components/mfa_form/totp_form.vue
+++ b/src/components/mfa_form/totp_form.vue
@@ -3,7 +3,9 @@
     <!-- Default panel contents -->
 
     <div class="panel-heading">
-      {{ $t('login.heading.totp') }}
+      <h1 class="title">
+        {{ $t('login.heading.totp') }}
+      </h1>
     </div>
 
     <div class="panel-body">
diff --git a/src/components/mobile_nav/mobile_nav.vue b/src/components/mobile_nav/mobile_nav.vue
index 76a90d3e..b737155e 100644
--- a/src/components/mobile_nav/mobile_nav.vue
+++ b/src/components/mobile_nav/mobile_nav.vue
@@ -50,13 +50,13 @@
       @touchmove.stop="notificationsTouchMove"
     >
       <div class="panel-heading mobile-notifications-header">
-        <span class="title">
+        <h1 class="title">
           {{ $t('notifications.notifications') }}
           <span
             v-if="unseenCountBadgeText"
             class="badge -notification unseen-count"
           >{{ unseenCountBadgeText }}</span>
-        </span>
+        </h1>
         <span class="spacer" />
         <button
           v-if="notificationsAtTop"
diff --git a/src/components/notifications/notifications.vue b/src/components/notifications/notifications.vue
index 87e7b68d..387c3a84 100644
--- a/src/components/notifications/notifications.vue
+++ b/src/components/notifications/notifications.vue
@@ -14,13 +14,13 @@
           v-if="!noHeading"
           class="notifications-heading panel-heading -sticky"
         >
-          <div class="title">
+          <h1 class="title">
             {{ $t('notifications.notifications') }}
             <span
               v-if="unseenCountBadgeText"
               class="badge -notification unseen-count"
             >{{ unseenCountBadgeText }}</span>
-          </div>
+          </h1>
           <div
             v-if="showScrollTop"
             class="rightside-button"
diff --git a/src/components/password_reset/password_reset.vue b/src/components/password_reset/password_reset.vue
index 037b859e..5392f487 100644
--- a/src/components/password_reset/password_reset.vue
+++ b/src/components/password_reset/password_reset.vue
@@ -1,7 +1,9 @@
 <template>
   <div class="settings panel panel-default">
     <div class="panel-heading">
-      {{ $t('password_reset.password_reset') }}
+      <h1 class="title">
+        {{ $t('password_reset.password_reset') }}
+      </h1>
     </div>
     <div class="panel-body">
       <form
diff --git a/src/components/post_status_modal/post_status_modal.vue b/src/components/post_status_modal/post_status_modal.vue
index bc2cad4a..2bdf41d5 100644
--- a/src/components/post_status_modal/post_status_modal.vue
+++ b/src/components/post_status_modal/post_status_modal.vue
@@ -7,7 +7,9 @@
   >
     <div class="post-form-modal-panel panel">
       <div class="panel-heading">
-        {{ $t('post_status.new_status') }}
+        <h1 class="title">
+          {{ $t('post_status.new_status') }}
+        </h1>
       </div>
       <PostStatusForm
         class="panel-body"
diff --git a/src/components/registration/registration.vue b/src/components/registration/registration.vue
index a2008d87..cb0209ec 100644
--- a/src/components/registration/registration.vue
+++ b/src/components/registration/registration.vue
@@ -1,7 +1,9 @@
 <template>
   <div class="settings panel panel-default">
     <div class="panel-heading">
-      {{ $t('registration.registration') }}
+      <h1 class="title">
+        {{ $t('registration.registration') }}
+      </h1>
     </div>
     <div
       v-if="!hasSignUpNotice"
diff --git a/src/components/remote_user_resolver/remote_user_resolver.vue b/src/components/remote_user_resolver/remote_user_resolver.vue
index 07aac169..cbd4d19c 100644
--- a/src/components/remote_user_resolver/remote_user_resolver.vue
+++ b/src/components/remote_user_resolver/remote_user_resolver.vue
@@ -1,7 +1,9 @@
 <template>
   <div class="panel panel-default">
     <div class="panel-heading">
-      {{ $t('remote_user_resolver.remote_user_resolver') }}
+      <h1 class="title">
+        {{ $t('remote_user_resolver.remote_user_resolver') }}
+      </h1>
     </div>
     <div class="panel-body">
       <p>
diff --git a/src/components/search/search.vue b/src/components/search/search.vue
index bd384ad3..00e700cf 100644
--- a/src/components/search/search.vue
+++ b/src/components/search/search.vue
@@ -1,9 +1,9 @@
 <template>
   <div class="Search panel panel-default">
     <div class="panel-heading">
-      <div class="title">
+      <h1 class="title">
         {{ $t('nav.search') }}
-      </div>
+      </h1>
     </div>
     <div class="panel-body search-input-container">
       <input
diff --git a/src/components/settings_modal/settings_modal.vue b/src/components/settings_modal/settings_modal.vue
index 90dbbde0..b9f7c355 100644
--- a/src/components/settings_modal/settings_modal.vue
+++ b/src/components/settings_modal/settings_modal.vue
@@ -7,9 +7,9 @@
   >
     <div class="settings-modal-panel panel">
       <div class="panel-heading">
-        <span class="title">
+        <h1 class="title">
           {{ modalMode === 'user' ? $t('settings.settings') : $t('admin_dash.window_title') }}
-        </span>
+        </h1>
         <transition name="fade">
           <div
             v-if="currentSaveStateNotice"
diff --git a/src/components/settings_modal/tabs/theme_tab/theme_preview.vue b/src/components/settings_modal/tabs/theme_tab/theme_preview.vue
index dbaecee4..4446c18b 100644
--- a/src/components/settings_modal/tabs/theme_tab/theme_preview.vue
+++ b/src/components/settings_modal/tabs/theme_tab/theme_preview.vue
@@ -3,12 +3,12 @@
     <div class="underlay underlay-preview" />
     <div class="panel dummy">
       <div class="panel-heading">
-        <div class="title">
+        <h1 class="title">
           {{ $t('settings.style.preview.header') }}
           <span class="badge -notification">
             99
           </span>
-        </div>
+        </h1>
         <span class="faint">
           {{ $t('settings.style.preview.header_faint') }}
         </span>
diff --git a/src/components/shout_panel/shout_panel.vue b/src/components/shout_panel/shout_panel.vue
index 9113211e..67927df8 100644
--- a/src/components/shout_panel/shout_panel.vue
+++ b/src/components/shout_panel/shout_panel.vue
@@ -9,14 +9,14 @@
         :class="{ 'shout-heading': floating }"
         @click.stop.prevent="togglePanel"
       >
-        <div class="title">
+        <h1 class="title">
           {{ $t('shoutbox.title') }}
           <FAIcon
             v-if="floating"
             icon="times"
             class="close-icon"
           />
-        </div>
+        </h1>
       </div>
       <div class="panel-body shout-window">
         <div
diff --git a/src/components/status_history_modal/status_history_modal.vue b/src/components/status_history_modal/status_history_modal.vue
index 79642e9c..d89f4959 100644
--- a/src/components/status_history_modal/status_history_modal.vue
+++ b/src/components/status_history_modal/status_history_modal.vue
@@ -6,7 +6,9 @@
   >
     <div class="status-history-modal-panel panel">
       <div class="panel-heading">
-        {{ $t('status.status_history') }} ({{ historyCount }})
+        <h1 class="title">
+          {{ $t('status.status_history') }} ({{ historyCount }})
+        </h1>
       </div>
       <div class="panel-body">
         <div
diff --git a/src/components/timeline_menu/timeline_menu.vue b/src/components/timeline_menu/timeline_menu.vue
index bdcfb73d..717c8a8e 100644
--- a/src/components/timeline_menu/timeline_menu.vue
+++ b/src/components/timeline_menu/timeline_menu.vue
@@ -29,8 +29,8 @@
       </ul>
     </template>
     <template #trigger>
-      <span class="button-unstyled title timeline-menu-title">
-        <span class="timeline-title">{{ timelineName() }}</span>
+      <span class="button-unstyled timeline-menu-title">
+        <h1 class="title timeline-title">{{ timelineName() }}</h1>
         <span>
           <FAIcon
             size="sm"
diff --git a/src/components/update_notification/update_notification.vue b/src/components/update_notification/update_notification.vue
index 78e70a74..6fc363d4 100644
--- a/src/components/update_notification/update_notification.vue
+++ b/src/components/update_notification/update_notification.vue
@@ -9,9 +9,9 @@
       :class="{ '-peek': !showingMore }"
     >
       <div class="panel-heading">
-        <span class="title">
+        <h1 class="title">
           {{ $t('update.big_update_title') }}
-        </span>
+        </h1>
       </div>
       <div class="panel-body">
         <div
diff --git a/src/components/user_link/user_link.vue b/src/components/user_link/user_link.vue
index efd96e12..80b941d3 100644
--- a/src/components/user_link/user_link.vue
+++ b/src/components/user_link/user_link.vue
@@ -1,12 +1,16 @@
 <template>
-  <router-link
-    :title="user.screen_name_ui"
-    :to="userProfileLink(user)"
-  >
-    {{ at ? '@' : '' }}{{ user.screen_name_ui }}<UnicodeDomainIndicator
-      :user="user"
-    />
-  </router-link>
+  <div class="user-profile-link">
+    <router-link
+      :title="user.screen_name_ui"
+      :to="userProfileLink(user)"
+    >
+      <slot>
+        {{ at ? '@' : '' }}{{ user.screen_name_ui }}<UnicodeDomainIndicator
+          :user="user"
+        />
+      </slot>
+    </router-link>
+  </div>
 </template>
 
 <script>
diff --git a/src/components/user_profile/user_profile.vue b/src/components/user_profile/user_profile.vue
index 1ec12d0c..86b211bf 100644
--- a/src/components/user_profile/user_profile.vue
+++ b/src/components/user_profile/user_profile.vue
@@ -142,9 +142,9 @@
       class="panel user-profile-placeholder"
     >
       <div class="panel-heading">
-        <div class="title">
+        <h1 class="title">
           {{ $t('settings.profile_tab') }}
-        </div>
+        </h1>
       </div>
       <div>
         <span v-if="error">{{ error }}</span>
diff --git a/src/components/user_reporting_modal/user_reporting_modal.vue b/src/components/user_reporting_modal/user_reporting_modal.vue
index 2bda509a..100d1e7f 100644
--- a/src/components/user_reporting_modal/user_reporting_modal.vue
+++ b/src/components/user_reporting_modal/user_reporting_modal.vue
@@ -6,7 +6,7 @@
     <div class="user-reporting-panel panel">
       <div class="panel-heading">
         <i18n-t
-          tag="div"
+          tag="h1"
           keypath="user_reporting.title"
           class="title"
         >
diff --git a/src/components/who_to_follow/who_to_follow.vue b/src/components/who_to_follow/who_to_follow.vue
index 56543d91..7cb4d476 100644
--- a/src/components/who_to_follow/who_to_follow.vue
+++ b/src/components/who_to_follow/who_to_follow.vue
@@ -1,7 +1,9 @@
 <template>
   <div class="panel panel-default">
     <div class="panel-heading">
-      {{ $t('who_to_follow.who_to_follow') }}
+      <h1 class="title">
+        {{ $t('who_to_follow.who_to_follow') }}
+      </h1>
     </div>
     <div class="panel-body">
       <FollowCard
diff --git a/src/components/who_to_follow_panel/who_to_follow_panel.vue b/src/components/who_to_follow_panel/who_to_follow_panel.vue
index 0fecec0b..92d6f6d7 100644
--- a/src/components/who_to_follow_panel/who_to_follow_panel.vue
+++ b/src/components/who_to_follow_panel/who_to_follow_panel.vue
@@ -2,9 +2,9 @@
   <div class="who-to-follow-panel">
     <div class="panel panel-default base01-background">
       <div class="panel-heading timeline-heading base02-background base04">
-        <div class="title">
+        <h1 class="title">
           {{ $t('who_to_follow.who_to_follow') }}
-        </div>
+        </h1>
       </div>
       <div class="who-to-follow">
         <p
diff --git a/src/panel.scss b/src/panel.scss
index e974e7f6..47d55aa4 100644
--- a/src/panel.scss
+++ b/src/panel.scss
@@ -115,6 +115,8 @@
 
   .title {
     font-size: 1.3em;
+    margin: 0;
+    font-weight: normal;
   }
 
   .alert {

From 898881bac1676a7dcee54b1fdcbb32bbf47f2b1c Mon Sep 17 00:00:00 2001
From: Matrix-Sasuke <matrixsasuke@trash-mail.com>
Date: Wed, 13 Nov 2024 09:19:17 +0000
Subject: [PATCH 08/12] Absolute time format

---
 changelog.d/weird-absolute-time-format.fix | 1 +
 src/components/timeago/timeago.vue         | 2 +-
 src/modules/config.js                      | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)
 create mode 100644 changelog.d/weird-absolute-time-format.fix

diff --git a/changelog.d/weird-absolute-time-format.fix b/changelog.d/weird-absolute-time-format.fix
new file mode 100644
index 00000000..727d5876
--- /dev/null
+++ b/changelog.d/weird-absolute-time-format.fix
@@ -0,0 +1 @@
+Show only month and day instead of weird "day, hour" format. While at it, fixed typo "defualt" in a comment.
\ No newline at end of file
diff --git a/src/components/timeago/timeago.vue b/src/components/timeago/timeago.vue
index bf918441..484944d6 100644
--- a/src/components/timeago/timeago.vue
+++ b/src/components/timeago/timeago.vue
@@ -61,7 +61,7 @@ export default {
           })
         } else if (DateUtils.isSameMonth(this.timeAsDate, now)) {
           return new Intl.DateTimeFormat(this.browserLocale, {
-            hour: 'numeric',
+            month: 'short',
             day: 'numeric'
           })
         } else if (DateUtils.isSameYear(this.timeAsDate, now)) {
diff --git a/src/modules/config.js b/src/modules/config.js
index 835dcce4..2a2ee2be 100644
--- a/src/modules/config.js
+++ b/src/modules/config.js
@@ -181,7 +181,7 @@ export const defaultState = {
   closingDrawerMarksAsSeen: undefined, // instance default
   unseenAtTop: undefined, // instance default
   ignoreInactionableSeen: undefined, // instance default
-  useAbsoluteTimeFormat: undefined, // instance defualt
+  useAbsoluteTimeFormat: undefined, // instance default
   absoluteTimeFormatMinAge: undefined // instance default
 }
 

From eef151e7a670ea8dd56d7a497d740cf23ddfd5bf Mon Sep 17 00:00:00 2001
From: Matrix-Sasuke <ken@shigusegubu.club>
Date: Thu, 14 Nov 2024 11:48:57 +0100
Subject: [PATCH 09/12] fix bookmarks not showing on mobile

---
 src/components/navigation/navigation.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/navigation/navigation.js b/src/components/navigation/navigation.js
index 9fc264ba..efd5a420 100644
--- a/src/components/navigation/navigation.js
+++ b/src/components/navigation/navigation.js
@@ -33,7 +33,7 @@ export const TIMELINES = {
     route: 'bookmarks',
     icon: 'bookmark',
     label: 'nav.bookmarks',
-    criteria: ['!supportsBookmarkFolders']
+    criteria: ['!supportsBookmarkFolders', 'supportsBookmarkFolders']
   },
   favorites: {
     routeObject: { name: 'user-profile', query: { tab: 'favorites' } },

From 4fcd51122598dbe51bc85c6c193cbfdb15a5da20 Mon Sep 17 00:00:00 2001
From: Matrix-Sasuke <ken@shigusegubu.club>
Date: Thu, 14 Nov 2024 12:36:31 +0100
Subject: [PATCH 10/12] fix bookmarks not showing on mobile

---
 changelog.d/show-bookmarks-on-mobile.fix | 1 +
 src/components/navigation/navigation.js  | 3 +--
 2 files changed, 2 insertions(+), 2 deletions(-)
 create mode 100644 changelog.d/show-bookmarks-on-mobile.fix

diff --git a/changelog.d/show-bookmarks-on-mobile.fix b/changelog.d/show-bookmarks-on-mobile.fix
new file mode 100644
index 00000000..620c3c63
--- /dev/null
+++ b/changelog.d/show-bookmarks-on-mobile.fix
@@ -0,0 +1 @@
+Bookmarks on mobile were no longer showing
diff --git a/src/components/navigation/navigation.js b/src/components/navigation/navigation.js
index efd5a420..face430e 100644
--- a/src/components/navigation/navigation.js
+++ b/src/components/navigation/navigation.js
@@ -32,8 +32,7 @@ export const TIMELINES = {
   bookmarks: {
     route: 'bookmarks',
     icon: 'bookmark',
-    label: 'nav.bookmarks',
-    criteria: ['!supportsBookmarkFolders', 'supportsBookmarkFolders']
+    label: 'nav.bookmarks'
   },
   favorites: {
     routeObject: { name: 'user-profile', query: { tab: 'favorites' } },

From 27d2ac6f6629f7ac10b2a572d21af124a18ab951 Mon Sep 17 00:00:00 2001
From: Matrix-Sasuke <ken@shigusegubu.club>
Date: Thu, 14 Nov 2024 17:23:05 +0100
Subject: [PATCH 11/12] fix bookmarks not showing on mobile properly

---
 changelog.d/show-bookmarks-on-mobile.fix   |  2 +-
 src/components/navigation/navigation.js    |  3 ++-
 src/components/side_drawer/side_drawer.vue | 15 +++++++++++++++
 3 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/changelog.d/show-bookmarks-on-mobile.fix b/changelog.d/show-bookmarks-on-mobile.fix
index 620c3c63..3b5db483 100644
--- a/changelog.d/show-bookmarks-on-mobile.fix
+++ b/changelog.d/show-bookmarks-on-mobile.fix
@@ -1 +1 @@
-Bookmarks on mobile were no longer showing
+Bookmarks visible again on mobile
diff --git a/src/components/navigation/navigation.js b/src/components/navigation/navigation.js
index face430e..9fc264ba 100644
--- a/src/components/navigation/navigation.js
+++ b/src/components/navigation/navigation.js
@@ -32,7 +32,8 @@ export const TIMELINES = {
   bookmarks: {
     route: 'bookmarks',
     icon: 'bookmark',
-    label: 'nav.bookmarks'
+    label: 'nav.bookmarks',
+    criteria: ['!supportsBookmarkFolders']
   },
   favorites: {
     routeObject: { name: 'user-profile', query: { tab: 'favorites' } },
diff --git a/src/components/side_drawer/side_drawer.vue b/src/components/side_drawer/side_drawer.vue
index 608b5608..91b10ea0 100644
--- a/src/components/side_drawer/side_drawer.vue
+++ b/src/components/side_drawer/side_drawer.vue
@@ -76,6 +76,21 @@
             /> {{ $t("nav.lists") }}
           </router-link>
         </li>
+        <li
+          v-if="currentUser"
+          @click="toggleDrawer"
+        >
+          <router-link
+            :to="{ name: 'bookmarks' }"
+            class="menu-item"
+          >
+            <FAIcon
+              fixed-width
+              class="fa-scale-110 fa-old-padding"
+              icon="bookmark"
+            /> {{ $t("nav.bookmarks") }}
+          </router-link>
+        </li>
         <li
           v-if="currentUser && pleromaChatMessagesAvailable"
           @click="toggleDrawer"

From 9b2f54c571217bac5540950ee494f283a09a2fca Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Thu, 19 Dec 2024 14:00:11 +0200
Subject: [PATCH 12/12] changelog

---
 changelog.d/checkbox.fix | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelog.d/checkbox.fix

diff --git a/changelog.d/checkbox.fix b/changelog.d/checkbox.fix
new file mode 100644
index 00000000..6a947ec8
--- /dev/null
+++ b/changelog.d/checkbox.fix
@@ -0,0 +1 @@
+checkbox vertical alignment has been fixed