Skip to content

Commit e7cf75f

Browse files
committed
Updated CKEditor to 4.5.7 & added VideoDetector plugin
1 parent 9c87ef0 commit e7cf75f

File tree

311 files changed

+8102
-2790
lines changed

Some content is hidden

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

311 files changed

+8102
-2790
lines changed

Resources/public/vendor/ckeditor/CHANGES.md

Lines changed: 723 additions & 12 deletions
Large diffs are not rendered by default.

Resources/public/vendor/ckeditor/LICENSE.md

Lines changed: 159 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 - http://ckeditor.com
5-
Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
5+
Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
66

77
Licensed under the terms of any of the following licenses at your
88
choice:
@@ -35,6 +35,26 @@ CKSource engineers and consists of CKSource-owned intellectual
3535
property. In some specific instances, CKEditor will incorporate work
3636
done by developers outside of CKSource with their express permission.
3737

38+
The following libraries are included in CKEditor under the MIT license (see Appendix D):
39+
40+
* CKSource Samples Framework (included in the samples) - Copyright (c) 2014-2016, CKSource - Frederico Knabben.
41+
* PicoModal (included in `samples/js/sf.js`) - Copyright (c) 2012 James Frasca.
42+
* CodeMirror (included in the samples) - Copyright (C) 2014 by Marijn Haverbeke <marijnh@gmail.com> and others.
43+
44+
Parts of code taken from the following libraries are included in CKEditor under the MIT license (see Appendix D):
45+
46+
* jQuery (inspired the domReady function, ckeditor_base.js) - Copyright (c) 2011 John Resig, http://jquery.com/
47+
48+
The following libraries are included in CKEditor under the SIL Open Font License, Version 1.1 (see Appendix E):
49+
50+
* Font Awesome (included in the toolbar configurator) - Copyright (C) 2012 by Dave Gandy.
51+
52+
The following libraries are included in CKEditor under the BSD-3 License (see Appendix F):
53+
54+
* highlight.js (included in the `codesnippet` plugin) - Copyright (c) 2006, Ivan Sagalaev.
55+
* YUI Library (included in the `uicolor` plugin) - Copyright (c) 2009, Yahoo! Inc.
56+
57+
3858
Trademarks
3959
----------
4060

@@ -47,6 +67,7 @@ marks of their respective holders.
4767
Appendix A: The GPL License
4868
---------------------------
4969

70+
```
5071
GNU GENERAL PUBLIC LICENSE
5172
Version 2, June 1991
5273
@@ -327,11 +348,12 @@ PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
327348
POSSIBILITY OF SUCH DAMAGES.
328349
329350
END OF TERMS AND CONDITIONS
330-
351+
```
331352

332353
Appendix B: The LGPL License
333354
----------------------------
334355

356+
```
335357
GNU LESSER GENERAL PUBLIC LICENSE
336358
Version 2.1, February 1999
337359
@@ -790,11 +812,12 @@ SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
790812
DAMAGES.
791813
792814
END OF TERMS AND CONDITIONS
793-
815+
```
794816

795817
Appendix C: The MPL License
796818
---------------------------
797819

