Skip to content

CKEditor update to 4.2.1 #41

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

Open
jurajkapsz wants to merge 2 commits into
base: master
Choose a base branch
from
Open

CKEditor update to 4.2.1 #41

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
96065e7
CKEditor lib update to v4.2.1
jurajkapsz Oct 13, 2013
e98eddf
Partial fix for http://dev.ckeditor.com/ticket/9998
jurajkapsz Oct 13, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
293 changes: 233 additions & 60 deletions lib/ckeditor/CHANGES.md
View file
Open in desktop

Large diffs are not rendered by default.

2,528 changes: 1,264 additions & 1,264 deletions lib/ckeditor/LICENSE.md
View file
Open in desktop

Large diffs are not rendered by default.

10 changes: 10 additions & 0 deletions lib/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.

59 changes: 32 additions & 27 deletions lib/ckeditor/build-config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,28 +1,28 @@

/**
* @license Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
* For licensing, see LICENSE.html or http://ckeditor.com/license
*/

/**
* This file was added automatically by CKEditor builder.
* You may re-use it at any time at http://ckeditor.com/builder to build CKEditor again.
*
* NOTE:
* This file is not used by CKEditor, you may remove it.
* Changing this file will not change your CKEditor configuration.
*/

var CKBUILDER_CONFIG = {
skin: 'moono',
preset: 'full',
ignore: [
'dev',
'.gitignore',
'.gitattributes',
'README.md',
'.mailmap'
],

/**
* @license Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
* For licensing, see LICENSE.html or http://ckeditor.com/license
*/
/**
* This file was added automatically by CKEditor builder.
* You may re-use it at any time at http://ckeditor.com/builder to build CKEditor again.
*
* NOTE:
* This file is not used by CKEditor, you may remove it.
* Changing this file will not change your CKEditor configuration.
*/
var CKBUILDER_CONFIG = {
skin: 'moono',
preset: 'full',
ignore: [
'dev',
'.gitignore',
'.gitattributes',
'README.md',
'.mailmap'
],
plugins : {
'about' : 1,
'a11yhelp' : 1,
Expand All @@ -48,12 +48,13 @@ var CKBUILDER_CONFIG = {
'font' : 1,
'forms' : 1,
'format' : 1,
'htmlwriter' : 1,
'horizontalrule' : 1,
'htmlwriter' : 1,
'iframe' : 1,
'wysiwygarea' : 1,
'image' : 1,
'indent' : 1,
'indentblock' : 1,
'indentlist' : 1,
'smiley' : 1,
'justify' : 1,
'link' : 1,
Expand Down Expand Up @@ -92,10 +93,12 @@ var CKBUILDER_CONFIG = {
'fakeobjects' : 1,
'richcombo' : 1,
'listblock' : 1,
'indent' : 1,
'menubutton' : 1
},
languages : {
'af' : 1,
'sq' : 1,
'ar' : 1,
'eu' : 1,
'bn' : 1,
Expand Down Expand Up @@ -127,6 +130,7 @@ var CKBUILDER_CONFIG = {
'hi' : 1,
'hu' : 1,
'is' : 1,
'id' : 1,
'it' : 1,
'ja' : 1,
'km' : 1,
Expand All @@ -147,6 +151,7 @@ var CKBUILDER_CONFIG = {
'ru' : 1,
'sr' : 1,
'sr-latn' : 1,
'si' : 1,
'sk' : 1,
'sl' : 1,
'es' : 1,
Expand Down
Loading