Merge branch 'master' into 'develop'

Mergeback See merge request pleroma/pleroma-fe!2249
2025-08-31 13:06:12 +00:00 · 2025-08-31 13:06:12 +00:00 · 40eb565f2a
commit 40eb565f2a
parent 30917ff017 0ecbae9675
31 changed files with 37 additions and 26 deletions
--- a/changelog.d/action-button-extra-counter.add
+++ b/changelog.d/action-button-extra-counter.add
@ -1 +0,0 @@
-Display counter for status action buttons when they are on the menu
--- a/changelog.d/akkoftermapth.skip
+++ b/changelog.d/akkoftermapth.skip
--- a/changelog.d/akkoma-sharkey-net-support.add
+++ b/changelog.d/akkoma-sharkey-net-support.add
@ -1 +0,0 @@
-Added support for Akkoma and IceShrimp.NET backend
--- a/changelog.d/akkoma.skip
+++ b/changelog.d/akkoma.skip
--- a/changelog.d/arithmetic-blend.add
+++ b/changelog.d/arithmetic-blend.add
@ -1,2 +0,0 @@
-Add arithmetic blend ISS function
-
--- a/changelog.d/better-scroll-button.add
+++ b/changelog.d/better-scroll-button.add
@ -1 +0,0 @@
-Add support for detachable scrollTop button
--- a/changelog.d/bookmark-button-align.fix
+++ b/changelog.d/bookmark-button-align.fix
@ -1 +0,0 @@
-Fix bookmark button alignment in the extra actions menu
--- a/changelog.d/csp.add
+++ b/changelog.d/csp.add
@ -1 +0,0 @@
-Compatibility with stricter CSP (Akkoma backend)
--- a/changelog.d/emoji-copying-post.add
+++ b/changelog.d/emoji-copying-post.add
@ -1 +0,0 @@
-Allow copying an emoji from a remote post into a local pack
--- a/changelog.d/emoji-copying.add
+++ b/changelog.d/emoji-copying.add
@ -1 +0,0 @@
-Allow copying one emoji from a remote pack into a local pack
--- a/changelog.d/emoji-popover.add
+++ b/changelog.d/emoji-popover.add
@ -1 +0,0 @@
-When an emoji is clicked in a post, show a popover with its name and a bigger image. Admins can also copy it to a local pack
--- a/changelog.d/emoji-upload.-zip.add
+++ b/changelog.d/emoji-upload.-zip.add
@ -1 +0,0 @@
-Added a way to upload new packs from a URL or ZIP file via the admin-fe
--- a/changelog.d/filter-fixes.skip
+++ b/changelog.d/filter-fixes.skip
--- a/changelog.d/fix-wrap.skip
+++ b/changelog.d/fix-wrap.skip
--- a/changelog.d/linter.skip
+++ b/changelog.d/linter.skip
--- a/changelog.d/migrate-auth-flow-pinia.skip
+++ b/changelog.d/migrate-auth-flow-pinia.skip
--- a/changelog.d/migrate-oauth-tokens-module-to-pinia-store.skip
+++ b/changelog.d/migrate-oauth-tokens-module-to-pinia-store.skip
--- a/changelog.d/mutes-sync.add
+++ b/changelog.d/mutes-sync.add
@ -1 +0,0 @@
-Synchronized mutes, advanced mute control (regexp, expiry, naming)
--- a/changelog.d/profile-error.fix
+++ b/changelog.d/profile-error.fix
@ -1 +0,0 @@
-Fix error styling for user profiles
--- a/changelog.d/small-fixes.skip
+++ b/changelog.d/small-fixes.skip
--- a/changelog.d/sw-cache-assets.add
+++ b/changelog.d/sw-cache-assets.add
@ -1 +0,0 @@
-Cache assets and emojis with service worker
--- a/changelog.d/theme3-body-class.add
+++ b/changelog.d/theme3-body-class.add
@ -1 +0,0 @@
-Indicate currently active V3 theme as a body element class
--- a/changelog.d/timed.add
+++ b/changelog.d/timed.add
@ -1 +0,0 @@
-Support for expiring mutes and blocks (if available)
--- a/changelog.d/unify-show-hide-buttons.add
+++ b/changelog.d/unify-show-hide-buttons.add
@ -1 +0,0 @@
-Unify show/hide content buttons
--- a/changelog.d/user_profile_edit.change
+++ b/changelog.d/user_profile_edit.change
@ -1 +0,0 @@
-Profile editing change overhaul
--- a/changelog.d/user_profile_redesign.change
+++ b/changelog.d/user_profile_redesign.change
@ -1 +0,0 @@
-User card/profile got an overhaul
--- a/changelog.d/visual.change
+++ b/changelog.d/visual.change
@ -1,5 +0,0 @@
-Combined subject and content fields in post form (visually)
-Fixes for some elements not scaling with user UI scale
-Moved post form's emoji button into input field
-Minor visual changes and fixes
-Clicking on fav/rt/emoji notifications' contents expands/collapses it
--- a/changelog.d/weight-loss.change
+++ b/changelog.d/weight-loss.change
@ -1 +0,0 @@
-Reduced time taken processing theme by half
--- a/changelog.d/zoomlag.skip
+++ b/changelog.d/zoomlag.skip
				`@ -1 +0,0 @@`
				`Display counter for status action buttons when they are on the menu`
				`@ -1 +0,0 @@`
				`Added support for Akkoma and IceShrimp.NET backend`
				`@ -1 +0,0 @@`
				`Fix bookmark button alignment in the extra actions menu`
				`@ -1 +0,0 @@`
				`Compatibility with stricter CSP (Akkoma backend)`
				`@ -1 +0,0 @@`
				`Allow copying an emoji from a remote post into a local pack`
				`@ -1 +0,0 @@`
				`Allow copying one emoji from a remote pack into a local pack`
				`@ -1 +0,0 @@`
				`When an emoji is clicked in a post, show a popover with its name and a bigger image. Admins can also copy it to a local pack`
				`@ -1 +0,0 @@`
				`Added a way to upload new packs from a URL or ZIP file via the admin-fe`
				`@ -1 +0,0 @@`
				`Synchronized mutes, advanced mute control (regexp, expiry, naming)`
				`@ -1 +0,0 @@`
				`Indicate currently active V3 theme as a body element class`