Skip to content

Commit

Permalink
fix: upgrade ckeditor to 4.22.1 - MEED-3087 - Meeds-io/meeds#1454 (#570)
Browse files Browse the repository at this point in the history
This change allows to upgrade CKeditor to the latest open source version (4.22.1) of the CKeditor.
  • Loading branch information
SaraBoutej committed Jan 4, 2024
1 parent 0f6a1a3 commit 4b01cb3
Show file tree
Hide file tree
Showing 239 changed files with 1,715 additions and 5,346 deletions.
347 changes: 344 additions & 3 deletions commons-extension-webapp/src/main/webapp/ckeditor/CHANGES.md

Large diffs are not rendered by default.

21 changes: 15 additions & 6 deletions commons-extension-webapp/src/main/webapp/ckeditor/LICENSE.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,16 @@
Software License Agreement
==========================
Software License Agreement for CKEditor 4 LTS (4.23.0 and above)
================================================================

CKEditor - The text editor for Internet - https://ckeditor.com/
Copyright (c) 2003-2021, CKSource - Frederico Knabben. All rights reserved.
CKEditor - The text editor for Internet - https://ckeditor.com/ <br>
Copyright (c) 2003-2023, CKSource Holding sp. z o.o. All rights reserved.

CKEditor 4 LTS ("Long Term Support") is available under exclusive terms of the [Extended Support Model](https://ckeditor.com/ckeditor-4-support/). [Contact us](https://ckeditor.com/contact/) to obtain a commercial license.

Software License Agreement for CKEditor 4.22.* and below
========================================================

CKEditor - The text editor for Internet - https://ckeditor.com/ <br>
Copyright (c) 2003-2023, CKSource Holding sp. z o.o. All rights reserved.

Licensed under the terms of any of the following licenses at your
choice:
Expand Down Expand Up @@ -37,10 +45,11 @@ 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-2021, CKSource - Frederico Knabben.
* CKSource Samples Framework (included in the samples) - Copyright (c) 2014-2023, CKSource Holding sp. z o.o.
* PicoModal (included in `samples/js/sf.js`) - Copyright (c) 2012 James Frasca.
* CodeMirror (included in the samples) - Copyright (C) 2014 by Marijn Haverbeke <marijnh@gmail.com> and others.
* ES6Promise - Copyright (c) 2014 Yehuda Katz, Tom Dale, Stefan Penner and contributors.
* A polyfill for `CSS.escape` (adopted with modifications in `core/tools.js`), Mathias Bynens, v1.5.1, https://mths.be/cssescape.

Parts of code taken from the following libraries are included in CKEditor under the MIT license (see Appendix D):

Expand All @@ -59,7 +68,7 @@ The following libraries are included in CKEditor under the BSD-3 License (see Ap
Trademarks
----------

CKEditor is a trademark of CKSource - Frederico Knabben. All other brand
CKEditor is a trademark of CKSource Holding sp. z o.o. All other brand
and product names are trademarks, registered trademarks or service
marks of their respective holders.

Expand Down
4 changes: 2 additions & 2 deletions commons-extension-webapp/src/main/webapp/ckeditor/README.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
CKEditor 4
==========

Copyright (c) 2003-2021, CKSource - Frederico Knabben. All rights reserved.
https://ckeditor.com - See LICENSE.md for license information.
Copyright (c) 2003-2023, CKSource Holding sp. z o.o. All rights reserved.
https://ckeditor.com - See https://ckeditor.com/legal/ckeditor-oss-license for license information.

CKEditor 4 is a text editor to be used inside web pages. It's not a replacement
for desktop text editors like Word or OpenOffice, but a component to be used as
Expand Down
10 changes: 10 additions & 0 deletions commons-extension-webapp/src/main/webapp/ckeditor/SECURITY.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
# Reporting a security issues

If you believe you have found a security issue in the CKEditor 4 software, please contact us immediately.

When reporting a potential security problem, please bear this in mind:

* Make sure to provide as many details as possible about the vulnerability.
* Please do not disclose publicly any security issues until we fix them and publish security releases.

Contact the security team at security@cksource.com. As soon as we receive the security report, we will work promptly to confirm the issue and then to provide a security fix.

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

Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/**
* @license Copyright (c) 2003-2021, CKSource - Frederico Knabben. All rights reserved.
* For licensing, see LICENSE.md or https://ckeditor.com/license
* @license Copyright (c) 2003-2023, CKSource Holding sp. z o.o. All rights reserved.
* For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license/
*/

/**
Expand All @@ -13,10 +13,10 @@
* (1) https://ckeditor.com/cke4/builder
* Visit online builder to build CKEditor from scratch.
*
* (2) https://ckeditor.com/cke4/builder/efb7532391926ce54316ba9c43ff5a0f
* (2) https://ckeditor.com/cke4/builder/0c876c976a43e3210d6aa51c46cdc17e
* Visit online builder to build CKEditor, starting with the same setup as before.
*
* (3) https://ckeditor.com/cke4/builder/download/efb7532391926ce54316ba9c43ff5a0f
* (3) https://ckeditor.com/cke4/builder/download/0c876c976a43e3210d6aa51c46cdc17e
* Straight download link to the latest version of CKEditor (Optimized) with the same setup as before.
*
* NOTE:
Expand All @@ -43,6 +43,7 @@ var CKBUILDER_CONFIG = {
'.travis.yml',
'bender-err.log',
'bender-out.log',
'bender-runner.config.json',
'bender.ci.js',
'bender.js',
'dev',
Expand Down Expand Up @@ -91,7 +92,7 @@ var CKBUILDER_CONFIG = {
'tabletools' : 1,
'toolbar' : 1,
'undo' : 1,
'wsc' : 1,
'uploadimage' : 1,
'wysiwygarea' : 1
},
languages : {
Expand Down
Loading

0 comments on commit 4b01cb3

Please sign in to comment.