Skip to content

Commit

Permalink
Updated CK Editor to 4.17.1 and fixed a few Issues
Browse files Browse the repository at this point in the history
Disabled exporttopdf plugin. Pass language variable to CKEditor now so can pass supported language to File Manager
  • Loading branch information
eSilverStrike committed Jan 18, 2022
1 parent 6efdfe6 commit ac1cdfc
Show file tree
Hide file tree
Showing 430 changed files with 10,571 additions and 1,403 deletions.
2 changes: 1 addition & 1 deletion public_html/docs/history
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Explanation of list item:
For more in-depth explanation of the issues below see: https://github.com/Geeklog-Core/geeklog/milestone/48?closed=1

- [Improvement] [#1042] Removed support for old Search API (pre Geeklog 1.5.1) [Tom]
-
- [Improvement] [NA] Updated CKEditor to 4.17.1 (Full Package). Fixed language issue with File Manager when Browsing images on server [Tom]
-
-

Expand Down
281 changes: 280 additions & 1 deletion public_html/editors/ckeditor/CHANGES.md

Large diffs are not rendered by default.

27 changes: 21 additions & 6 deletions public_html/editors/ckeditor/LICENSE.md
Original file line number Diff line number Diff line change
Expand Up @@ -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-2021, 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
Expand All @@ -37,14 +37,15 @@ 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-2021, 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 <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):

* 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):

Expand Down Expand Up @@ -1419,3 +1420,17 @@ Redistribution and use in source and binary forms, with or without modification,
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.
```


Appendix H: The BSD-2 License
-----------------------------

```
Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
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.
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.
```

(Ignore this line: %REMOVE_START%)
2 changes: 1 addition & 1 deletion public_html/editors/ckeditor/README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
CKEditor 4
==========

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

CKEditor 4 is a text editor to be used inside web pages. It's not a replacement
Expand Down
10 changes: 10 additions & 0 deletions public_html/editors/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.
2 changes: 1 addition & 1 deletion public_html/editors/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 public_html/editors/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" ]
}
}
14 changes: 8 additions & 6 deletions public_html/editors/ckeditor/build-config.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* @license Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
* @license Copyright (c) 2003-2021, CKSource - Frederico Knabben. All rights reserved.
* For licensing, see LICENSE.md or https://ckeditor.com/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/4e3a4ca28d8cb0c407b480601a63d4b6
* (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/4e3a4ca28d8cb0c407b480601a63d4b6
* (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 All @@ -39,6 +39,7 @@ var CKBUILDER_CONFIG = {
'.jshintrc',
'.mailmap',
'.npm',
'.nvmrc',
'.travis.yml',
'bender-err.log',
'bender-out.log',
Expand All @@ -48,6 +49,7 @@ var CKBUILDER_CONFIG = {
'gruntfile.js',
'less',
'node_modules',
'package-lock.json',
'package.json',
'tests'
],
Expand All @@ -64,12 +66,13 @@ var CKBUILDER_CONFIG = {
'copyformatting' : 1,
'dialogadvtab' : 1,
'div' : 1,
'editorplaceholder' : 1,
'elementspath' : 1,
'enterkey' : 1,
'entities' : 1,
'exportpdf' : 1,
'filebrowser' : 1,
'find' : 1,
'flash' : 1,
'floatingspace' : 1,
'font' : 1,
'format' : 1,
Expand All @@ -90,9 +93,9 @@ var CKBUILDER_CONFIG = {
'newpage' : 1,
'pagebreak' : 1,
'pastefromgdocs' : 1,
'pastefromlibreoffice' : 1,
'pastefromword' : 1,
'pastetext' : 1,
'pastetools' : 1,
'preview' : 1,
'print' : 1,
'removeformat' : 1,
Expand All @@ -114,7 +117,6 @@ var CKBUILDER_CONFIG = {
'toolbar' : 1,
'undo' : 1,
'uploadimage' : 1,
'wsc' : 1,
'wysiwygarea' : 1
},
languages : {
Expand Down

0 comments on commit ac1cdfc

Please sign in to comment.