Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

N°4511 - CKEditor : links are made on all the leading text in Firefox #543

Open
wants to merge 1 commit into
base: support/3.1
Choose a base branch
from
Open

N°4511 - CKEditor : links are made on all the leading text in Firefox #543

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
11 changes: 6 additions & 5 deletions application/utils.inc.php
View file
Open in desktop
Expand Up @@ -2803,12 +2803,13 @@ public static function GetCkeditorPref()
HTML;

$aDefaultConf['mentions'][] = [
'feed' => $sMentionEndpoint,
'marker' => $sMentionMarker,
'minChars' => MetaModel::GetConfig()->Get('min_autocomplete_chars'),
'itemTemplate' => $sMentionItemTemplate,
'feed' => $sMentionEndpoint,
'marker' => $sMentionMarker,
'minChars' => MetaModel::GetConfig()->Get('min_autocomplete_chars'),
'itemTemplate' => $sMentionItemTemplate,
'outputTemplate' => $sMentionOutputTemplate,
'throttle' => 500,
'throttle' => 500,
'followingSpace' => true,
];
}
}
Expand Down
308 changes: 301 additions & 7 deletions js/ckeditor/CHANGES.md
View file
Open in desktop

Large diffs are not rendered by default.

20 changes: 14 additions & 6 deletions js/ckeditor/LICENSE.md
View file
Open in desktop
@@ -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,7 +45,7 @@ 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.
Expand All @@ -60,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 js/ckeditor/README.md
View file
Open in desktop
@@ -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
8 changes: 4 additions & 4 deletions js/ckeditor/adapters/jquery.js
View file
Open in desktop

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

10 changes: 5 additions & 5 deletions js/ckeditor/build-config.js
View file
Open in desktop
@@ -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/363612f1c48aab01ae21e0e8388b886b
* (2) https://ckeditor.com/cke4/builder/ea4ef7b4106f2a2e71e512d82638c9b8
* Visit online builder to build CKEditor, starting with the same setup as before.
*
* (3) https://ckeditor.com/cke4/builder/download/363612f1c48aab01ae21e0e8388b886b
* (3) https://ckeditor.com/cke4/builder/download/ea4ef7b4106f2a2e71e512d82638c9b8
* 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 @@ -97,7 +98,6 @@ var CKBUILDER_CONFIG = {
'toolbar' : 1,
'undo' : 1,
'uploadimage' : 1,
'wsc' : 1,
'wysiwygarea' : 1
},
languages : {
Expand Down