Merge branch 'develop' into 'master'

Update master branch

See merge request pleroma/pleroma-fe!1861

20 files changed, 19 insertions, 0 deletions

diff --git a/changelog.d/add-taiwanese-aka-hokkien-i18n-support.add b/changelog.d/add-taiwanese-aka-hokkien-i18n-support.add
new file mode 100644
index 00000000..53d89805
--- /dev/null
+++ b/changelog.d/add-taiwanese-aka-hokkien-i18n-support.add
@@ -0,0 +1 @@
+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
new file mode 100644
index 00000000..188c4555
--- /dev/null
+++ b/changelog.d/adminfe.add
@@ -0,0 +1 @@
+Implemented a very basic instance administration screen
diff --git a/changelog.d/check-changelog.skip b/changelog.d/check-changelog.skip
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/changelog.d/check-changelog.skip
diff --git a/changelog.d/custom-emoji-notif-width.fix b/changelog.d/custom-emoji-notif-width.fix
new file mode 100644
index 00000000..da118f6b
--- /dev/null
+++ b/changelog.d/custom-emoji-notif-width.fix
@@ -0,0 +1 @@
+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
new file mode 100644
index 00000000..5a92765c
--- /dev/null
+++ b/changelog.d/edit-profile-button.fix
@@ -0,0 +1 @@
+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
new file mode 100644
index 00000000..12898a1a
--- /dev/null
+++ b/changelog.d/emoji-picker-button-accessible.fix
@@ -0,0 +1 @@
+Add alt text to emoji picker buttons
diff --git a/changelog.d/export-subst-hash.fix b/changelog.d/export-subst-hash.fix
new file mode 100644
index 00000000..fb0d85cb
--- /dev/null
+++ b/changelog.d/export-subst-hash.fix
@@ -0,0 +1 @@
+Use export-subst gitattribute to allow tarball builds
diff --git a/changelog.d/fix-reports.fix b/changelog.d/fix-reports.fix
new file mode 100644
index 00000000..961b8033
--- /dev/null
+++ b/changelog.d/fix-reports.fix
@@ -0,0 +1 @@
+fix reports now showing reason/content:w
diff --git a/changelog.d/html-attribute-parsing.fix b/changelog.d/html-attribute-parsing.fix
new file mode 100644
index 00000000..0952f773
--- /dev/null
+++ b/changelog.d/html-attribute-parsing.fix
@@ -0,0 +1 @@
+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
new file mode 100644
index 00000000..0e4b71df
--- /dev/null
+++ b/changelog.d/mention-twice.fix
@@ -0,0 +1 @@
+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
new file mode 100644
index 00000000..33ee8d2c
--- /dev/null
+++ b/changelog.d/mentionsline-shouldbreak.fix
@@ -0,0 +1 @@
+Make MentionsLine aware of line breaking by non-br elements
diff --git a/changelog.d/nonascii-tags.fix b/changelog.d/nonascii-tags.fix
new file mode 100644
index 00000000..e4c6dc82
--- /dev/null
+++ b/changelog.d/nonascii-tags.fix
@@ -0,0 +1 @@
+Fix parsing non-ascii tags
diff --git a/changelog.d/oauth2-token-linger.fix b/changelog.d/oauth2-token-linger.fix
new file mode 100644
index 00000000..da4e4631
--- /dev/null
+++ b/changelog.d/oauth2-token-linger.fix
@@ -0,0 +1 @@
+Fix OAuth2 token lingering after revocation
diff --git a/changelog.d/quote-hide-oops.fix b/changelog.d/quote-hide-oops.fix
new file mode 100644
index 00000000..d93c0d29
--- /dev/null
+++ b/changelog.d/quote-hide-oops.fix
@@ -0,0 +1 @@
+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
new file mode 100644
index 00000000..678fc3bc
--- /dev/null
+++ b/changelog.d/quote-hide.fix
@@ -0,0 +1 @@
+don't display quoted status twice
diff --git a/changelog.d/quote.add b/changelog.d/quote.add
new file mode 100644
index 00000000..b43b6aba
--- /dev/null
+++ b/changelog.d/quote.add
@@ -0,0 +1 @@
+Implement quoting
diff --git a/changelog.d/react-button-safari.fix b/changelog.d/react-button-safari.fix
new file mode 100644
index 00000000..9846d50d
--- /dev/null
+++ b/changelog.d/react-button-safari.fix
@@ -0,0 +1 @@
+Fix react button misalignment on safari ios
diff --git a/changelog.d/react-button.fix b/changelog.d/react-button.fix
new file mode 100644
index 00000000..c2222fb6
--- /dev/null
+++ b/changelog.d/react-button.fix
@@ -0,0 +1 @@
+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
new file mode 100644
index 00000000..db241c20
--- /dev/null
+++ b/changelog.d/reload-user-pinned.fix
@@ -0,0 +1 @@
+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
new file mode 100644
index 00000000..3f5dda7d
--- /dev/null
+++ b/changelog.d/scroll-emoji-selector-safari.fix
@@ -0,0 +1 @@
+Fix scrolling emoji selector in modal in safari ios