Skip to content

Commit

Permalink
Merge pull request #3 from acl-services/RCP-4585-update-ckeditor
Browse files Browse the repository at this point in the history
[RCP-4585] Bump CKEditor version to 4.22.1
  • Loading branch information
AleksandrSeleznev authored Jul 24, 2023
2 parents 7a8d554 + 7595bf4 commit 4603bb0
Show file tree
Hide file tree
Showing 349 changed files with 3,172 additions and 2,421 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

## NEXT
* None
## Ckeditor 4.6.0
* Update CKEditor to version 4.22.1 full (30 June 2023)

## Ckeditor 4.5.0

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ CKEditor is a WYSIWYG text editor designed to simplify web content creation. It

## Features

* CKEditor version 4.16.0 full (26 January 2021)
* CKEditor version 4.22.1 full (30 June 2023)
* Rails 5.0.x, 5.1.x, 4.2.x integration
* Files browser
* HTML5 file uploader
Expand Down
4 changes: 2 additions & 2 deletions lib/ckeditor/version.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module Ckeditor
module Version
GEM = '4.5.0'.freeze
EDITOR = '4.16.0'.freeze
GEM = '4.6.0'.freeze
EDITOR = '4.22.1'.freeze
end
end
347 changes: 344 additions & 3 deletions vendor/assets/javascripts/ckeditor/CHANGES.md

Large diffs are not rendered by default.

21 changes: 15 additions & 6 deletions vendor/assets/javascripts/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 vendor/assets/javascripts/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 vendor/assets/javascripts/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.
8 changes: 4 additions & 4 deletions vendor/assets/javascripts/ckeditor/adapters/jquery.js

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

16 changes: 16 additions & 0 deletions vendor/assets/javascripts/ckeditor/bender-runner.config.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{
"bender": {
"port": 9001
},
"server": {
"port": 9002
},
"paths": {
"ckeditor4": "../ckeditor4/",
"runner": "./src/runner.html"
},
"browsers": {
"linux": [ "chrome", "firefox" ],
"macos": [ "safari" ]
}
}
9 changes: 4 additions & 5 deletions vendor/assets/javascripts/ckeditor/build-config.js
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/e431e193e5a737fc50cd68589730b6df
* (2) https://ckeditor.com/cke4/builder/6490967e78ab135a44d8c0998d90e841
* Visit online builder to build CKEditor, starting with the same setup as before.
*
* (3) https://ckeditor.com/cke4/builder/download/e431e193e5a737fc50cd68589730b6df
* (3) https://ckeditor.com/cke4/builder/download/6490967e78ab135a44d8c0998d90e841
* Straight download link to the latest version of CKEditor (Optimized) with the same setup as before.
*
* NOTE:
Expand Down Expand Up @@ -73,7 +73,6 @@ var CKBUILDER_CONFIG = {
'exportpdf' : 1,
'filebrowser' : 1,
'find' : 1,
'flash' : 1,
'floatingspace' : 1,
'font' : 1,
'format' : 1,
Expand Down
Loading

0 comments on commit 4603bb0

Please sign in to comment.