From ea26e75e776dce19f06c8c80a0711cb9c50d5850 Mon Sep 17 00:00:00 2001 From: Angelina Filippova Date: Wed, 26 Aug 2020 00:17:37 +0300 Subject: [PATCH 1/2] Fix setting remote emoji packs --- src/store/modules/emojiPacks.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/store/modules/emojiPacks.js b/src/store/modules/emojiPacks.js index 6874ed9c..39e5146f 100644 --- a/src/store/modules/emojiPacks.js +++ b/src/store/modules/emojiPacks.js @@ -189,7 +189,7 @@ const emojiPacks = { const { data } = await listRemotePacks(getters.authHost, getters.token, remoteInstance) commit('SET_REMOTE_INSTANCE', remoteInstance) - commit('SET_REMOTE_PACKS', data) + commit('SET_REMOTE_PACKS', data.packs) }, SetRemoteInstance({ commit }, instance) { commit('SET_REMOTE_INSTANCE', instance) From c7fdf64d352653e498b860a15aec32a5c7dd85bf Mon Sep 17 00:00:00 2001 From: Angelina Filippova Date: Wed, 26 Aug 2020 00:20:32 +0300 Subject: [PATCH 2/2] Update Changelog --- CHANGELOG.md | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9d94cfc5..08017fe7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,18 +4,7 @@ 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/). -## Unreleased - -### Added - -- Allow managing user's actor_type field via Admin API -- Add Pleroma.Web.Preload settings on Frontend tab - -### Fixed - -- Fix following and unfollowing relays from Admin-FE, update mobile UI - -## [2.1] - 2020-08-14 +## [2.1] - 2020-08-26 ### Added @@ -28,10 +17,11 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - Add MRF Activity Expiration setting - Add ability to disable multi-factor authentication for a user - Add ability to configure Invalidation settings on MediaProxy tab -- Ability to configure `S3` settings on Upload tab, `Pleroma.Web.ApiSpec.CastAndValidate` and `:modules` settings on Other tab, `:pools`, `:connections_pool` and `:hackney_pools` settings on Job Queue tab, `:restrict_unauthenticated` settings on Authentication tab, `:favicons` and `:welcome` settings on Instance tab, `:frontends` settings on Frontend tab +- Ability to configure `S3` settings on Upload tab, `Pleroma.Web.ApiSpec.CastAndValidate` and `:modules` settings on Other tab, `:pools`, `:connections_pool` and `:hackney_pools` settings on Job Queue tab, `:restrict_unauthenticated` settings on Authentication tab, `:favicons` and `:welcome` settings on Instance tab, `:frontends` and `Pleroma.Web.Preload` settings on Frontend tab - Show number of open reports in Sidebar Menu - Add confirmation message when deleting a user - Add new MediaProxy Cache Tab with ability to manually evict and ban objects from the Pleroma MediaProxy cache +- Allow managing user's actor_type field via Admin API ### Changed @@ -55,6 +45,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - Fix sorting users on Users page if there is an acount with missing nickname or ID - Add new type of settings: `['string', 'image']`. Render Image upload Input depending on the type of setting, not its key - Fix displaying `Pending` tag and filtering by Pending Approval status +- Fix following and unfollowing relays from Admin-FE, update mobile UI ## [2.0.3] - 2020-04-29