820+
```
798821
MOZILLA PUBLIC LICENSE
799822
Version 1.1
800823
@@ -1262,3 +1285,136 @@ EXHIBIT A -Mozilla Public License.
12621285
the notices in the Source Code files of the Original Code. You should
12631286
use the text of this Exhibit A rather than the text found in the
12641287
Original Code Source Code for Your Modifications.]
1288+
```
1289+
1290+
Appendix D: The MIT License
1291+
---------------------------
1292+
1293+
```
1294+
The MIT License (MIT)
1295+
1296+
Permission is hereby granted, free of charge, to any person obtaining a copy
1297+
of this software and associated documentation files (the "Software"), to deal
1298+
in the Software without restriction, including without limitation the rights
1299+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
1300+
copies of the Software, and to permit persons to whom the Software is
1301+
furnished to do so, subject to the following conditions:
1302+
1303+
The above copyright notice and this permission notice shall be included in
1304+
all copies or substantial portions of the Software.
1305+
1306+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
1307+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
1308+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
1309+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
1310+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
1311+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
1312+
THE SOFTWARE.
1313+
```
1314+
1315+
Appendix E: The SIL Open Font License Version 1.1
1316+
---------------------------------------------
1317+
1318+
```
1319+
SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
1320+
-----------------------------------------------------------
1321+
1322+
PREAMBLE
1323+
The goals of the Open Font License (OFL) are to stimulate worldwide
1324+
development of collaborative font projects, to support the font creation
1325+
efforts of academic and linguistic communities, and to provide a free and
1326+
open framework in which fonts may be shared and improved in partnership
1327+
with others.
1328+
1329+
The OFL allows the licensed fonts to be used, studied, modified and
1330+
redistributed freely as long as they are not sold by themselves. The
1331+
fonts, including any derivative works, can be bundled, embedded,
1332+
redistributed and/or sold with any software provided that any reserved
1333+
names are not used by derivative works. The fonts and derivatives,
1334+
however, cannot be released under any other type of license. The
1335+
requirement for fonts to remain under this license does not apply
1336+
to any document created using the fonts or their derivatives.
1337+
1338+
DEFINITIONS
1339+
"Font Software" refers to the set of files released by the Copyright
1340+
Holder(s) under this license and clearly marked as such. This may
1341+
include source files, build scripts and documentation.
1342+
1343+
"Reserved Font Name" refers to any names specified as such after the
1344+
copyright statement(s).
1345+
1346+
"Original Version" refers to the collection of Font Software components as
1347+
distributed by the Copyright Holder(s).
1348+
1349+
"Modified Version" refers to any derivative made by adding to, deleting,
1350+
or substituting -- in part or in whole -- any of the components of the
1351+
Original Version, by changing formats or by porting the Font Software to a
1352+
new environment.
1353+
1354+
"Author" refers to any designer, engineer, programmer, technical
1355+
writer or other person who contributed to the Font Software.
1356+
1357+
PERMISSION & CONDITIONS
1358+
Permission is hereby granted, free of charge, to any person obtaining
1359+
a copy of the Font Software, to use, study, copy, merge, embed, modify,
1360+
redistribute, and sell modified and unmodified copies of the Font
1361+
Software, subject to the following conditions:
1362+
1363+
1) Neither the Font Software nor any of its individual components,
1364+
in Original or Modified Versions, may be sold by itself.
1365+
1366+
2) Original or Modified Versions of the Font Software may be bundled,
1367+
redistributed and/or sold with any software, provided that each copy
1368+
contains the above copyright notice and this license. These can be
1369+
included either as stand-alone text files, human-readable headers or
1370+
in the appropriate machine-readable metadata fields within text or
1371+
binary files as long as those fields can be easily viewed by the user.
1372+
1373+
3) No Modified Version of the Font Software may use the Reserved Font
1374+
Name(s) unless explicit written permission is granted by the corresponding
1375+
Copyright Holder. This restriction only applies to the primary font name as
1376+
presented to the users.
1377+
1378+
4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
1379+
Software shall not be used to promote, endorse or advertise any
1380+
Modified Version, except to acknowledge the contribution(s) of the
1381+
Copyright Holder(s) and the Author(s) or with their explicit written
1382+
permission.
1383+
1384+
5) The Font Software, modified or unmodified, in part or in whole,
1385+
must be distributed entirely under this license, and must not be
1386+
distributed under any other license. The requirement for fonts to
1387+
remain under this license does not apply to any document created
1388+
using the Font Software.
1389+
1390+
TERMINATION
1391+
This license becomes null and void if any of the above conditions are
1392+
not met.
1393+
1394+
DISCLAIMER
1395+
THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
1396+
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
1397+
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
1398+
OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
1399+
COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
1400+
INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
1401+
DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
1402+
FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
1403+
OTHER DEALINGS IN THE FONT SOFTWARE.
1404+
```
1405+
1406+
Appendix F: The BSD-3 License
1407+
-----------------------------
1408+
1409+
```
1410+
Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
1411+
1412+
1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
1413+
1414+
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.
1415+
1416+
3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
1417+
1418+
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.
1419+
```
1420+

Resources/public/vendor/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-2013, CKSource - Frederico Knabben. All rights reserved.
4+
Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
55
http://ckeditor.com - See LICENSE.md for license information.
66

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

Resources/public/vendor/ckeditor/adapters/jquery.js

Lines changed: 7 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 64 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,25 @@
1-

2-
/**
3-
* @license Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
4-
* For licensing, see LICENSE.html or http://ckeditor.com/license
1+
/**
2+
* @license Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
3+
* For licensing, see LICENSE.md or http://ckeditor.com/license
54
*/
65

