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

Mergeback 2.6.0 to develop

See merge request !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

-add the initial i18n translation file for Taiwanese (Hokkien), and modify some related files.
\ No newline at end of file

changelog.d/adminfe.add

-Implemented a very basic instance administration screen

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

-Keep aspect ratio of custom emoji reaction in notification

changelog.d/edit-profile-button.fix

-Fix openSettingsModalTab so that it correctly opens Settings modal instead of Admin modal

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

-Add alt text to emoji picker buttons

changelog.d/export-subst-hash.fix

-Use export-subst gitattribute to allow tarball builds

changelog.d/fix-reports.fix

-fix reports now showing reason/content:w

changelog.d/html-attribute-parsing.fix

-Fix HTML attribute parsing, discard attributes not strating with a letter

changelog.d/mention-twice.fix

-Fix a bug where mentioning a user twice will not fill the mention into the textarea

changelog.d/mentionsline-shouldbreak.fix

-Make MentionsLine aware of line breaking by non-br elements

changelog.d/nonascii-tags.fix

-Fix parsing non-ascii tags

changelog.d/oauth2-token-linger.fix

-Fix OAuth2 token lingering after revocation

changelog.d/parser.fix

-fix regex issue in HTML parser/renderer

changelog.d/quote-hide-oops.fix

-fix typo in code that prevented cards from showing at all

changelog.d/quote-hide.fix

-don't display quoted status twice

changelog.d/quote.add

-Implement quoting

changelog.d/react-button-safari.fix

-Fix react button misalignment on safari ios

changelog.d/react-button.fix

-Fix react button not working if reaction accounts are not loaded