Skip to content

Commit

Permalink
upgrade to CKEditor 4.5.7
Browse files Browse the repository at this point in the history
  • Loading branch information
Marc-pi committed Feb 26, 2016
1 parent bfae002 commit 28c2e4b
Show file tree
Hide file tree
Showing 268 changed files with 701 additions and 649 deletions.
4 changes: 4 additions & 0 deletions www/script/editor/changelog.txt
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,10 @@ Each time you want to add a new plugin, you have to build a new package of CKEdi
Alternatively you can copy/paste the new plugin from full package, but you have to activate it in config.js (config.extraPlugins value - see CKEditor docs) to make it work.


February 26th, 2016
===================
1. Upgrade to CKEditor 4.5.7 (full package) - with previous custom config.js (allow theme div classes)

January 5th, 2016
================
1. Upgrade to CKEditor 4.5.6 (full package) - with previous custom config.js (add Allow theme div classes)
Expand Down
18 changes: 17 additions & 1 deletion www/script/editor/ckeditor/CHANGES.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,22 @@
CKEditor 4 Changelog
====================

## CKEditor 4.5.7

New Features:

* [#14327](http://dev.ckeditor.com/ticket/14327): Added Swiss German localization.

Other Changes:

* [#13816](http://dev.ckeditor.com/ticket/13816): Introduced a new strategy for Filling Character handling to avoid changes in DOM. This fixes the following issues:
* [#12727](http://dev.ckeditor.com/ticket/12727): [Blink] `IndexSizeError` when using the [Div Editing Area](http://ckeditor.com/addon/divarea) and [Content Templates](http://ckeditor.com/addon/templates) plugins.
* [#13377](http://dev.ckeditor.com/ticket/13377): [Widget](http://ckeditor.com/addon/widget) plugin issue when typing in Korean.
* [#13389](http://dev.ckeditor.com/ticket/13389): [Blink] [`editor.getData()`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-method-getData) fails when the cursor is next to an `<hr>` tag.
* [#13513](http://dev.ckeditor.com/ticket/13513): [Blink, WebKit] [Div Editing Area](http://ckeditor.com/addon/divarea) and [`editor.getData()`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-method-getData) throw an error when an image is the only data in the editor.
* [#13884](http://dev.ckeditor.com/ticket/13884): Fixed: Copy/paste table in Firefox results in just first cell being pasted.
* [#14234](http://dev.ckeditor.com/ticket/14234): Fixed: URL input field is not marked as required in the [Embed](http://ckeditor.com/addon/embed) dialog.

## CKEditor 4.5.6

New Features:
Expand Down Expand Up @@ -82,7 +98,7 @@ Other Changes:

New Features:

* [#13501](http://dev.ckeditor.com/ticket/13501): Added the [`config.fileTools_defaultFileName`](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-fileTools_defaultFileName) option to allow setting a default filen ame for paste uploads.
* [#13501](http://dev.ckeditor.com/ticket/13501): Added the [`config.fileTools_defaultFileName`](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-fileTools_defaultFileName) option to allow setting a default file name for paste uploads.
* [#13603](http://dev.ckeditor.com/ticket/13603): Added support for uploading dropped BMP images.

Fixed Issues:
Expand Down
4 changes: 2 additions & 2 deletions www/script/editor/ckeditor/LICENSE.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Software License Agreement
==========================

CKEditor - The text editor for Internet - http://ckeditor.com
Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.

Licensed under the terms of any of the following licenses at your
choice:
Expand Down Expand Up @@ -37,7 +37,7 @@ done by developers outside of CKSource with their express permission.

The following libraries are included in CKEditor under the MIT license (see Appendix D):

* CKSource Samples Framework (included in the samples) - Copyright (c) 2014-2015, CKSource - Frederico Knabben.
* CKSource Samples Framework (included in the samples) - Copyright (c) 2014-2016, CKSource - Frederico Knabben.
* PicoModal (included in `samples/js/sf.js`) - Copyright (c) 2012 James Frasca.
* CodeMirror (included in the samples) - Copyright (C) 2014 by Marijn Haverbeke <[email protected]> and others.

Expand Down
2 changes: 1 addition & 1 deletion www/script/editor/ckeditor/README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
CKEditor 4
==========

Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved.
Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
http://ckeditor.com - See LICENSE.md for license information.

CKEditor is a text editor to be used inside web pages. It's not a replacement
Expand Down
2 changes: 1 addition & 1 deletion www/script/editor/ckeditor/adapters/jquery.js

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

7 changes: 4 additions & 3 deletions www/script/editor/ckeditor/build-config.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* @license Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
* @license Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
* For licensing, see LICENSE.md or http://ckeditor.com/license
*/

Expand All @@ -13,10 +13,10 @@
* (1) http://ckeditor.com/builder
* Visit online builder to build CKEditor from scratch.
*
* (2) http://ckeditor.com/builder/e6b8a045f8f984a69463975ca3e6524a
* (2) http://ckeditor.com/builder/9112f95de78a7f2c3576c61a29c8fc5b
* Visit online builder to build CKEditor, starting with the same setup as before.
*
* (3) http://ckeditor.com/builder/download/e6b8a045f8f984a69463975ca3e6524a
* (3) http://ckeditor.com/builder/download/9112f95de78a7f2c3576c61a29c8fc5b
* Straight download link to the latest version of CKEditor (Optimized) with the same setup as before.
*
* NOTE:
Expand Down Expand Up @@ -121,6 +121,7 @@ var CKBUILDER_CONFIG = {
'cy' : 1,
'da' : 1,
'de' : 1,
'de-ch' : 1,
'el' : 1,
'en' : 1,
'en-au' : 1,
Expand Down
Loading

0 comments on commit 28c2e4b

Please sign in to comment.