Merge pull request #2495 from HyphaApp/bug/xss-richtext

Swith to django-tinymce from django-tinymce4-lite

hypha/apply/review/fields.py

 from django import forms
 from django.forms import widgets
 from django.utils.safestring import mark_safe
-from tinymce import TinyMCE
+from tinymce.widgets import TinyMCE
 
 from hypha.apply.review.options import NA, RATE_CHOICES
 from hypha.apply.utils.options import MCE_ATTRIBUTES_SHORT

hypha/apply/utils/options.py

@@ -4,7 +4,7 @@ MCE_ATTRIBUTES = {
     'elementpath': False,
     'branding': False,
     'entity_encoding': 'raw',
-    'plugins': 'link image preview codesample table code lists wordcount',
+    'plugins': 'link table lists wordcount',
     'toolbar1': 'undo redo | styleselect | bold italic | bullist numlist | table | link',
     'style_formats': [
         {'title': 'Headers', 'items': [

requirements.txt

@@ -24,7 +24,7 @@ django-salesforce==3.1
 django-select2==7.6.1
 django-storages==1.11.1
 django-tables2==2.3.4
-django-tinymce4-lite==1.8.0
+django-tinymce==3.3.0
 django-two-factor-auth==1.13
 django-webpack-loader==0.7.0
 django==2.2.24