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

Mergeback 2.6.0 to develop

See merge request pleroma/pleroma-fe!1862

24 files changed, 53 insertions, 21 deletions

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
--- a/changelog.d/check-changelog.skip
+++ /dev/null
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/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 <https://git.pleroma.social/pleroma/pleroma-fe/-/blob/develop/CONTRIBUTORS.md>",
   "private": false,
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/*