Skip to content
This repository was archived by the owner on Mar 26, 2025. It is now read-only.

Commit a9266f2

Browse files
authored
Upgrade ckeditor to 4.17.2 (#595)
1 parent 5dd2974 commit a9266f2

File tree

296 files changed

+1858
-1936
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

296 files changed

+1858
-1936
lines changed

djangocms_text_ckeditor/static/djangocms_text_ckeditor/ckeditor/CHANGES.md

Lines changed: 248 additions & 3 deletions
Large diffs are not rendered by default.

djangocms_text_ckeditor/static/djangocms_text_ckeditor/ckeditor/LICENSE.md

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Software License Agreement
22
==========================
33

44
CKEditor - The text editor for Internet - https://ckeditor.com/
5-
Copyright (c) 2003-2020, CKSource - Frederico Knabben. All rights reserved.
5+
Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
66

77
Licensed under the terms of any of the following licenses at your
88
choice:
@@ -37,10 +37,11 @@ done by developers outside of CKSource with their express permission.
3737

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

40-
* CKSource Samples Framework (included in the samples) - Copyright (c) 2014-2020, CKSource - Frederico Knabben.
40+
* CKSource Samples Framework (included in the samples) - Copyright (c) 2014-2022, CKSource Holding sp. z o.o.
4141
* PicoModal (included in `samples/js/sf.js`) - Copyright (c) 2012 James Frasca.
4242
* CodeMirror (included in the samples) - Copyright (C) 2014 by Marijn Haverbeke <[email protected]> and others.
4343
* ES6Promise - Copyright (c) 2014 Yehuda Katz, Tom Dale, Stefan Penner and contributors.
44+
* A polyfill for `CSS.escape` (adopted with modifications in `core/tools.js`), Mathias Bynens, v1.5.1, https://mths.be/cssescape.
4445

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

@@ -59,7 +60,7 @@ The following libraries are included in CKEditor under the BSD-3 License (see Ap
5960
Trademarks
6061
----------
6162

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

@@ -1419,3 +1420,17 @@ Redistribution and use in source and binary forms, with or without modification,
14191420
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
14201421
```
14211422

1423+
1424+
Appendix H: The BSD-2 License
1425+
-----------------------------
1426+
1427+
```
1428+
Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
1429+
1430+
1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
1431+
2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
1432+
1433+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
1434+
```
1435+
1436+
(Ignore this line: %REMOVE_START%)

djangocms_text_ckeditor/static/djangocms_text_ckeditor/ckeditor/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
CKEditor 4
22
==========
33

4-
Copyright (c) 2003-2020, CKSource - Frederico Knabben. All rights reserved.
4+
Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
55
https://ckeditor.com - See LICENSE.md for license information.
66

77
CKEditor 4 is a text editor to be used inside web pages. It's not a replacement

djangocms_text_ckeditor/static/djangocms_text_ckeditor/ckeditor/adapters/jquery.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

djangocms_text_ckeditor/static/djangocms_text_ckeditor/ckeditor/build-config.js

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**
2-
* @license Copyright (c) 2003-2020, CKSource - Frederico Knabben. All rights reserved.
3-
* For licensing, see LICENSE.md or https://ckeditor.com/license
2+
* @license Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
3+
* For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license/
44
*/
55

66
/**
@@ -13,10 +13,10 @@
1313
* (1) https://ckeditor.com/cke4/builder
1414
* Visit online builder to build CKEditor from scratch.
1515
*
16-
* (2) https://ckeditor.com/cke4/builder/45c2c9b8ea4efc7eaa96c95799394688
16+
* (2) https://ckeditor.com/cke4/builder/83ddad0bc9dea2a30cd6cbc82fea4ea0
1717
* Visit online builder to build CKEditor, starting with the same setup as before.
1818
*
19-
* (3) https://ckeditor.com/cke4/builder/download/45c2c9b8ea4efc7eaa96c95799394688
19+
* (3) https://ckeditor.com/cke4/builder/download/83ddad0bc9dea2a30cd6cbc82fea4ea0
2020
* Straight download link to the latest version of CKEditor (Optimized) with the same setup as before.
2121
*
2222
* NOTE:
@@ -39,6 +39,7 @@ var CKBUILDER_CONFIG = {
3939
'.jshintrc',
4040
'.mailmap',
4141
'.npm',
42+
'.nvmrc',
4243
'.travis.yml',
4344
'bender-err.log',
4445
'bender-out.log',
@@ -48,6 +49,7 @@ var CKBUILDER_CONFIG = {
4849
'gruntfile.js',
4950
'less',
5051
'node_modules',
52+
'package-lock.json',
5153
'package.json',
5254
'tests'
5355
],

0 commit comments

Comments
 (0)