Merge branch 'fix-discoverable-setting' into 'develop'

fix "allow discovery" setting misbehaving See merge request pleroma/pleroma-fe!1518
fix "allow discovery" setting misbehaving
2022-04-29 07:56:18 +00:00 · 2022-04-29 10:52:16 +03:00 · 2022-04-20 17:27:01 +00:00
1 changed files with 4 additions and 1 deletions
--- a/src/modules/serverSideConfig.js
+++ b/src/modules/serverSideConfig.js
@ -55,7 +55,10 @@ export const settingsMap = {
    get: 'pleroma.allow_following_move',
    set: 'allow_following_move'
  },
-  'discoverable': 'source.discoverable',
+  'discoverable': {
    get: 'source.pleroma.discoverable',
    set: 'discoverable'
  },
  'hideFavorites': {
    get: 'pleroma.hide_favorites',
    set: 'hide_favorites'
Author	SHA1	Message	Date
HJ	96a24ec625	Merge branch 'fix-discoverable-setting' into 'develop' fix "allow discovery" setting misbehaving See merge request pleroma/pleroma-fe!1518	2022-04-29 07:56:18 +00:00
Henry Jameson	91f833d1f0	fix "allow discovery" setting misbehaving	2022-04-29 10:52:16 +03:00
HJ	92b04ba7df	Merge branch 'fix-chat-errors' into 'develop' fix some chat errors/warnings that sometimes happen See merge request pleroma/pleroma-fe!1515	2022-04-20 17:27:01 +00:00