Merge remote-tracking branch 'origin/develop' into shigusegubu-themes3

.gitlab/merge_request_templates/Release.md

@@ -0,0 +1,8 @@
+### Release checklist
+* [ ] Bump version in `package.json`
+* [ ] Compile a changelog with the `tools/collect-changelog` script
+* [ ] Create an MR with an announcement to pleroma.social
+#### post-merge
+* [ ] Tag the release on the merge commit
+* [ ] Make the tag into a Gitlab Release™
+* [ ] Merge `master` into `develop` (in case the fixes are already in develop, use `git merge -s ours --no-commit` and manually merge the changelogs)

CHANGELOG.md

@@ -2,6 +2,42 @@
 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.9.2
+### Changed
+- BREAKING: due to some internal technical changes logging into AdminFE through PleromaFE is no longer possible
+- User card/profile got an overhaul
+- Profile editing overhaul
+- Visually combined subject and content fields in post form
+- Moved post form's emoji button into input field
+- Minor visual changes and fixes
+- Clicking on fav/rt/emoji notifications' contents expands/collapses it
+- Reduced time taken processing theme by half
+- Splash screen only appears if loading takes more than 2 seconds
+
+### Added
+- Mutes received an update, adding support for regex, muting based on username and expiration time.
+- Mutes are now synchronized across sessions
+- Support for expiring mutes and blocks (if available)
+- Clicking on emoji shows bigger version of it alongside with its shortcode
+  - Admins also are able to copy it into a local pack
+- Added support for Akkoma and IceShrimp.NET backends
+- Compatibility with stricter CSP (Akkoma backend)
+- Added a way to upload new packs from a URL or ZIP file via the Admin Dashboard
+- Unify show/hide content buttons
+- Add support for detachable scrollTop button
+- Option to left-align user bio
+- Cache assets and emojis with service worker
+- Indicate currently active V3 theme as a body element class
+- Add arithmetic blend ISS function
+
+### Fixed
+- Display counter for status action buttons when they are in the menu
+- Fix bookmark button alignment in the extra actions menu
+- Instance favicons are no longer stretched
+- A lot more scalable UI fixes
+  - Emoji picker now should work fine when emoji size is increased
+
 ## 2.8.0
 ### Changed
 - BREAKING: static/img/nsfw.2958239.png is now static/img/nsfw.DepQPhG0.png, which may affect people who specify exactly this path as the cover image

changelog.d/action-button-extra-counter.add

@@ -1 +0,0 @@
-Display counter for status action buttons when they are on the menu

changelog.d/akkoma-sharkey-net-support.add

@@ -1 +0,0 @@
-Added support for Akkoma and IceShrimp.NET backend

changelog.d/arithmetic-blend.add

@@ -1,2 +0,0 @@
-Add arithmetic blend ISS function
-

changelog.d/better-scroll-button.add

@@ -1 +0,0 @@
-Add support for detachable scrollTop button

changelog.d/bookmark-button-align.fix

@@ -1 +0,0 @@
-Fix bookmark button alignment in the extra actions menu

changelog.d/csp.add

@@ -1 +0,0 @@
-Compatibility with stricter CSP (Akkoma backend)

changelog.d/emoji-copying-post.add

@@ -1 +0,0 @@
-Allow copying an emoji from a remote post into a local pack

changelog.d/emoji-copying.add

@@ -1 +0,0 @@
-Allow copying one emoji from a remote pack into a local pack

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

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

changelog.d/mutes-sync.add

@@ -1 +0,0 @@
-Synchronized mutes, advanced mute control (regexp, expiry, naming)

changelog.d/profile-error.fix

@@ -1 +0,0 @@
-Fix error styling for user profiles

changelog.d/sw-cache-assets.add

@@ -1 +0,0 @@
-Cache assets and emojis with service worker

changelog.d/theme3-body-class.add

@@ -1 +0,0 @@
-Indicate currently active V3 theme as a body element class

changelog.d/timed.add

@@ -1 +0,0 @@
-Support for expiring mutes and blocks (if available)

changelog.d/unify-show-hide-buttons.add

@@ -1 +0,0 @@
-Unify show/hide content buttons

changelog.d/user_profile_edit.change

@@ -1 +0,0 @@
-Profile editing change overhaul

changelog.d/user_profile_redesign.change

@@ -1 +0,0 @@
-User card/profile got an overhaul

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

changelog.d/weight-loss.change

@@ -1 +0,0 @@
-Reduced time taken processing theme by half

package.json

@@ -1,6 +1,6 @@
 {
   "name": "pleroma_fe",
-  "version": "2.7.1",
+  "version": "2.9.2",
   "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,

src/components/account_actions/account_actions.js

@@ -38,6 +38,9 @@ const AccountActions = {
     hideConfirmRemoveUserFromFollowers () {
       this.showingConfirmRemoveFollower = false
     },
+    hideConfirmBlock () {
+      this.showingConfirmBlock = false
+    },
     showRepeats () {
       this.$store.dispatch('showReblogs', this.user.id)
     },
@@ -56,7 +59,7 @@ const AccountActions = {
       }
     },
     doBlockUser () {
-      this.$store.dispatch('blockUser', this.user.id)
+      this.$store.dispatch('blockUser', { id: this.user.id })
       this.hideConfirmBlock()
     },
     unblockUser () {

src/components/block_card/block_card.js

@@ -37,7 +37,7 @@ const BlockCard = {
       if (this.blockExpirationSupported) {
         this.$refs.timedBlockDialog.optionallyPrompt()
       } else {
-        this.$store.dispatch('blockUser', this.user.id)
+        this.$store.dispatch('blockUser', { id: this.user.id })
       }
     }
   }

src/components/button.style.js

@@ -129,6 +129,13 @@ export default {
         shadow: ['--buttonDefaultHoverGlow', '--buttonPressedBevel']
       }
     },
+    {
+      state: ['toggled', 'hover', 'focused'],
+      directives: {
+        background: '--accent,-24.2',
+        shadow: ['--buttonDefaultHoverGlow', '--buttonPressedBevel']
+      }
+    },
     {
       state: ['toggled', 'disabled'],
       directives: {

src/components/user_popover/user_popover.vue

@@ -32,6 +32,7 @@
   margin: 0;
 
   .user-info {
+    width: 100%;
     margin: 1.2em;
   }
 

src/services/style_setter/style_setter.js

@@ -42,7 +42,6 @@ export const createStyleSheet = (id, priority = 1000) => {
 
 
 export const adoptStyleSheets = throttle(() => {
-  console.log('adopt')
   if (supportsAdoptedStyleSheets) {
     document.adoptedStyleSheets = Object
       .values(stylesheets)
@@ -138,8 +137,6 @@ export const tryLoadCache = async () => {
       eagerStyles.ready = true
       lazyStyles.ready = true
 
-      adoptStyleSheets()
-
       console.info(`Loaded theme from cache`)
       return true
     } else {