From 5ab96ae0d235b6a30648d2d493be3fd3c4301e5b Mon Sep 17 00:00:00 2001 From: Shpuld Shpuldson Date: Mon, 11 Jan 2021 19:40:35 +0200 Subject: [PATCH 01/47] don't filter own posts --- src/components/status/status.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/components/status/status.js b/src/components/status/status.js index f9c710ab7d..2bf93a9eb6 100644 --- a/src/components/status/status.js +++ b/src/components/status/status.js @@ -157,6 +157,7 @@ const Status = { return muteWordHits(this.status, this.muteWords) }, muted () { + if (this.statusoid.user.id === this.currentUser.id) return false const { status } = this const { reblog } = status const relationship = this.$store.getters.relationship(status.user.id) From cdb9b4aea287bb5437d31cf574cc66503c981ea9 Mon Sep 17 00:00:00 2001 From: Shpuld Shpuldson Date: Mon, 11 Jan 2021 19:41:42 +0200 Subject: [PATCH 02/47] changelog update --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4f270bfeaf..d4dd484b5b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - Follows/Followers tabs on user profiles now display the content properly. - Handle punycode in screen names +### Changed +- Don't filter own posts when they hit your wordfilter + ## [2.2.2] - 2020-12-22 ### Added - Mouseover titles for emojis in reaction picker From 38e5eec12213e01aa37ae61387e3e70ad3467747 Mon Sep 17 00:00:00 2001 From: Ben Is Date: Tue, 12 Jan 2021 13:13:07 +0000 Subject: [PATCH 03/47] Translated using Weblate (Italian) Currently translated at 100.0% (677 of 677 strings) Translation: Pleroma/Pleroma-FE Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/it/ --- src/i18n/it.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/i18n/it.json b/src/i18n/it.json index 2301a4c0ef..ea8f176001 100644 --- a/src/i18n/it.json +++ b/src/i18n/it.json @@ -495,7 +495,7 @@ "features_panel": { "chat": "Chat", "gopher": "Gopher", - "media_proxy": "Proxy multimedia", + "media_proxy": "Proxy allegati", "scope_options": "Opzioni visibilità", "text_limit": "Lunghezza massima", "title": "Caratteristiche", @@ -505,7 +505,7 @@ }, "finder": { "error_fetching_user": "Errore nel recupero dell'utente", - "find_user": "Trova utente" + "find_user": "Cerca utente" }, "login": { "login": "Accedi", @@ -611,13 +611,13 @@ "ftl_removal_desc": "Questa stanza rimuove le seguenti dalla sequenza globale:", "media_removal": "Rimozione multimedia", "media_removal_desc": "Questa istanza rimuove gli allegati dalle seguenti stanze:", - "media_nsfw": "Allegati oscurati forzatamente", + "media_nsfw": "Allegati oscurati d'ufficio", "media_nsfw_desc": "Questa stanza oscura gli allegati dei messaggi provenienti da queste stanze:" }, "mrf_policies": "Regole RM abilitate", "mrf_policies_desc": "Le regole RM cambiano il comportamento federativo della stanza. Vigono le seguenti regole:" }, - "staff": "Equipaggio" + "staff": "Responsabili" }, "domain_mute_card": { "mute": "Zittisci", From 9656c9b96919f17647adda80ba187a4f5b2299e1 Mon Sep 17 00:00:00 2001 From: Mark Felder Date: Mon, 18 Jan 2021 15:54:12 -0600 Subject: [PATCH 04/47] Support old user.deactivated and new user.is_active fields --- src/services/entity_normalizer/entity_normalizer.service.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/services/entity_normalizer/entity_normalizer.service.js b/src/services/entity_normalizer/entity_normalizer.service.js index 625f593ea9..a199ebd040 100644 --- a/src/services/entity_normalizer/entity_normalizer.service.js +++ b/src/services/entity_normalizer/entity_normalizer.service.js @@ -188,7 +188,9 @@ export const parseUser = (data) => { output.follow_request_count = data.pleroma.follow_request_count output.tags = data.pleroma.tags - output.deactivated = data.pleroma.deactivated + // deactivated was changed to is_active in Pleroma 2.3.0 + // backwards compatability kept for now + output.deactivated = data.pleroma.deactivated ? !data.pleroma.is_active : data.pleroma.deactivated output.notification_settings = data.pleroma.notification_settings output.unread_chat_count = data.pleroma.unread_chat_count From 36e56354e448b3c2106668f353dedcab5fde794d Mon Sep 17 00:00:00 2001 From: Mark Felder Date: Tue, 19 Jan 2021 10:01:55 -0600 Subject: [PATCH 05/47] More robust backwards compatibility --- .../entity_normalizer/entity_normalizer.service.js | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/services/entity_normalizer/entity_normalizer.service.js b/src/services/entity_normalizer/entity_normalizer.service.js index a199ebd040..d6d84d9aae 100644 --- a/src/services/entity_normalizer/entity_normalizer.service.js +++ b/src/services/entity_normalizer/entity_normalizer.service.js @@ -188,9 +188,12 @@ export const parseUser = (data) => { output.follow_request_count = data.pleroma.follow_request_count output.tags = data.pleroma.tags + // deactivated was changed to is_active in Pleroma 2.3.0 - // backwards compatability kept for now - output.deactivated = data.pleroma.deactivated ? !data.pleroma.is_active : data.pleroma.deactivated + // so check if is_active is present + output.deactivated = typeof data.pleroma.is_active !== undefined + ? !data.pleroma.is_active // new backend + : data.pleroma.deactivated // old backend output.notification_settings = data.pleroma.notification_settings output.unread_chat_count = data.pleroma.unread_chat_count From b76a68e622b2db6474acdd206bbdfb2e66fefd8f Mon Sep 17 00:00:00 2001 From: rinpatch Date: Wed, 20 Jan 2021 14:03:26 +0300 Subject: [PATCH 06/47] UserCard: Make user roles translateable I did not add a translation for my native language in this patch because I am not sure how weblate would react, but I did add it locally and it seems to work. --- src/components/user_card/user_card.vue | 3 +-- src/i18n/en.json | 4 ++++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/components/user_card/user_card.vue b/src/components/user_card/user_card.vue index 16dd524954..773f764a0e 100644 --- a/src/components/user_card/user_card.vue +++ b/src/components/user_card/user_card.vue @@ -83,7 +83,7 @@ v-if="!!visibleRole" class="alert user-role" > - {{ visibleRole }} + {{ $t(`user_card.roles.${visibleRole}`) }} Date: Wed, 20 Jan 2021 17:01:57 +0200 Subject: [PATCH 07/47] fix profile field buttons, remove attachment button --- .../post_status_form/post_status_form.vue | 26 +++++-------------- .../settings_modal/tabs/profile_tab.scss | 9 ++++--- .../settings_modal/tabs/profile_tab.vue | 14 +++++----- 3 files changed, 18 insertions(+), 31 deletions(-) diff --git a/src/components/post_status_form/post_status_form.vue b/src/components/post_status_form/post_status_form.vue index ed830f573f..73f6a4f10e 100644 --- a/src/components/post_status_form/post_status_form.vue +++ b/src/components/post_status_form/post_status_form.vue @@ -302,11 +302,12 @@ :key="file.url" class="media-upload-wrapper" > - + > + + .emoji-input { + & > .emoji-input { flex: 1 1 auto; - margin: 0 .2em .5em; + margin: 0 0.2em 0.5em; min-width: 0; } - &>.icon-container { + & > .button-unstyled { width: 20px; align-self: center; - margin: 0 .2em .5em; + margin: 0 0.2em 0.5em; + padding: 0 0.5em; } } } diff --git a/src/components/settings_modal/tabs/profile_tab.vue b/src/components/settings_modal/tabs/profile_tab.vue index b7ef21d77a..abb16db2d8 100644 --- a/src/components/settings_modal/tabs/profile_tab.vue +++ b/src/components/settings_modal/tabs/profile_tab.vue @@ -124,24 +124,24 @@ :placeholder="$t('settings.profile_fields.value')" > -
-
+ - {{ $t("settings.profile_fields.add_field") }} - +

