diff --git a/.gitlab/merge_request_templates/Release.md b/.gitlab/merge_request_templates/Release.md new file mode 100644 index 000000000..d02e14a73 --- /dev/null +++ b/.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) diff --git a/CHANGELOG.md b/CHANGELOG.md index c2f0e7d17..ded5c6e4d 100644 --- a/CHANGELOG.md +++ b/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 diff --git a/changelog.d/action-button-extra-counter.add b/changelog.d/action-button-extra-counter.add deleted file mode 100644 index 7d5c77447..000000000 --- a/changelog.d/action-button-extra-counter.add +++ /dev/null @@ -1 +0,0 @@ -Display counter for status action buttons when they are on the menu diff --git a/changelog.d/akkoma-sharkey-net-support.add b/changelog.d/akkoma-sharkey-net-support.add deleted file mode 100644 index 4b4bff7fe..000000000 --- a/changelog.d/akkoma-sharkey-net-support.add +++ /dev/null @@ -1 +0,0 @@ -Added support for Akkoma and IceShrimp.NET backend diff --git a/changelog.d/akkoma.skip b/changelog.d/akkoma.skip deleted file mode 100644 index e69de29bb..000000000 diff --git a/changelog.d/arithmetic-blend.add b/changelog.d/arithmetic-blend.add deleted file mode 100644 index c579dca28..000000000 --- a/changelog.d/arithmetic-blend.add +++ /dev/null @@ -1,2 +0,0 @@ -Add arithmetic blend ISS function - diff --git a/changelog.d/better-scroll-button.add b/changelog.d/better-scroll-button.add deleted file mode 100644 index b206869d1..000000000 --- a/changelog.d/better-scroll-button.add +++ /dev/null @@ -1 +0,0 @@ -Add support for detachable scrollTop button diff --git a/changelog.d/bookmark-button-align.fix b/changelog.d/bookmark-button-align.fix deleted file mode 100644 index 64bc2c807..000000000 --- a/changelog.d/bookmark-button-align.fix +++ /dev/null @@ -1 +0,0 @@ -Fix bookmark button alignment in the extra actions menu diff --git a/changelog.d/csp.add b/changelog.d/csp.add deleted file mode 100644 index 260337b97..000000000 --- a/changelog.d/csp.add +++ /dev/null @@ -1 +0,0 @@ -Compatibility with stricter CSP (Akkoma backend) diff --git a/changelog.d/emoji-copying-post.add b/changelog.d/emoji-copying-post.add deleted file mode 100644 index f25ce9792..000000000 --- a/changelog.d/emoji-copying-post.add +++ /dev/null @@ -1 +0,0 @@ -Allow copying an emoji from a remote post into a local pack diff --git a/changelog.d/emoji-copying.add b/changelog.d/emoji-copying.add deleted file mode 100644 index 875e04401..000000000 --- a/changelog.d/emoji-copying.add +++ /dev/null @@ -1 +0,0 @@ -Allow copying one emoji from a remote pack into a local pack diff --git a/changelog.d/emoji-popover.add b/changelog.d/emoji-popover.add deleted file mode 100644 index f55ad10a3..000000000 --- a/changelog.d/emoji-popover.add +++ /dev/null @@ -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 diff --git a/changelog.d/emoji-upload.-zip.add b/changelog.d/emoji-upload.-zip.add deleted file mode 100644 index 798720eef..000000000 --- a/changelog.d/emoji-upload.-zip.add +++ /dev/null @@ -1 +0,0 @@ -Added a way to upload new packs from a URL or ZIP file via the admin-fe diff --git a/changelog.d/filter-fixes.skip b/changelog.d/filter-fixes.skip deleted file mode 100644 index e69de29bb..000000000 diff --git a/changelog.d/akkoftermapth.skip b/changelog.d/finalfix-fr.skip similarity index 100% rename from changelog.d/akkoftermapth.skip rename to changelog.d/finalfix-fr.skip diff --git a/changelog.d/fix-wrap.skip b/changelog.d/fix-wrap.skip deleted file mode 100644 index e69de29bb..000000000 diff --git a/changelog.d/linter.skip b/changelog.d/linter.skip deleted file mode 100644 index e69de29bb..000000000 diff --git a/changelog.d/migrate-auth-flow-pinia.skip b/changelog.d/migrate-auth-flow-pinia.skip deleted file mode 100644 index e69de29bb..000000000 diff --git a/changelog.d/migrate-oauth-tokens-module-to-pinia-store.skip b/changelog.d/migrate-oauth-tokens-module-to-pinia-store.skip deleted file mode 100644 index e69de29bb..000000000 diff --git a/changelog.d/mutes-sync.add b/changelog.d/mutes-sync.add deleted file mode 100644 index e8e0e462a..000000000 --- a/changelog.d/mutes-sync.add +++ /dev/null @@ -1 +0,0 @@ -Synchronized mutes, advanced mute control (regexp, expiry, naming) diff --git a/changelog.d/profile-error.fix b/changelog.d/profile-error.fix deleted file mode 100644 index f123db5ae..000000000 --- a/changelog.d/profile-error.fix +++ /dev/null @@ -1 +0,0 @@ -Fix error styling for user profiles diff --git a/changelog.d/small-fixes.skip b/changelog.d/small-fixes.skip deleted file mode 100644 index e69de29bb..000000000 diff --git a/changelog.d/sw-cache-assets.add b/changelog.d/sw-cache-assets.add deleted file mode 100644 index 5f7414eee..000000000 --- a/changelog.d/sw-cache-assets.add +++ /dev/null @@ -1 +0,0 @@ -Cache assets and emojis with service worker diff --git a/changelog.d/theme3-body-class.add b/changelog.d/theme3-body-class.add deleted file mode 100644 index f3d36fd70..000000000 --- a/changelog.d/theme3-body-class.add +++ /dev/null @@ -1 +0,0 @@ -Indicate currently active V3 theme as a body element class diff --git a/changelog.d/timed.add b/changelog.d/timed.add deleted file mode 100644 index 66cb50c9f..000000000 --- a/changelog.d/timed.add +++ /dev/null @@ -1 +0,0 @@ -Support for expiring mutes and blocks (if available) diff --git a/changelog.d/unify-show-hide-buttons.add b/changelog.d/unify-show-hide-buttons.add deleted file mode 100644 index 663bc38a5..000000000 --- a/changelog.d/unify-show-hide-buttons.add +++ /dev/null @@ -1 +0,0 @@ -Unify show/hide content buttons diff --git a/changelog.d/user_profile_edit.change b/changelog.d/user_profile_edit.change deleted file mode 100644 index dd2260260..000000000 --- a/changelog.d/user_profile_edit.change +++ /dev/null @@ -1 +0,0 @@ -Profile editing change overhaul diff --git a/changelog.d/user_profile_redesign.change b/changelog.d/user_profile_redesign.change deleted file mode 100644 index 27fc5f890..000000000 --- a/changelog.d/user_profile_redesign.change +++ /dev/null @@ -1 +0,0 @@ -User card/profile got an overhaul diff --git a/changelog.d/visual.change b/changelog.d/visual.change deleted file mode 100644 index e0cd42f65..000000000 --- a/changelog.d/visual.change +++ /dev/null @@ -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 diff --git a/changelog.d/weight-loss.change b/changelog.d/weight-loss.change deleted file mode 100644 index 8c1322bf9..000000000 --- a/changelog.d/weight-loss.change +++ /dev/null @@ -1 +0,0 @@ -Reduced time taken processing theme by half diff --git a/changelog.d/zoomlag.skip b/changelog.d/zoomlag.skip deleted file mode 100644 index e69de29bb..000000000 diff --git a/package.json b/package.json index 7652d47eb..edc122760 100644 --- a/package.json +++ b/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 ", "private": false, diff --git a/src/components/account_actions/account_actions.js b/src/components/account_actions/account_actions.js index f8ad0e11b..2ac74ea76 100644 --- a/src/components/account_actions/account_actions.js +++ b/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 () { diff --git a/src/components/block_card/block_card.js b/src/components/block_card/block_card.js index b5be9e7b7..9a618db3f 100644 --- a/src/components/block_card/block_card.js +++ b/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 }) } } } diff --git a/src/components/button.style.js b/src/components/button.style.js index c32a232f4..5cffefd91 100644 --- a/src/components/button.style.js +++ b/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: { diff --git a/src/components/user_popover/user_popover.vue b/src/components/user_popover/user_popover.vue index e0f2c84c1..ea289e53c 100644 --- a/src/components/user_popover/user_popover.vue +++ b/src/components/user_popover/user_popover.vue @@ -32,6 +32,7 @@ margin: 0; .user-info { + width: 100%; margin: 1.2em; } diff --git a/src/services/style_setter/style_setter.js b/src/services/style_setter/style_setter.js index 670a9904a..90c6180f4 100644 --- a/src/services/style_setter/style_setter.js +++ b/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 {