AkkomaGang
/
admin-fe
5
2
Fork 8
Code Issues 5 Pull Requests 2 Projects Releases Wiki Activity

Merge branch 'fix/moderation-log-render' into 'develop' 

Fix rendering moderation log messages

See merge request pleroma/admin-fe!199
This commit is contained in:
Angelina Filippova 2021-03-11 19:40:40 +00:00
parent 24af70ff6b 837474f179
commit 841340caa9
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
build/webpack.dev.conf.js
View File

@ -48,7 +48,7 @@ const devWebpackConfig = merge(baseWebpackConfig, {
poll: config.dev.poll
},
headers: {
'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';"
'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'"
}
},
plugins: [
@ -67,7 +67,12 @@ 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) => {