Skip to content

Commit

Permalink
Update CkEditor to 4.6 and changed the default skin to moono-lisa
Browse files Browse the repository at this point in the history
  • Loading branch information
michelerota committed Nov 18, 2016
1 parent 9e1de3e commit 6e7fea7
Show file tree
Hide file tree
Showing 352 changed files with 3,147 additions and 9,753 deletions.
287 changes: 287 additions & 0 deletions src/Resources/public/lib/ckeditor/CHANGES.md

Large diffs are not rendered by default.

8 changes: 6 additions & 2 deletions src/Resources/public/lib/ckeditor/LICENSE.md
Expand Up @@ -2,7 +2,7 @@ Software License Agreement
==========================

CKEditor - The text editor for Internet - http://ckeditor.com
Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.

Licensed under the terms of any of the following licenses at your
choice:
Expand Down Expand Up @@ -37,10 +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-2015, CKSource - Frederico Knabben.
* CKSource Samples Framework (included in the samples) - Copyright (c) 2014-2016, 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.

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/

The following libraries are included in CKEditor under the SIL Open Font License, Version 1.1 (see Appendix E):

* Font Awesome (included in the toolbar configurator) - Copyright (C) 2012 by Dave Gandy.
Expand Down
2 changes: 1 addition & 1 deletion src/Resources/public/lib/ckeditor/README.md
@@ -1,7 +1,7 @@
CKEditor 4
==========

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

CKEditor is a text editor to be used inside web pages. It's not a replacement
Expand Down
10 changes: 5 additions & 5 deletions src/Resources/public/lib/ckeditor/adapters/jquery.js

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

9 changes: 5 additions & 4 deletions src/Resources/public/lib/ckeditor/build-config.js
@@ -1,5 +1,5 @@
/**
* @license Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
* @license Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
* For licensing, see LICENSE.md or http://ckeditor.com/license
*/

Expand All @@ -13,10 +13,10 @@
* (1) http://ckeditor.com/builder
* Visit online builder to build CKEditor from scratch.
*
* (2) http://ckeditor.com/builder/e6b8a045f8f984a69463975ca3e6524a
* (2) http://ckeditor.com/builder/73f7c2ea4317780958faab1be844347c
* Visit online builder to build CKEditor, starting with the same setup as before.
*
* (3) http://ckeditor.com/builder/download/e6b8a045f8f984a69463975ca3e6524a
* (3) http://ckeditor.com/builder/download/73f7c2ea4317780958faab1be844347c
* Straight download link to the latest version of CKEditor (Optimized) with the same setup as before.
*
* NOTE:
Expand All @@ -25,7 +25,7 @@
*/

var CKBUILDER_CONFIG = {
skin: 'moono',
skin: 'moono-lisa',
preset: 'full',
ignore: [
'.bender',
Expand Down Expand Up @@ -121,6 +121,7 @@ var CKBUILDER_CONFIG = {
'cy' : 1,
'da' : 1,
'de' : 1,
'de-ch' : 1,
'el' : 1,
'en' : 1,
'en-au' : 1,
Expand Down

0 comments on commit 6e7fea7

Please sign in to comment.