From 66ebdc4f8ad10cf796656de74de00447a544c5ac Mon Sep 17 00:00:00 2001 From: FinnStutzenstein Date: Fri, 8 Mar 2019 10:00:26 +0100 Subject: [PATCH] Add text-decoration to bleach whitelist, fix tinymce toolbar --- client/src/app/base.component.ts | 4 ++-- openslides/utils/validate.py | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/client/src/app/base.component.ts b/client/src/app/base.component.ts index 0998064f4..99658eba9 100644 --- a/client/src/app/base.component.ts +++ b/client/src/app/base.component.ts @@ -45,8 +45,8 @@ export abstract class BaseComponent { plugins: `autolink charmap code colorpicker fullscreen image imagetools lists link paste searchreplace textcolor`, menubar: '', - toolbar: `styleselect | bold italic underline strikethrough - | forecolor backcolor removeformat | bullist numlist | + toolbar: `styleselect | bold italic underline strikethrough | + forecolor backcolor removeformat | bullist numlist | link image charmap | code fullscreen` }; diff --git a/openslides/utils/validate.py b/openslides/utils/validate.py index a942a9606..1ef3f67e6 100644 --- a/openslides/utils/validate.py +++ b/openslides/utils/validate.py @@ -47,6 +47,7 @@ allowed_styles = [ "text-align", "float", "padding", + "text-decoration", ]