From 8b2acaceb58620c4b58313e59f1d58f8613b91e2 Mon Sep 17 00:00:00 2001 From: Angelina Filippova Date: Tue, 13 Apr 2021 01:18:17 +0300 Subject: [PATCH] Revert including links in moderation log messages --- CHANGELOG.md | 1 - build/webpack.dev.conf.js | 9 +-- src/views/moderationLog/LogEntryMessage.vue | 65 +++++++++++++++++++++ src/views/moderationLog/ReportLink.vue | 20 ------- src/views/moderationLog/UserLink.vue | 20 ------- src/views/moderationLog/index.vue | 32 ++-------- 6 files changed, 71 insertions(+), 76 deletions(-) create mode 100644 src/views/moderationLog/LogEntryMessage.vue delete mode 100644 src/views/moderationLog/ReportLink.vue delete mode 100644 src/views/moderationLog/UserLink.vue diff --git a/CHANGELOG.md b/CHANGELOG.md index d9b1844c..84fd1e45 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -26,7 +26,6 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - Hide Tag actions on Users tab if MRF TagPolicy is disabled. Add ability to enable TagPolicy from Moderation menu - Move `:restrict_unauthenticated` settings from Authentication tab to Instance tab - Replace regular inputs with textareas for setting welcome messages in the Settings section -- Update rendering Moderation Log Messages so that all usernames are links to the pages of the corresponding users in Admin-FE - Remove Websocket based federation settings - Move Settings tab navigation from the tabbed menu to the main sidebar menu. A separate route is created for each tab. - Move Emoji packs configuration to the Emoji tab in the Settings section diff --git a/build/webpack.dev.conf.js b/build/webpack.dev.conf.js index 85086449..1b6d4d75 100644 --- a/build/webpack.dev.conf.js +++ b/build/webpack.dev.conf.js @@ -48,7 +48,7 @@ const devWebpackConfig = merge(baseWebpackConfig, { poll: config.dev.poll }, headers: { - 'content-security-policy': "script-src 'self' 'unsafe-eval'; base-uri 'self'; frame-ancestors 'none'; img-src 'self' data: https: http:; media-src 'self' https:; style-src 'self' 'unsafe-inline'; font-src 'self'; manifest-src 'self'" + 'content-security-policy': "base-uri 'self'; frame-ancestors 'none'; img-src 'self' data: https: http:; media-src 'self' https:; style-src 'self' 'unsafe-inline'; font-src 'self'; manifest-src 'self'; script-src 'self';" } }, plugins: [ @@ -67,12 +67,7 @@ const devWebpackConfig = merge(baseWebpackConfig, { BASE_URL: devEnv.ASSETS_PUBLIC_PATH + config.dev.assetsSubDirectory, }, }), - ], - resolve: { - alias: { - vue: 'vue/dist/vue.js' - } - } + ] }) module.exports = new Promise((resolve, reject) => { diff --git a/src/views/moderationLog/LogEntryMessage.vue b/src/views/moderationLog/LogEntryMessage.vue new file mode 100644 index 00000000..d19ada81 --- /dev/null +++ b/src/views/moderationLog/LogEntryMessage.vue @@ -0,0 +1,65 @@ + + + + + diff --git a/src/views/moderationLog/ReportLink.vue b/src/views/moderationLog/ReportLink.vue deleted file mode 100644 index bfbd210a..00000000 --- a/src/views/moderationLog/ReportLink.vue +++ /dev/null @@ -1,20 +0,0 @@ - - - diff --git a/src/views/moderationLog/UserLink.vue b/src/views/moderationLog/UserLink.vue deleted file mode 100644 index 77ab82a4..00000000 --- a/src/views/moderationLog/UserLink.vue +++ /dev/null @@ -1,20 +0,0 @@ - - - diff --git a/src/views/moderationLog/index.vue b/src/views/moderationLog/index.vue index 5eeef28f..4ff319b2 100644 --- a/src/views/moderationLog/index.vue +++ b/src/views/moderationLog/index.vue @@ -43,7 +43,8 @@ v-for="(logEntry, index) in log" :key="index" :timestamp="normalizeTimestamp(logEntry.time)"> - + + {{ logEntry.message }}