From 623a961141a58ee9bff636271d0dc62c1e5ee20e Mon Sep 17 00:00:00 2001 From: Henry Jameson Date: Thu, 22 Feb 2024 18:07:56 +0200 Subject: changelog to make pipelines happy --- changelog.d/themes3.change | 1 + 1 file changed, 1 insertion(+) create mode 100644 changelog.d/themes3.change (limited to 'changelog.d') diff --git a/changelog.d/themes3.change b/changelog.d/themes3.change new file mode 100644 index 00000000..5255f9b1 --- /dev/null +++ b/changelog.d/themes3.change @@ -0,0 +1 @@ +Overhauled the way themes work, migrating to new Pleroma Interface Style Sheets system. -- cgit v1.2.3-70-g09d2 From d5575f9c132d49eed79768dd5d53db763e42f86c Mon Sep 17 00:00:00 2001 From: Phantasm Date: Tue, 26 Mar 2024 18:59:39 +0100 Subject: Add poll end notifications to fetched types --- changelog.d/poll-ended-notifications.fix | 1 + src/services/notifications_fetcher/notifications_fetcher.service.js | 1 + 2 files changed, 2 insertions(+) create mode 100644 changelog.d/poll-ended-notifications.fix (limited to 'changelog.d') diff --git a/changelog.d/poll-ended-notifications.fix b/changelog.d/poll-ended-notifications.fix new file mode 100644 index 00000000..d04b8cb0 --- /dev/null +++ b/changelog.d/poll-ended-notifications.fix @@ -0,0 +1 @@ +Add poll end notifications to fetched types. diff --git a/src/services/notifications_fetcher/notifications_fetcher.service.js b/src/services/notifications_fetcher/notifications_fetcher.service.js index c91a86c8..5bcda826 100644 --- a/src/services/notifications_fetcher/notifications_fetcher.service.js +++ b/src/services/notifications_fetcher/notifications_fetcher.service.js @@ -9,6 +9,7 @@ const mastoApiNotificationTypes = [ 'reblog', 'follow', 'move', + 'poll', 'pleroma:emoji_reaction', 'pleroma:report' ] -- cgit v1.2.3-70-g09d2 From 19ab07af964f34087a41ac3cbabd81b2bb3147da Mon Sep 17 00:00:00 2001 From: Henry Jameson Date: Wed, 3 Apr 2024 23:08:13 +0300 Subject: changelog --- changelog.d/themes3-fixes.fix | 1 + 1 file changed, 1 insertion(+) create mode 100644 changelog.d/themes3-fixes.fix (limited to 'changelog.d') diff --git a/changelog.d/themes3-fixes.fix b/changelog.d/themes3-fixes.fix new file mode 100644 index 00000000..15c31e82 --- /dev/null +++ b/changelog.d/themes3-fixes.fix @@ -0,0 +1 @@ +fix color inputs and some in-development themes3 issues -- cgit v1.2.3-70-g09d2 From b173741f870243c6ded3b6f400827f8c00f20bb7 Mon Sep 17 00:00:00 2001 From: tusooa Date: Sun, 14 Apr 2024 11:46:29 -0400 Subject: Display loading and error indicator for conversation page --- changelog.d/status-loading-indicator.add | 1 + src/components/conversation/conversation.js | 7 ++++++- src/components/conversation/conversation.vue | 17 +++++++++++++++++ src/i18n/en.json | 4 +++- 4 files changed, 27 insertions(+), 2 deletions(-) create mode 100644 changelog.d/status-loading-indicator.add (limited to 'changelog.d') diff --git a/changelog.d/status-loading-indicator.add b/changelog.d/status-loading-indicator.add new file mode 100644 index 00000000..d0725677 --- /dev/null +++ b/changelog.d/status-loading-indicator.add @@ -0,0 +1 @@ +Display loading and error indicator for conversation page diff --git a/src/components/conversation/conversation.js b/src/components/conversation/conversation.js index 85e6d8ad..a94d2130 100644 --- a/src/components/conversation/conversation.js +++ b/src/components/conversation/conversation.js @@ -56,7 +56,8 @@ const conversation = { expanded: false, threadDisplayStatusObject: {}, // id => 'showing' | 'hidden' statusContentPropertiesObject: {}, - inlineDivePosition: null + inlineDivePosition: null, + loadStatusError: null } }, props: [ @@ -392,11 +393,15 @@ const conversation = { this.setHighlight(this.originalStatusId) }) } else { + this.loadStatusError = null this.$store.state.api.backendInteractor.fetchStatus({ id: this.statusId }) .then((status) => { this.$store.dispatch('addNewStatuses', { statuses: [status] }) this.fetchConversation() }) + .catch((error) => { + this.loadStatusError = error + }) } }, getReplies (id) { diff --git a/src/components/conversation/conversation.vue b/src/components/conversation/conversation.vue index 171e6717..526de5c3 100644 --- a/src/components/conversation/conversation.vue +++ b/src/components/conversation/conversation.vue @@ -29,6 +29,23 @@ />
+

+ + {{ $t('status.loading') }} +

+

+ {{ $t('status.load_error', { error: loadStatusError }) }} +

+
+
diff --git a/src/i18n/en.json b/src/i18n/en.json index 8b7d6021..a011139a 100644 --- a/src/i18n/en.json +++ b/src/i18n/en.json @@ -1110,7 +1110,9 @@ "hide_quote": "Hide the quoted status", "display_quote": "Display the quoted status", "invisible_quote": "Quoted status unavailable: {link}", - "more_actions": "More actions on this status" + "more_actions": "More actions on this status", + "loading": "Loading...", + "load_error": "Unable to load status: {error}" }, "user_card": { "approve": "Approve", -- cgit v1.2.3-70-g09d2 From 1ceffb4e713b4b20d70121fba92d2b50f2d3cadf Mon Sep 17 00:00:00 2001 From: marcin mikołajczak Date: Mon, 15 Apr 2024 23:54:13 +0200 Subject: Fix fetching favorites for own profile MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: marcin mikołajczak --- changelog.d/public-favorites.skip | 0 src/components/user_profile/user_profile.vue | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) create mode 100644 changelog.d/public-favorites.skip (limited to 'changelog.d') diff --git a/changelog.d/public-favorites.skip b/changelog.d/public-favorites.skip new file mode 100644 index 00000000..e69de29b diff --git a/src/components/user_profile/user_profile.vue b/src/components/user_profile/user_profile.vue index 921c87ea..1ec12d0c 100644 --- a/src/components/user_profile/user_profile.vue +++ b/src/components/user_profile/user_profile.vue @@ -127,7 +127,7 @@ :title="$t('user_card.favorites')" timeline-name="favorites" :timeline="favorites" - :user-id="userId" + :user-id="isUs ? undefined : userId" :in-profile="true" :footer-slipgate="footerRef" /> -- cgit v1.2.3-70-g09d2 From c40b02ac2f7c658fecb21db8ef3a15a6e498c4be Mon Sep 17 00:00:00 2001 From: Henry Jameson Date: Mon, 22 Apr 2024 23:46:12 +0300 Subject: changelog --- changelog.d/notif-types.fix | 1 + 1 file changed, 1 insertion(+) create mode 100644 changelog.d/notif-types.fix (limited to 'changelog.d') diff --git a/changelog.d/notif-types.fix b/changelog.d/notif-types.fix new file mode 100644 index 00000000..fb0e5046 --- /dev/null +++ b/changelog.d/notif-types.fix @@ -0,0 +1 @@ +Synchronized requested notification types with backend, hopefully should fix missing notifications for polls and follow requests -- cgit v1.2.3-70-g09d2 From 64732604871f23734f5600810e165b625d15ffda Mon Sep 17 00:00:00 2001 From: Henry Jameson Date: Wed, 24 Apr 2024 15:25:21 +0300 Subject: changelog --- changelog.d/mute-nsfw.add | 1 + 1 file changed, 1 insertion(+) create mode 100644 changelog.d/mute-nsfw.add (limited to 'changelog.d') diff --git a/changelog.d/mute-nsfw.add b/changelog.d/mute-nsfw.add new file mode 100644 index 00000000..b1794a0c --- /dev/null +++ b/changelog.d/mute-nsfw.add @@ -0,0 +1 @@ +Added ability to mute sensitive posts (ported from eintei) -- cgit v1.2.3-70-g09d2