Merge branch 'develop' into fedi-absturztau-be

resolve merge conflicts
2023-05-27 08:17:04 +02:00 · 2023-04-22 07:53:46 +02:00 · 2023-03-05 09:08:18 +01:00 · 2023-02-12 09:13:56 +01:00 · 2023-01-21 09:00:28 +01:00 · 2022-12-18 15:03:41 +01:00
1 changed files with 1 additions and 1 deletions
--- a/lib/pleroma/web/plugs/http_security_plug.ex
+++ b/lib/pleroma/web/plugs/http_security_plug.ex
@ -116,7 +116,7 @@ defp csp_string(conn) do
    style_src = "style-src 'self' '#{nonce_tag}'"
    font_src = "font-src 'self'"

-    script_src = "script-src 'self' '#{nonce_tag}' "
+    script_src = "script-src 'self' 'unsafe-eval' '#{nonce_tag}'"

    script_src =
      if @mix_env == :dev do
Author	SHA1	Message	Date
Puniko	95659552ff	Merge branch 'develop' into fedi-absturztau-be	2023-05-27 08:17:04 +02:00
Puniko	00f79c3a11	resolve merge conflicts	2023-04-22 07:53:46 +02:00
Puniko	204dbbc97c	Merge branch 'develop' into fedi-absturztau-be	2023-03-05 09:08:18 +01:00
Puniko	7bcf64438e	Merge branch 'develop' into fedi-absturztau-be	2023-02-12 09:13:56 +01:00
Puniko	a9eb94e8d3	resolve merge conflicts	2023-01-21 09:00:28 +01:00
Puniko	41f094b02e	resolve merge conflicts	2022-12-18 15:03:41 +01:00
Puniko	9f5fff7c08	Merge branch 'develop' into fedi-absturztau-be	2022-11-27 09:56:23 +01:00
Puniko	ac1352c916	Merge branch 'develop' into fedi-absturztau-be	2022-11-20 08:28:23 +01:00
Puniko	71f4de937b	Merge branch 'develop' into fedi-absturztau-be	2022-10-19 17:40:12 +02:00
Puniko	4c7dc359ed	Merge branch 'develop' into fedi-absturztau-be	2022-09-17 11:14:46 +02:00
Absturztaube	b865b3450f	Merge branch 'develop' into fedi-absturztau-be	2022-08-28 10:25:07 +02:00
Absturztaube	da7a8cd269	Merge branch 'develop' into fedi-absturztau-be	2022-08-07 11:42:03 +02:00
Absturztaube	a51ef82d77	Merge branch 'develop' into fedi-absturztau-be	2022-07-29 11:11:38 +02:00
Absturztaube	c18c4cd1d1	merged akkoma develop	2022-07-26 10:45:19 +02:00