-
Notifications
You must be signed in to change notification settings - Fork 280
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #1402 from julien/issue/1395
chore: update CKEditor build to v4.14.1
- Loading branch information
Showing
266 changed files
with
10,459 additions
and
5,551 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -2,21 +2,21 @@ Software License Agreement | |
========================== | ||
|
||
CKEditor - The text editor for Internet - https://ckeditor.com/ | ||
Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved. | ||
Copyright (c) 2003-2020, CKSource - Frederico Knabben. All rights reserved. | ||
|
||
Licensed under the terms of any of the following licenses at your | ||
choice: | ||
|
||
- GNU General Public License Version 2 or later (the "GPL") | ||
http://www.gnu.org/licenses/gpl.html | ||
https://www.gnu.org/licenses/gpl.html | ||
(See Appendix A) | ||
|
||
- GNU Lesser General Public License Version 2.1 or later (the "LGPL") | ||
http://www.gnu.org/licenses/lgpl.html | ||
https://www.gnu.org/licenses/lgpl.html | ||
(See Appendix B) | ||
|
||
- Mozilla Public License Version 1.1 or later (the "MPL") | ||
http://www.mozilla.org/MPL/MPL-1.1.html | ||
https://www.mozilla.org/MPL/MPL-1.1.html | ||
(See Appendix C) | ||
|
||
You are not required to, but if you want to explicitly declare the | ||
|
@@ -37,13 +37,14 @@ 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-2019, CKSource - Frederico Knabben. | ||
* CKSource Samples Framework (included in the samples) - Copyright (c) 2014-2020, 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. | ||
* ES6Promise - Copyright (c) 2014 Yehuda Katz, Tom Dale, Stefan Penner and contributors. | ||
|
||
Parts of code taken from the following libraries are included in CKEditor under the MIT license (see Appendix D): | ||
|
||
* jQuery (inspired the domReady function, ckeditor_base.js) - Copyright (c) 2011 John Resig, http://jquery.com/ | ||
* jQuery (inspired the domReady function, ckeditor_base.js) - Copyright (c) 2011 John Resig, https://jquery.com/ | ||
|
||
The following libraries are included in CKEditor under the SIL Open Font License, Version 1.1 (see Appendix E): | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.