Skip to content
This repository has been archived by the owner on Aug 13, 2022. It is now read-only.

Commit

Permalink
editor updates
Browse files Browse the repository at this point in the history
  • Loading branch information
Guite committed Jun 25, 2020
1 parent 72680ac commit a1f997d
Show file tree
Hide file tree
Showing 607 changed files with 2,907 additions and 2,897 deletions.
2 changes: 1 addition & 1 deletion Editor/CKEditor/CKEditor.php
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ public function getMeta(): array
{
return [
'displayname' => $this->trans('CKEditor'),
'version' => '4.13.0',
'version' => '4.14.1',
'url' => 'https://ckeditor.com',
'license' => 'GPL-2.0+, LGPL-2.1+, MPL-1.1+',
'logo' => 'logo.gif'
Expand Down
6 changes: 3 additions & 3 deletions Editor/CKEditor/Resources/views/editorheader.html.twig
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<!-- start Scribite with CKEditor for {{ modname }} -->
<script type="text/javascript">
<script>
var CKEDITOR_BASEPATH = '{{ app.request.schemeAndHttpHost }}{{ asset('editors/ckeditor/ckeditor/') }}';
</script>
{{ pageAddAsset('javascript', asset('editors/ckeditor/ckeditor/ckeditor.js'), 100) }}
Expand All @@ -9,11 +9,11 @@
{% set useckfinder, usekcfinder = false, false %}
{% if editorVars.filemanagerpath~'/ckfinder.html'|php('file_exists') %}
{% set useckfinder = true %}
<script type="text/javascript" src="{{ editorVars.filemanagerpath~'/ckfinder.html' }}"></script>
<script src="{{ editorVars.filemanagerpath~'/ckfinder.html' }}"></script>
{% elseif editorVars.filemanagerpath~'/browse.php'|php('file_exists') %}
{% set usekcfinder = true %}
{% endif %}
<script type="text/javascript">
<script>
/* <![CDATA[ */
{% if externalEditorPlugins|default %}
{% for externalPlugin in externalEditorPlugins %}
Expand Down
684 changes: 387 additions & 297 deletions Editor/CKEditor/vendor/ckeditor/CHANGES.md

Large diffs are not rendered by default.

12 changes: 6 additions & 6 deletions Editor/CKEditor/vendor/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-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
Expand All @@ -37,14 +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):

Expand Down
10 changes: 5 additions & 5 deletions Editor/CKEditor/vendor/ckeditor/README.md
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
CKEditor 4
==========

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

CKEditor is a text editor to be used inside web pages. It's not a replacement
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
part of web applications and websites.

## Documentation

The full editor documentation is available online at the following address:
http://docs.ckeditor.com
https://ckeditor.com/docs/

## Installation

Installing CKEditor is an easy task. Just follow these simple steps:

1. **Download** the latest version from the CKEditor website:
http://ckeditor.com. You should have already completed this step, but be
https://ckeditor.com. You should have already completed this step, but be
sure you have the very latest version.
2. **Extract** (decompress) the downloaded file into the root of your website.

Expand Down
2 changes: 1 addition & 1 deletion Editor/CKEditor/vendor/ckeditor/adapters/jquery.js

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

2 changes: 1 addition & 1 deletion Editor/CKEditor/vendor/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-2020, CKSource - Frederico Knabben. All rights reserved.
* For licensing, see LICENSE.md or https://ckeditor.com/license
*/

Expand Down
Loading

0 comments on commit a1f997d

Please sign in to comment.