Skip to content

Commit

Permalink
(js) Add the "Paste from word" CKEditor plugin
Browse files Browse the repository at this point in the history
Fixes #2295
Fixes #3313
  • Loading branch information
cgx committed Jun 3, 2016
1 parent ab74ef0 commit 568e438
Show file tree
Hide file tree
Showing 45 changed files with 79 additions and 43 deletions.
1 change: 1 addition & 0 deletions NEWS
Expand Up @@ -5,6 +5,7 @@ Bug fixes
- [web] fixed error handling when renaming a mailbox
- [web] fixed user removal from ACLs in Administration module (#3713)
- [web] fixed event classification icon (private/confidential) in month view (#3711)
- [web] CKEditor: added the pastefromword plugin (#2295, #3313)

3.1.1 (2016-06-02)
------------------
Expand Down
5 changes: 3 additions & 2 deletions UI/WebServerResources/js/vendor/ckeditor/build-config.js
Expand Up @@ -13,10 +13,10 @@
* (1) http://ckeditor.com/builder
* Visit online builder to build CKEditor from scratch.
*
* (2) http://ckeditor.com/builder/d892f8778f5f50778b2c09e8dca35186
* (2) http://ckeditor.com/builder/7a359dc5bce287bc191bc7d8d9257d51
* Visit online builder to build CKEditor, starting with the same setup as before.
*
* (3) http://ckeditor.com/builder/download/d892f8778f5f50778b2c09e8dca35186
* (3) http://ckeditor.com/builder/download/7a359dc5bce287bc191bc7d8d9257d51
* Straight download link to the latest version of CKEditor (Optimized) with the same setup as before.
*
* NOTE:
Expand Down Expand Up @@ -79,6 +79,7 @@ var CKBUILDER_CONFIG = {
'menubutton' : 1,
'panel' : 1,
'panelbutton' : 1,
'pastefromword' : 1,
'pastetext' : 1,
'richcombo' : 1,
'scayt' : 1,
Expand Down
10 changes: 6 additions & 4 deletions UI/WebServerResources/js/vendor/ckeditor/ckeditor.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion UI/WebServerResources/js/vendor/ckeditor/lang/ar.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion UI/WebServerResources/js/vendor/ckeditor/lang/ca.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion UI/WebServerResources/js/vendor/ckeditor/lang/cs.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion UI/WebServerResources/js/vendor/ckeditor/lang/cy.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion UI/WebServerResources/js/vendor/ckeditor/lang/da.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion UI/WebServerResources/js/vendor/ckeditor/lang/de.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion UI/WebServerResources/js/vendor/ckeditor/lang/en.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion UI/WebServerResources/js/vendor/ckeditor/lang/es.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion UI/WebServerResources/js/vendor/ckeditor/lang/eu.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion UI/WebServerResources/js/vendor/ckeditor/lang/fi.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion UI/WebServerResources/js/vendor/ckeditor/lang/fr.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion UI/WebServerResources/js/vendor/ckeditor/lang/hr.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion UI/WebServerResources/js/vendor/ckeditor/lang/hu.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion UI/WebServerResources/js/vendor/ckeditor/lang/is.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion UI/WebServerResources/js/vendor/ckeditor/lang/it.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion UI/WebServerResources/js/vendor/ckeditor/lang/lt.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion UI/WebServerResources/js/vendor/ckeditor/lang/mk.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion UI/WebServerResources/js/vendor/ckeditor/lang/nb.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion UI/WebServerResources/js/vendor/ckeditor/lang/nl.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion UI/WebServerResources/js/vendor/ckeditor/lang/no.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion UI/WebServerResources/js/vendor/ckeditor/lang/pl.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion UI/WebServerResources/js/vendor/ckeditor/lang/pt-br.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion UI/WebServerResources/js/vendor/ckeditor/lang/pt.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion UI/WebServerResources/js/vendor/ckeditor/lang/ru.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion UI/WebServerResources/js/vendor/ckeditor/lang/sk.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion UI/WebServerResources/js/vendor/ckeditor/lang/sl.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion UI/WebServerResources/js/vendor/ckeditor/lang/sv.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion UI/WebServerResources/js/vendor/ckeditor/lang/tr.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion UI/WebServerResources/js/vendor/ckeditor/lang/uk.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion UI/WebServerResources/js/vendor/ckeditor/lang/zh-cn.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion UI/WebServerResources/js/vendor/ckeditor/lang/zh.js

Large diffs are not rendered by default.

Binary file modified UI/WebServerResources/js/vendor/ckeditor/plugins/icons.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified UI/WebServerResources/js/vendor/ckeditor/plugins/icons_hidpi.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 568e438

Please sign in to comment.