From c8b5b7845da6874b4d4ecbea5ac7003171c5ad29 Mon Sep 17 00:00:00 2001 From: Henry Jameson Date: Sun, 29 Oct 2023 18:29:28 +0200 Subject: [PATCH 1/7] Changelog 2.6.0 --- CHANGELOG.md | 25 +++++++++++++++++ ...add-taiwanese-aka-hokkien-i18n-support.add | 1 - changelog.d/adminfe.add | 1 - changelog.d/check-changelog.skip | 0 changelog.d/custom-emoji-notif-width.fix | 1 - changelog.d/edit-profile-button.fix | 1 - .../emoji-picker-button-accessible.fix | 1 - changelog.d/export-subst-hash.fix | 1 - changelog.d/fix-reports.fix | 1 - changelog.d/html-attribute-parsing.fix | 1 - changelog.d/mention-twice.fix | 1 - changelog.d/mentionsline-shouldbreak.fix | 1 - changelog.d/nonascii-tags.fix | 1 - changelog.d/oauth2-token-linger.fix | 1 - changelog.d/parser.fix | 1 - changelog.d/quote-hide-oops.fix | 1 - changelog.d/quote-hide.fix | 1 - changelog.d/quote.add | 1 - changelog.d/react-button-safari.fix | 1 - changelog.d/react-button.fix | 1 - changelog.d/reload-user-pinned.fix | 1 - changelog.d/scroll-emoji-selector-safari.fix | 1 - tools/collect-changelog | 27 +++++++++++++++++++ 23 files changed, 52 insertions(+), 20 deletions(-) delete mode 100644 changelog.d/add-taiwanese-aka-hokkien-i18n-support.add delete mode 100644 changelog.d/adminfe.add delete mode 100644 changelog.d/check-changelog.skip delete mode 100644 changelog.d/custom-emoji-notif-width.fix delete mode 100644 changelog.d/edit-profile-button.fix delete mode 100644 changelog.d/emoji-picker-button-accessible.fix delete mode 100644 changelog.d/export-subst-hash.fix delete mode 100644 changelog.d/fix-reports.fix delete mode 100644 changelog.d/html-attribute-parsing.fix delete mode 100644 changelog.d/mention-twice.fix delete mode 100644 changelog.d/mentionsline-shouldbreak.fix delete mode 100644 changelog.d/nonascii-tags.fix delete mode 100644 changelog.d/oauth2-token-linger.fix delete mode 100644 changelog.d/parser.fix delete mode 100644 changelog.d/quote-hide-oops.fix delete mode 100644 changelog.d/quote-hide.fix delete mode 100644 changelog.d/quote.add delete mode 100644 changelog.d/react-button-safari.fix delete mode 100644 changelog.d/react-button.fix delete mode 100644 changelog.d/reload-user-pinned.fix delete mode 100644 changelog.d/scroll-emoji-selector-safari.fix create mode 100755 tools/collect-changelog diff --git a/CHANGELOG.md b/CHANGELOG.md index 3fb72931..fe382b96 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,31 @@ 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/). +## 2.6.0 +### Added +- add the initial i18n translation file for Taiwanese (Hokkien), and modify some related files. +- Implemented a very basic instance administration screen +- Implement quoting + +### Fixed +- Keep aspect ratio of custom emoji reaction in notification +- Fix openSettingsModalTab so that it correctly opens Settings modal instead of Admin modal +- Add alt text to emoji picker buttons +- Use export-subst gitattribute to allow tarball builds +- fix reports now showing reason/content +- Fix HTML attribute parsing, discard attributes not strating with a letter +- Make MentionsLine aware of line breaking by non-br elements +- Fix a bug where mentioning a user twice will not fill the mention into the textarea +- Fix parsing non-ascii tags +- Fix OAuth2 token lingering after revocation +- fix regex issue in HTML parser/renderer +- don't display quoted status twice +- fix typo in code that prevented cards from showing at all +- Fix react button not working if reaction accounts are not loaded +- Fix react button misalignment on safari ios +- Fix pinned statuses gone when reloading user timeline +- Fix scrolling emoji selector in modal in safari ios + ## 2.5.1 ### Fixed - Checkboxes in settings can now work with screenreaders diff --git a/changelog.d/add-taiwanese-aka-hokkien-i18n-support.add b/changelog.d/add-taiwanese-aka-hokkien-i18n-support.add deleted file mode 100644 index 53d89805..00000000 --- a/changelog.d/add-taiwanese-aka-hokkien-i18n-support.add +++ /dev/null @@ -1 +0,0 @@ -add the initial i18n translation file for Taiwanese (Hokkien), and modify some related files. \ No newline at end of file diff --git a/changelog.d/adminfe.add b/changelog.d/adminfe.add deleted file mode 100644 index 188c4555..00000000 --- a/changelog.d/adminfe.add +++ /dev/null @@ -1 +0,0 @@ -Implemented a very basic instance administration screen diff --git a/changelog.d/check-changelog.skip b/changelog.d/check-changelog.skip deleted file mode 100644 index e69de29b..00000000 diff --git a/changelog.d/custom-emoji-notif-width.fix b/changelog.d/custom-emoji-notif-width.fix deleted file mode 100644 index da118f6b..00000000 --- a/changelog.d/custom-emoji-notif-width.fix +++ /dev/null @@ -1 +0,0 @@ -Keep aspect ratio of custom emoji reaction in notification diff --git a/changelog.d/edit-profile-button.fix b/changelog.d/edit-profile-button.fix deleted file mode 100644 index 5a92765c..00000000 --- a/changelog.d/edit-profile-button.fix +++ /dev/null @@ -1 +0,0 @@ -Fix openSettingsModalTab so that it correctly opens Settings modal instead of Admin modal diff --git a/changelog.d/emoji-picker-button-accessible.fix b/changelog.d/emoji-picker-button-accessible.fix deleted file mode 100644 index 12898a1a..00000000 --- a/changelog.d/emoji-picker-button-accessible.fix +++ /dev/null @@ -1 +0,0 @@ -Add alt text to emoji picker buttons diff --git a/changelog.d/export-subst-hash.fix b/changelog.d/export-subst-hash.fix deleted file mode 100644 index fb0d85cb..00000000 --- a/changelog.d/export-subst-hash.fix +++ /dev/null @@ -1 +0,0 @@ -Use export-subst gitattribute to allow tarball builds diff --git a/changelog.d/fix-reports.fix b/changelog.d/fix-reports.fix deleted file mode 100644 index 961b8033..00000000 --- a/changelog.d/fix-reports.fix +++ /dev/null @@ -1 +0,0 @@ -fix reports now showing reason/content:w diff --git a/changelog.d/html-attribute-parsing.fix b/changelog.d/html-attribute-parsing.fix deleted file mode 100644 index 0952f773..00000000 --- a/changelog.d/html-attribute-parsing.fix +++ /dev/null @@ -1 +0,0 @@ -Fix HTML attribute parsing, discard attributes not strating with a letter diff --git a/changelog.d/mention-twice.fix b/changelog.d/mention-twice.fix deleted file mode 100644 index 0e4b71df..00000000 --- a/changelog.d/mention-twice.fix +++ /dev/null @@ -1 +0,0 @@ -Fix a bug where mentioning a user twice will not fill the mention into the textarea diff --git a/changelog.d/mentionsline-shouldbreak.fix b/changelog.d/mentionsline-shouldbreak.fix deleted file mode 100644 index 33ee8d2c..00000000 --- a/changelog.d/mentionsline-shouldbreak.fix +++ /dev/null @@ -1 +0,0 @@ -Make MentionsLine aware of line breaking by non-br elements diff --git a/changelog.d/nonascii-tags.fix b/changelog.d/nonascii-tags.fix deleted file mode 100644 index e4c6dc82..00000000 --- a/changelog.d/nonascii-tags.fix +++ /dev/null @@ -1 +0,0 @@ -Fix parsing non-ascii tags diff --git a/changelog.d/oauth2-token-linger.fix b/changelog.d/oauth2-token-linger.fix deleted file mode 100644 index da4e4631..00000000 --- a/changelog.d/oauth2-token-linger.fix +++ /dev/null @@ -1 +0,0 @@ -Fix OAuth2 token lingering after revocation diff --git a/changelog.d/parser.fix b/changelog.d/parser.fix deleted file mode 100644 index 13bac0bf..00000000 --- a/changelog.d/parser.fix +++ /dev/null @@ -1 +0,0 @@ -fix regex issue in HTML parser/renderer diff --git a/changelog.d/quote-hide-oops.fix b/changelog.d/quote-hide-oops.fix deleted file mode 100644 index d93c0d29..00000000 --- a/changelog.d/quote-hide-oops.fix +++ /dev/null @@ -1 +0,0 @@ -fix typo in code that prevented cards from showing at all diff --git a/changelog.d/quote-hide.fix b/changelog.d/quote-hide.fix deleted file mode 100644 index 678fc3bc..00000000 --- a/changelog.d/quote-hide.fix +++ /dev/null @@ -1 +0,0 @@ -don't display quoted status twice diff --git a/changelog.d/quote.add b/changelog.d/quote.add deleted file mode 100644 index b43b6aba..00000000 --- a/changelog.d/quote.add +++ /dev/null @@ -1 +0,0 @@ -Implement quoting diff --git a/changelog.d/react-button-safari.fix b/changelog.d/react-button-safari.fix deleted file mode 100644 index 9846d50d..00000000 --- a/changelog.d/react-button-safari.fix +++ /dev/null @@ -1 +0,0 @@ -Fix react button misalignment on safari ios diff --git a/changelog.d/react-button.fix b/changelog.d/react-button.fix deleted file mode 100644 index c2222fb6..00000000 --- a/changelog.d/react-button.fix +++ /dev/null @@ -1 +0,0 @@ -Fix react button not working if reaction accounts are not loaded diff --git a/changelog.d/reload-user-pinned.fix b/changelog.d/reload-user-pinned.fix deleted file mode 100644 index db241c20..00000000 --- a/changelog.d/reload-user-pinned.fix +++ /dev/null @@ -1 +0,0 @@ -Fix pinned statuses gone when reloading user timeline diff --git a/changelog.d/scroll-emoji-selector-safari.fix b/changelog.d/scroll-emoji-selector-safari.fix deleted file mode 100644 index 3f5dda7d..00000000 --- a/changelog.d/scroll-emoji-selector-safari.fix +++ /dev/null @@ -1 +0,0 @@ -Fix scrolling emoji selector in modal in safari ios diff --git a/tools/collect-changelog b/tools/collect-changelog new file mode 100755 index 00000000..1e12d564 --- /dev/null +++ b/tools/collect-changelog @@ -0,0 +1,27 @@ +#!/bin/sh + +collectType() { + local suffix="$1" + local header="$2" + local printed=0 + for file in changelog.d/*."$suffix"; do + if [ '!' -f "$file" ]; then + continue + fi + if [ "$printed" = 0 ]; then + echo + echo "### $header" + printed=1 + fi + # Normalize any trailing newlines/spaces, etc. + echo "- $(cat "$file")" + done +} + +collectType security Security +collectType change Changed +collectType add Added +collectType fix Fixed +collectType remove Removed + +rm changelog.d/* From dbf14eee40bf6d7a4ce45605fc52c941013f7d4b Mon Sep 17 00:00:00 2001 From: Henry Jameson Date: Sun, 29 Oct 2023 18:30:08 +0200 Subject: [PATCH 2/7] Version 2.6.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 873f04ff..5d3b50ad 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "pleroma_fe", - "version": "2.5.0", + "version": "2.6.0", "description": "Pleroma frontend, the default frontend of Pleroma social network server", "author": "Pleroma contributors ", "private": false, From 9ccd01352290759575cd65b521eeba149c5cb3b7 Mon Sep 17 00:00:00 2001 From: HJ <30-hj@users.noreply.git.pleroma.social> Date: Sun, 12 Nov 2023 10:38:13 +0000 Subject: [PATCH 3/7] Merge branch 'tusooa/fix-admin-crash-when-no-primary-fe-set' into 'develop' fix admin crash when no primary fe set See merge request pleroma/pleroma-fe!1867 (cherry picked from commit faef2767cd7ba5961445e9c38e8ebf52d3610259) 661d5b6d Fix frontend admin tab crashing when no primary frontend is set b2c5520d Add changelog for frontend tab crash fix --- changelog.d/fix-admin-crash-when-no-primary-fe-set.fix | 1 + src/components/settings_modal/admin_tabs/frontends_tab.vue | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) create mode 100644 changelog.d/fix-admin-crash-when-no-primary-fe-set.fix diff --git a/changelog.d/fix-admin-crash-when-no-primary-fe-set.fix b/changelog.d/fix-admin-crash-when-no-primary-fe-set.fix new file mode 100644 index 00000000..78eae3be --- /dev/null +++ b/changelog.d/fix-admin-crash-when-no-primary-fe-set.fix @@ -0,0 +1 @@ +Fix frontend admin tab crashing when no primary frontend is set diff --git a/src/components/settings_modal/admin_tabs/frontends_tab.vue b/src/components/settings_modal/admin_tabs/frontends_tab.vue index 13b8fa6b..25b08eb7 100644 --- a/src/components/settings_modal/admin_tabs/frontends_tab.vue +++ b/src/components/settings_modal/admin_tabs/frontends_tab.vue @@ -33,9 +33,9 @@ > {{ frontend.name }} {{ ' ' }} - + Date: Sun, 12 Nov 2023 23:06:14 +0000 Subject: [PATCH 4/7] Merge branch 'tusooa/react-more-actions-fix' into 'develop' Accessibility for react & extra buttons See merge request pleroma/pleroma-fe!1869 (cherry picked from commit 18c0cf1845a95db2d0e894d2455cdd4dc545aaf7) 0026b35f Add alt text for react and extra-buttons popup 82063f34 Add aria-controls to extra-buttons trigger 5ff14837 Add changelog --- changelog.d/react-more-actions-fix.fix | 1 + src/components/emoji_input/emoji_input.js | 3 ++- src/components/emoji_picker/emoji_picker.vue | 2 +- src/components/extra_buttons/extra_buttons.js | 13 ++++++++++++- .../extra_buttons/extra_buttons.vue | 19 ++++++++++++++++++- src/components/poll/poll.js | 3 ++- .../post_status_form/post_status_form.js | 3 ++- src/components/react_button/react_button.vue | 2 ++ src/i18n/en.json | 3 ++- .../random_seed/random_seed.service.js | 3 +++ 10 files changed, 45 insertions(+), 7 deletions(-) create mode 100644 changelog.d/react-more-actions-fix.fix create mode 100644 src/services/random_seed/random_seed.service.js diff --git a/changelog.d/react-more-actions-fix.fix b/changelog.d/react-more-actions-fix.fix new file mode 100644 index 00000000..9ab41de2 --- /dev/null +++ b/changelog.d/react-more-actions-fix.fix @@ -0,0 +1 @@ +Add aria attributes to react and extra buttons diff --git a/src/components/emoji_input/emoji_input.js b/src/components/emoji_input/emoji_input.js index 68654f69..9baf63f2 100644 --- a/src/components/emoji_input/emoji_input.js +++ b/src/components/emoji_input/emoji_input.js @@ -1,4 +1,5 @@ import Completion from '../../services/completion/completion.js' +import genRandomSeed from '../../services/random_seed/random_seed.service.js' import EmojiPicker from '../emoji_picker/emoji_picker.vue' import Popover from 'src/components/popover/popover.vue' import ScreenReaderNotice from 'src/components/screen_reader_notice/screen_reader_notice.vue' @@ -110,7 +111,7 @@ const EmojiInput = { }, data () { return { - randomSeed: `${Math.random()}`.replace('.', '-'), + randomSeed: genRandomSeed(), input: undefined, caretEl: undefined, highlighted: -1, diff --git a/src/components/emoji_picker/emoji_picker.vue b/src/components/emoji_picker/emoji_picker.vue index b8d33309..0788f34c 100644 --- a/src/components/emoji_picker/emoji_picker.vue +++ b/src/components/emoji_picker/emoji_picker.vue @@ -3,7 +3,7 @@ ref="popover" trigger="click" popover-class="emoji-picker popover-default" - :trigger-attrs="{ 'aria-hidden': true }" + :trigger-attrs="{ 'aria-hidden': true, tabindex: -1 }" @show="onPopoverShown" @close="onPopoverClosed" > diff --git a/src/components/extra_buttons/extra_buttons.js b/src/components/extra_buttons/extra_buttons.js index 48b960b2..e2c88ceb 100644 --- a/src/components/extra_buttons/extra_buttons.js +++ b/src/components/extra_buttons/extra_buttons.js @@ -1,4 +1,5 @@ import Popover from '../popover/popover.vue' +import genRandomSeed from '../../services/random_seed/random_seed.service.js' import ConfirmModal from '../confirm_modal/confirm_modal.vue' import { library } from '@fortawesome/fontawesome-svg-core' import { @@ -40,7 +41,8 @@ const ExtraButtons = { data () { return { expanded: false, - showingDeleteDialog: false + showingDeleteDialog: false, + randomSeed: genRandomSeed() } }, methods: { @@ -152,6 +154,15 @@ const ExtraButtons = { editingAvailable () { return this.$store.state.instance.editingAvailable }, shouldConfirmDelete () { return this.$store.getters.mergedConfig.modalOnDelete + }, + triggerAttrs () { + return { + title: this.$t('status.more_actions'), + id: `popup-trigger-${this.randomSeed}`, + 'aria-controls': `popup-menu-${this.randomSeed}`, + 'aria-expanded': this.expanded, + 'aria-haspopup': 'menu' + } } } } diff --git a/src/components/extra_buttons/extra_buttons.vue b/src/components/extra_buttons/extra_buttons.vue index c1c15c0f..b7d3b1d3 100644 --- a/src/components/extra_buttons/extra_buttons.vue +++ b/src/components/extra_buttons/extra_buttons.vue @@ -2,6 +2,7 @@