76
/**
87
* This file was added automatically by CKEditor builder.
9-
* You may re-use it at any time at http://ckeditor.com/builder to build CKEditor again.
10-
*
11-
* NOTE:
8+
* You may re-use it at any time to build CKEditor again.
9+
*
10+
* If you would like to build CKEditor online again
11+
* (for example to upgrade), visit one the following links:
12+
*
13+
* (1) http://ckeditor.com/builder
14+
* Visit online builder to build CKEditor from scratch.
15+
*
16+
* (2) http://ckeditor.com/builder/195c1866d6de5fbcf96424543dda6d79
17+
* Visit online builder to build CKEditor, starting with the same setup as before.
18+
*
19+
* (3) http://ckeditor.com/builder/download/195c1866d6de5fbcf96424543dda6d79
20+
* Straight download link to the latest version of CKEditor (Optimized) with the same setup as before.
21+
*
22+
* NOTE:
1223
* This file is not used by CKEditor, you may remove it.
1324
* Changing this file will not change your CKEditor configuration.
1425
*/
@@ -17,70 +28,86 @@ var CKBUILDER_CONFIG = {
1728
skin: 'moono',
1829
preset: 'standard',
1930
ignore: [
31+
'.bender',
32+
'bender.js',
33+
'bender-err.log',
34+
'bender-out.log',
2035
'dev',
21-
'.gitignore',
36+
'.DS_Store',
37+
'.editorconfig',
2238
'.gitattributes',
39+
'.gitignore',
40+
'gruntfile.js',
41+
'.idea',
42+
'.jscsrc',
43+
'.jshintignore',
44+
'.jshintrc',
45+
'less',
46+
'.mailmap',
47+
'node_modules',
48+
'package.json',
2349
'README.md',
24-
'.mailmap'
50+
'tests'
2551
],
2652
plugins : {
27-
'about' : 1,
2853
'a11yhelp' : 1,
54+
'about' : 1,
2955
'basicstyles' : 1,
3056
'blockquote' : 1,
57+
'button' : 1,
3158
'clipboard' : 1,
59+
'codemirror' : 1,
3260
'contextmenu' : 1,
33-
'resize' : 1,
34-
'toolbar' : 1,
61+
'dialog' : 1,
62+
'dialogui' : 1,
3563
'elementspath' : 1,
3664
'enterkey' : 1,
3765
'entities' : 1,
66+
'fakeobjects' : 1,
3867
'filebrowser' : 1,
3968
'floatingspace' : 1,
69+
'floatpanel' : 1,
4070
'format' : 1,
41-
'htmlwriter' : 1,
4271
'horizontalrule' : 1,
43-
'wysiwygarea' : 1,
72+
'htmlwriter' : 1,
73+
'image2' : 1,
4474
'indent' : 1,
75+
'indentlist' : 1,
76+
'justify' : 1,
77+
'lineutils' : 1,
4578
'link' : 1,
4679
'list' : 1,
80+
'listblock' : 1,
4781
'magicline' : 1,
4882
'maximize' : 1,
49-
'pastetext' : 1,
83+
'menu' : 1,
84+
'menubutton' : 1,
85+
'panel' : 1,
5086
'pastefromword' : 1,
87+
'pastetext' : 1,
88+
'popup' : 1,
5189
'removeformat' : 1,
90+
'resize' : 1,
91+
'richcombo' : 1,
92+
'scayt' : 1,
93+
'showblocks' : 1,
5294
'sourcearea' : 1,
5395
'specialchar' : 1,
54-
'scayt' : 1,
5596
'stylescombo' : 1,
5697
'tab' : 1,
5798
'table' : 1,
5899
'tabletools' : 1,
59-
'undo' : 1,
60-
'wsc' : 1,
61-
'dialog' : 1,
62-
'dialogui' : 1,
63-
'menu' : 1,
64-
'floatpanel' : 1,
65-
'panel' : 1,
66-
'button' : 1,
67-
'popup' : 1,
68-
'richcombo' : 1,
69-
'listblock' : 1,
70-
'fakeobjects' : 1,
71-
'menubutton' : 1,
72100
'templates' : 1,
73-
'codemirror' : 1,
74-
'showblocks' : 1,
75-
'justify' : 1,
76-
'indentlist' : 1,
77-
'lineutils' : 1,
101+
'toolbar' : 1,
102+
'undo' : 1,
103+
'videodetector' : 1,
78104
'widget' : 1,
79-
'image2' : 1
105+
'wsc' : 1,
106+
'wysiwygarea' : 1
80107
},
81108
languages : {
82-
'nl' : 1,
83109
'en' : 1,
84-
'fr' : 1
110+
'fr' : 1,
111+
'nl' : 1
85112
}
86113
};

0 commit comments

Comments
 (0)