Skip to content

Commit

Permalink
(js) Add CKEditor pastefromexcel plugin
Browse files Browse the repository at this point in the history
Fixes #3854
  • Loading branch information
cgx committed Nov 2, 2016
1 parent fd57625 commit 17e65da
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 7 deletions.
3 changes: 2 additions & 1 deletion NEWS
Expand Up @@ -25,9 +25,10 @@ Bug fixes
- [web] fixed auto-completion of list members (#3870)
- [web] added missing options to subscribed addressbooks (#3850)
- [web] added missing options to subscribed calendars (#3863)
- [web] fixed resource conflict error handling (403 vs 409 HTTP code)
- [web] fixed resource conflict error handling (403 vs 409 HTTP code) (#3837)
- [web] restored immediate deletion of messages (without moving them to the trash)
- [web] avoid mail notifications on superfluous event changes (#3790)
- [web] CKEditor: added the pastefromexcel plugin (#3854)
- [eas] improve handling of email folders without a parent
- [eas] never send IMIP reply when the "initiator" is Outlook 2013/2016
- [core] only consider SMTP addresses for AD's proxyAddresses (#3842)
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/d97b6d42ea158d15ebe90da9451162c5
* (2) http://ckeditor.com/builder/1f054d16e7bf94d785cd4a259c345f4c
* Visit online builder to build CKEditor, starting with the same setup as before.
*
* (3) http://ckeditor.com/builder/download/d97b6d42ea158d15ebe90da9451162c5
* (3) http://ckeditor.com/builder/download/1f054d16e7bf94d785cd4a259c345f4c
* Straight download link to the latest version of CKEditor (Optimized) with the same setup as before.
*
* NOTE:
Expand Down Expand Up @@ -80,6 +80,7 @@ var CKBUILDER_CONFIG = {
'onchange' : 1,
'panel' : 1,
'panelbutton' : 1,
'pastefromexcel' : 1,
'pastefromword' : 1,
'pastetext' : 1,
'richcombo' : 1,
Expand Down
10 changes: 6 additions & 4 deletions UI/WebServerResources/js/vendor/ckeditor/ckeditor.js

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

0 comments on commit 17e65da

Please sign in to comment.