From 8011556c289f5167a0294c47e849d88e53f0d0ed Mon Sep 17 00:00:00 2001 From: Shpuld Shpuldson Date: Wed, 20 Jan 2021 17:03:51 +0200 Subject: [PATCH 08/47] backport 2.2.3 to changelog --- CHANGELOG.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 40c1d9828d..12a38a039e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,8 +3,10 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - ## [Unreleased] + + +## [2.2.3] - 2021-01-18 ### Added - Added Report button to status ellipsis menu for easier reporting @@ -15,6 +17,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). ### Changed - Don't filter own posts when they hit your wordfilter + ## [2.2.2] - 2020-12-22 ### Added - Mouseover titles for emojis in reaction picker From 02ab803725e42a749c6c8f564e8093df70e97fc7 Mon Sep 17 00:00:00 2001 From: Shpuld Shpuldson Date: Wed, 20 Jan 2021 17:36:40 +0200 Subject: [PATCH 09/47] change a few more buttons to real buttons --- CHANGELOG.md | 2 ++ src/App.scss | 7 +++++ src/components/poll/poll_form.vue | 30 ++++++------------- .../settings_modal/tabs/profile_tab.vue | 4 +-- 4 files changed, 20 insertions(+), 23 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 12a38a039e..1107491e06 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,8 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). ## [Unreleased] +### Fixed +- Button to remove uploaded media in post status form is now properly placed and sized. ## [2.2.3] - 2021-01-18 diff --git a/src/App.scss b/src/App.scss index 2a1d7b1bc2..8b91f3dea1 100644 --- a/src/App.scss +++ b/src/App.scss @@ -178,6 +178,13 @@ a { &.-fullwidth { width: 100%; } + + &.-hover-highlight { + &:hover svg { + color: $fallback--lightText; + color: var(--lightText, $fallback--lightText); + } + } } input, textarea, .select, .input { diff --git a/src/components/poll/poll_form.vue b/src/components/poll/poll_form.vue index 31f204a00c..094961052a 100644 --- a/src/components/poll/poll_form.vue +++ b/src/components/poll/poll_form.vue @@ -21,20 +21,17 @@ @keydown.enter.stop.prevent="nextOption(index)" > -

- -
+ + - {{ $t("polls.add_option") }} - +