diff --git a/changelog.d/actions-extra-tap.fix b/changelog.d/actions-extra-tap.fix new file mode 100644 index 000000000..cb54c2e35 --- /dev/null +++ b/changelog.d/actions-extra-tap.fix @@ -0,0 +1 @@ +fixed tapping "Mute..." and "Change visiblity" (admin action) in extra status actions closing the dropdown diff --git a/changelog.d/fix-domain-mute.fix b/changelog.d/fix-domain-mute.fix new file mode 100644 index 000000000..1cb910d22 --- /dev/null +++ b/changelog.d/fix-domain-mute.fix @@ -0,0 +1 @@ +domain mute fixedw diff --git a/changelog.d/moderation-tools.fix b/changelog.d/moderation-tools.fix new file mode 100644 index 000000000..1417048a5 --- /dev/null +++ b/changelog.d/moderation-tools.fix @@ -0,0 +1 @@ +fix moderation tools button possibly not appearing for admins diff --git a/changelog.d/moderation.fix b/changelog.d/moderation.fix new file mode 100644 index 000000000..c206a5ea8 --- /dev/null +++ b/changelog.d/moderation.fix @@ -0,0 +1 @@ +Fixed moderation actions requiring confirmation closing user popover diff --git a/changelog.d/themes2-font.fix b/changelog.d/themes2-font.fix new file mode 100644 index 000000000..0842fae8a --- /dev/null +++ b/changelog.d/themes2-font.fix @@ -0,0 +1 @@ +Fix Themes 2.0 applying incorrect fonts diff --git a/changelog.d/themes3.fix b/changelog.d/themes3.fix new file mode 100644 index 000000000..a3192b263 --- /dev/null +++ b/changelog.d/themes3.fix @@ -0,0 +1 @@ +Fixed themes 3 not loading in appearance tab diff --git a/src/api/helpers.js b/src/api/helpers.js index 90956a4dc..326275495 100644 --- a/src/api/helpers.js +++ b/src/api/helpers.js @@ -67,6 +67,7 @@ export const promisedRequest = async ({ url, payload, formData, + forceContentType, cache, credentials, headers = {}, @@ -75,7 +76,7 @@ export const promisedRequest = async ({ method, credentials: 'same-origin', headers: { - Accept: 'application/json', + Accept: forceContentType ?? 'application/json', ...headers, }, } @@ -110,7 +111,7 @@ export const promisedRequest = async ({ ) if (contentLength === 0) return null - switch (contentType) { + switch (forceContentType ?? contentType) { case 'text/plain': return await response.text() case 'application/json': diff --git a/src/components/moderation_tools/moderation_tools.js b/src/components/moderation_tools/moderation_tools.js index ba13afc8b..886ae9e0c 100644 --- a/src/components/moderation_tools/moderation_tools.js +++ b/src/components/moderation_tools/moderation_tools.js @@ -516,8 +516,7 @@ const ModerationTools = { setOpen(value) { this.open = value }, - maybeShowConfirm(close, { group, name, action, value }) { - close() + maybeShowConfirm({ group, name, action, value }) { this.confirmDialogName = name this.confirmDialogGroup = group this.confirmDialogAction = () => action() diff --git a/src/components/moderation_tools/moderation_tools.vue b/src/components/moderation_tools/moderation_tools.vue index 4da0be0ee..e3da1a84d 100644 --- a/src/components/moderation_tools/moderation_tools.vue +++ b/src/components/moderation_tools/moderation_tools.vue @@ -9,7 +9,7 @@ @show="setOpen(true)" @close="setOpen(false)" > -