summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGELOG2
-rw-r--r--program/js/editor.js3
2 files changed, 4 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG
index a99eb1634..8d43e6aca 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,8 @@
CHANGELOG RoundCube Webmail
===========================
+- Fix pasting from Office apps into html editor (#1486271)
+- Fix empty <A> tags parsing (#1486272)
- Don't cut off attachment names when using non-RFC2231 encoding (#1485515)
- Allow inserting signatures above replied message body (#1484272)
- Managesieve 2.0: multi-script support
diff --git a/program/js/editor.js b/program/js/editor.js
index eeb16ec96..39149a7f1 100644
--- a/program/js/editor.js
+++ b/program/js/editor.js
@@ -24,6 +24,7 @@ function rcmail_editor_init(skin_path, editor_lang, spellcheck, mode)
theme : 'advanced',
language : editor_lang,
content_css : skin_path + '/editor_content.css',
+ plugins: 'paste',
theme_advanced_toolbar_location : 'top',
theme_advanced_toolbar_align : 'left',
theme_advanced_buttons1 : 'bold,italic,underline,strikethrough,justifyleft,justifycenter,justifyright,justifyfull,separator,outdent,indent,charmap,hr,link,unlink,code,forecolor',
@@ -41,7 +42,7 @@ function rcmail_editor_init(skin_path, editor_lang, spellcheck, mode)
apply_source_formatting : true,
theme : 'advanced',
language : editor_lang,
- plugins : 'emotions,media,nonbreaking,table,searchreplace,visualchars,directionality' + (spellcheck ? ',spellchecker' : ''),
+ plugins : 'paste,emotions,media,nonbreaking,table,searchreplace,visualchars,directionality' + (spellcheck ? ',spellchecker' : ''),
theme_advanced_buttons1 : 'bold,italic,underline,separator,justifyleft,justifycenter,justifyright,justifyfull,separator,bullist,numlist,outdent,indent,separator,link,unlink,emotions,charmap,code,forecolor,backcolor,fontselect,fontsizeselect, separator' + (spellcheck ? ',spellchecker' : '') + ',undo,redo,image,media,ltr,rtl',
theme_advanced_buttons2 : '',
theme_advanced_buttons3 : '',