commit: 42d5d8e43338d0b97cc922ff1d14b77f3ff9d448 parent f685f9021bfaff71616efd8e83d114441e69701b Author: HJ <30-hj@users.noreply.git.pleroma.social> Date: Sun, 29 Oct 2023 16:32:54 +0000 Merge branch 'release/2.6.x' into 'develop' Mergeback 2.6.0 to develop See merge request pleroma/pleroma-fe!1862Diffstat:
24 files changed, 53 insertions(+), 22 deletions(-)diff --git 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 screenreadersdiff --git a/changelog.d/add-taiwanese-aka-hokkien-i18n-support.add b/changelog.d/add-taiwanese-aka-hokkien-i18n-support.add@@ -1 +0,0 @@ -add the initial i18n translation file for Taiwanese (Hokkien), and modify some related files. -\ No newline at end of filediff --git a/changelog.d/adminfe.add b/changelog.d/adminfe.add@@ -1 +0,0 @@ -Implemented a very basic instance administration screendiff --git a/changelog.d/check-changelog.skip b/changelog.d/check-changelog.skipdiff --git a/changelog.d/custom-emoji-notif-width.fix b/changelog.d/custom-emoji-notif-width.fix@@ -1 +0,0 @@ -Keep aspect ratio of custom emoji reaction in notificationdiff --git a/changelog.d/edit-profile-button.fix b/changelog.d/edit-profile-button.fix@@ -1 +0,0 @@ -Fix openSettingsModalTab so that it correctly opens Settings modal instead of Admin modaldiff --git a/changelog.d/emoji-picker-button-accessible.fix b/changelog.d/emoji-picker-button-accessible.fix@@ -1 +0,0 @@ -Add alt text to emoji picker buttonsdiff --git a/changelog.d/export-subst-hash.fix b/changelog.d/export-subst-hash.fix@@ -1 +0,0 @@ -Use export-subst gitattribute to allow tarball buildsdiff --git a/changelog.d/fix-reports.fix b/changelog.d/fix-reports.fix@@ -1 +0,0 @@ -fix reports now showing reason/content:wdiff --git a/changelog.d/html-attribute-parsing.fix b/changelog.d/html-attribute-parsing.fix@@ -1 +0,0 @@ -Fix HTML attribute parsing, discard attributes not strating with a letterdiff --git a/changelog.d/mention-twice.fix b/changelog.d/mention-twice.fix@@ -1 +0,0 @@ -Fix a bug where mentioning a user twice will not fill the mention into the textareadiff --git a/changelog.d/mentionsline-shouldbreak.fix b/changelog.d/mentionsline-shouldbreak.fix@@ -1 +0,0 @@ -Make MentionsLine aware of line breaking by non-br elementsdiff --git a/changelog.d/nonascii-tags.fix b/changelog.d/nonascii-tags.fix@@ -1 +0,0 @@ -Fix parsing non-ascii tagsdiff --git a/changelog.d/oauth2-token-linger.fix b/changelog.d/oauth2-token-linger.fix@@ -1 +0,0 @@ -Fix OAuth2 token lingering after revocationdiff --git a/changelog.d/parser.fix b/changelog.d/parser.fix@@ -1 +0,0 @@ -fix regex issue in HTML parser/rendererdiff --git a/changelog.d/quote-hide-oops.fix b/changelog.d/quote-hide-oops.fix@@ -1 +0,0 @@ -fix typo in code that prevented cards from showing at alldiff --git a/changelog.d/quote-hide.fix b/changelog.d/quote-hide.fix@@ -1 +0,0 @@ -don't display quoted status twicediff --git a/changelog.d/quote.add b/changelog.d/quote.add@@ -1 +0,0 @@ -Implement quotingdiff --git a/changelog.d/react-button-safari.fix b/changelog.d/react-button-safari.fix@@ -1 +0,0 @@ -Fix react button misalignment on safari iosdiff --git a/changelog.d/react-button.fix b/changelog.d/react-button.fix@@ -1 +0,0 @@ -Fix react button not working if reaction accounts are not loadeddiff --git a/changelog.d/reload-user-pinned.fix b/changelog.d/reload-user-pinned.fix@@ -1 +0,0 @@ -Fix pinned statuses gone when reloading user timelinediff --git a/changelog.d/scroll-emoji-selector-safari.fix b/changelog.d/scroll-emoji-selector-safari.fix@@ -1 +0,0 @@ -Fix scrolling emoji selector in modal in safari iosdiff --git 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 <https://git.pleroma.social/pleroma/pleroma-fe/-/blob/develop/CONTRIBUTORS.md>", "private": false,diff --git a/tools/collect-changelog 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/*