Merge branch 'release/2.6.x' into 'develop'

Mergeback 2.6.0 to develop

See merge request pleroma/pleroma-fe!1862

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

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.

changelog.d/adminfe.add

@@ -1 +0,0 @@
-Implemented a very basic instance administration screen

changelog.d/custom-emoji-notif-width.fix

@@ -1 +0,0 @@
-Keep aspect ratio of custom emoji reaction in notification

changelog.d/edit-profile-button.fix

@@ -1 +0,0 @@
-Fix openSettingsModalTab so that it correctly opens Settings modal instead of Admin modal

changelog.d/emoji-picker-button-accessible.fix

@@ -1 +0,0 @@
-Add alt text to emoji picker buttons

changelog.d/export-subst-hash.fix

@@ -1 +0,0 @@
-Use export-subst gitattribute to allow tarball builds

changelog.d/fix-reports.fix

@@ -1 +0,0 @@
-fix reports now showing reason/content:w

changelog.d/html-attribute-parsing.fix

@@ -1 +0,0 @@
-Fix HTML attribute parsing, discard attributes not strating with a letter

changelog.d/mention-twice.fix

@@ -1 +0,0 @@
-Fix a bug where mentioning a user twice will not fill the mention into the textarea

changelog.d/mentionsline-shouldbreak.fix

@@ -1 +0,0 @@
-Make MentionsLine aware of line breaking by non-br elements

changelog.d/nonascii-tags.fix

@@ -1 +0,0 @@
-Fix parsing non-ascii tags

changelog.d/oauth2-token-linger.fix

@@ -1 +0,0 @@
-Fix OAuth2 token lingering after revocation

changelog.d/parser.fix

@@ -1 +0,0 @@
-fix regex issue in HTML parser/renderer

changelog.d/quote-hide-oops.fix

@@ -1 +0,0 @@
-fix typo in code that prevented cards from showing at all

changelog.d/quote-hide.fix

@@ -1 +0,0 @@
-don't display quoted status twice

changelog.d/quote.add

@@ -1 +0,0 @@
-Implement quoting

changelog.d/react-button-safari.fix

@@ -1 +0,0 @@
-Fix react button misalignment on safari ios

changelog.d/react-button.fix

@@ -1 +0,0 @@
-Fix react button not working if reaction accounts are not loaded

changelog.d/reload-user-pinned.fix

@@ -1 +0,0 @@
-Fix pinned statuses gone when reloading user timeline

changelog.d/scroll-emoji-selector-safari.fix

@@ -1 +0,0 @@
-Fix scrolling emoji selector in modal in safari ios

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,

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/*