Skip to content

Commit

Permalink
Use custom CKEditor - refs #8175
Browse files Browse the repository at this point in the history
  • Loading branch information
AngelFQC committed Apr 6, 2016
1 parent 88b3acf commit 12c7e7e
Show file tree
Hide file tree
Showing 95 changed files with 791 additions and 772 deletions.
5 changes: 3 additions & 2 deletions app/Resources/public/assets/ChamiloLMS/.bower.json
Expand Up @@ -13,7 +13,7 @@
"jquery": "2.2.0",
"jquery-ui": "1.11.*",
"bootstrap-daterangepicker": "1.3.*",
"ckeditor": "4.*",
"ckeditor": "https://github.com/AngelFQC/ckeditor-releases.git",
"jquery-timeago": "1.4.*",
"mediaelement": "2.*",
"modernizr": "2.8.*",
Expand All @@ -33,5 +33,6 @@
},
"_source": "/var/www/html/chamilo/src/Chamilo/CoreBundle/Resources/config/bower.json",
"_target": "*",
"_originalSource": "/var/www/html/chamilo/src/Chamilo/CoreBundle/Resources/config/bower.json"
"_originalSource": "/var/www/html/chamilo/src/Chamilo/CoreBundle/Resources/config/bower.json",
"_direct": true
}
2 changes: 1 addition & 1 deletion app/Resources/public/assets/ChamiloLMS/bower.json
Expand Up @@ -13,7 +13,7 @@
"jquery": "2.2.0",
"jquery-ui": "1.11.*",
"bootstrap-daterangepicker": "1.3.*",
"ckeditor": "4.*",
"ckeditor": "https://github.com/AngelFQC/ckeditor-releases.git",
"jquery-timeago": "1.4.*",
"mediaelement": "2.*",
"modernizr": "2.8.*",
Expand Down
14 changes: 7 additions & 7 deletions app/Resources/public/assets/ckeditor/.bower.json
Expand Up @@ -16,14 +16,14 @@
"homepage": "http://ckeditor.com",
"main": "./ckeditor.js",
"moduleType": "globals",
"version": "4.5.8",
"_release": "4.5.8",
"version": "4.5.9",
"_release": "4.5.9",
"_resolution": {
"type": "version",
"tag": "4.5.8",
"commit": "6345bc8f142bb72ffb83b4a964be4d88ad3905c8"
"tag": "4.5.9",
"commit": "ba2580967f7409784921b4320e297522175e45bb"
},
"_source": "git://github.com/ckeditor/ckeditor-releases.git",
"_target": "4.*",
"_originalSource": "ckeditor"
"_source": "https://github.com/AngelFQC/ckeditor-releases.git",
"_target": "*",
"_originalSource": "https://github.com/AngelFQC/ckeditor-releases.git"
}
2 changes: 2 additions & 0 deletions app/Resources/public/assets/ckeditor/CHANGES.md
@@ -1,6 +1,8 @@
CKEditor 4 Changelog
====================

## CKEditor 4.5.9

## CKEditor 4.5.8

New Features:
Expand Down
1,283 changes: 659 additions & 624 deletions app/Resources/public/assets/ckeditor/ckeditor.js

Large diffs are not rendered by default.

49 changes: 11 additions & 38 deletions app/Resources/public/assets/ckeditor/config.js
@@ -1,38 +1,11 @@
/**
* @license Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
* For licensing, see LICENSE.md or http://ckeditor.com/license
*/

CKEDITOR.editorConfig = function( config ) {
// Define changes to default configuration here.
// For complete reference see:
// http://docs.ckeditor.com/#!/api/CKEDITOR.config

// The toolbar groups arrangement, optimized for two toolbar rows.
config.toolbarGroups = [
{ name: 'clipboard', groups: [ 'clipboard', 'undo' ] },
{ name: 'editing', groups: [ 'find', 'selection', 'spellchecker' ] },
{ name: 'links' },
{ name: 'insert' },
{ name: 'forms' },
{ name: 'tools' },
{ name: 'document', groups: [ 'mode', 'document', 'doctools' ] },
{ name: 'others' },
'/',
{ name: 'basicstyles', groups: [ 'basicstyles', 'cleanup' ] },
{ name: 'paragraph', groups: [ 'list', 'indent', 'blocks', 'align', 'bidi' ] },
{ name: 'styles' },
{ name: 'colors' },
{ name: 'about' }
];

// Remove some buttons provided by the standard plugins, which are
// not needed in the Standard(s) toolbar.
config.removeButtons = 'Underline,Subscript,Superscript';

// Set the most common block elements.
config.format_tags = 'p;h1;h2;h3;pre';

// Simplify the dialog windows.
config.removeDialogTabs = 'image:advanced;link:advanced';
};
/**
* Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
* For licensing, see LICENSE.md or http://ckeditor.com/license
*/

CKEDITOR.editorConfig = function( config ) {
// Define changes to default configuration here. For example:
// config.language = 'fr';
// config.uiColor = '#AADC6E';
};

2 changes: 1 addition & 1 deletion app/Resources/public/assets/ckeditor/lang/af.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion app/Resources/public/assets/ckeditor/lang/ar.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion app/Resources/public/assets/ckeditor/lang/bg.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion app/Resources/public/assets/ckeditor/lang/bn.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion app/Resources/public/assets/ckeditor/lang/bs.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion app/Resources/public/assets/ckeditor/lang/ca.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion app/Resources/public/assets/ckeditor/lang/cs.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion app/Resources/public/assets/ckeditor/lang/cy.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion app/Resources/public/assets/ckeditor/lang/da.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion app/Resources/public/assets/ckeditor/lang/de-ch.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion app/Resources/public/assets/ckeditor/lang/de.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion app/Resources/public/assets/ckeditor/lang/el.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion app/Resources/public/assets/ckeditor/lang/en-au.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion app/Resources/public/assets/ckeditor/lang/en-ca.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion app/Resources/public/assets/ckeditor/lang/en-gb.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion app/Resources/public/assets/ckeditor/lang/en.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion app/Resources/public/assets/ckeditor/lang/eo.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion app/Resources/public/assets/ckeditor/lang/es.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion app/Resources/public/assets/ckeditor/lang/et.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion app/Resources/public/assets/ckeditor/lang/eu.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion app/Resources/public/assets/ckeditor/lang/fa.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion app/Resources/public/assets/ckeditor/lang/fi.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion app/Resources/public/assets/ckeditor/lang/fo.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion app/Resources/public/assets/ckeditor/lang/fr-ca.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion app/Resources/public/assets/ckeditor/lang/fr.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion app/Resources/public/assets/ckeditor/lang/gl.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion app/Resources/public/assets/ckeditor/lang/gu.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion app/Resources/public/assets/ckeditor/lang/he.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion app/Resources/public/assets/ckeditor/lang/hi.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion app/Resources/public/assets/ckeditor/lang/hr.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion app/Resources/public/assets/ckeditor/lang/hu.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion app/Resources/public/assets/ckeditor/lang/id.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion app/Resources/public/assets/ckeditor/lang/is.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion app/Resources/public/assets/ckeditor/lang/it.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion app/Resources/public/assets/ckeditor/lang/ja.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion app/Resources/public/assets/ckeditor/lang/ka.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion app/Resources/public/assets/ckeditor/lang/km.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion app/Resources/public/assets/ckeditor/lang/ko.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion app/Resources/public/assets/ckeditor/lang/ku.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion app/Resources/public/assets/ckeditor/lang/lt.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion app/Resources/public/assets/ckeditor/lang/lv.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion app/Resources/public/assets/ckeditor/lang/mk.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion app/Resources/public/assets/ckeditor/lang/mn.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion app/Resources/public/assets/ckeditor/lang/ms.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion app/Resources/public/assets/ckeditor/lang/nb.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion app/Resources/public/assets/ckeditor/lang/nl.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion app/Resources/public/assets/ckeditor/lang/no.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion app/Resources/public/assets/ckeditor/lang/pl.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion app/Resources/public/assets/ckeditor/lang/pt-br.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion app/Resources/public/assets/ckeditor/lang/pt.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion app/Resources/public/assets/ckeditor/lang/ro.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion app/Resources/public/assets/ckeditor/lang/ru.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion app/Resources/public/assets/ckeditor/lang/si.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion app/Resources/public/assets/ckeditor/lang/sk.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion app/Resources/public/assets/ckeditor/lang/sl.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion app/Resources/public/assets/ckeditor/lang/sq.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion app/Resources/public/assets/ckeditor/lang/sr-latn.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion app/Resources/public/assets/ckeditor/lang/sr.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion app/Resources/public/assets/ckeditor/lang/sv.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion app/Resources/public/assets/ckeditor/lang/th.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion app/Resources/public/assets/ckeditor/lang/tr.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion app/Resources/public/assets/ckeditor/lang/tt.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion app/Resources/public/assets/ckeditor/lang/ug.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion app/Resources/public/assets/ckeditor/lang/uk.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion app/Resources/public/assets/ckeditor/lang/vi.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion app/Resources/public/assets/ckeditor/lang/zh-cn.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion app/Resources/public/assets/ckeditor/lang/zh.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion app/Resources/public/assets/ckeditor/package.json
Expand Up @@ -5,7 +5,7 @@
"main": "ckeditor.js",
"repository": {
"type": "git",
"url": "git+https://github.com/ckeditor/ckeditor-releases.git"
"url": "git+https://github.com/AngelFQC/ckeditor-releases.git"
},
"keywords": [
"ckeditor",
Expand Down
41 changes: 21 additions & 20 deletions app/Resources/public/assets/ckeditor/plugins/flash/dialogs/flash.js

Large diffs are not rendered by default.

Binary file not shown.
Binary file modified app/Resources/public/assets/ckeditor/plugins/icons.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/Resources/public/assets/ckeditor/plugins/icons_hidpi.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

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

2 changes: 1 addition & 1 deletion app/Resources/public/assets/ckeditor/skins/kama/editor.css

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Binary file modified app/Resources/public/assets/ckeditor/skins/kama/icons.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/Resources/public/assets/ckeditor/skins/kama/icons_hidpi.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Binary file modified app/Resources/public/assets/ckeditor/skins/moono/icons.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion src/Chamilo/CoreBundle/Resources/config/bower.json
Expand Up @@ -13,7 +13,7 @@
"jquery": "2.2.0",
"jquery-ui": "1.11.*",
"bootstrap-daterangepicker": "1.3.*",
"ckeditor": "4.*",
"ckeditor": "https://github.com/AngelFQC/ckeditor-releases.git",
"jquery-timeago": "1.4.*",
"mediaelement": "2.*",
"modernizr": "2.8.*",
Expand Down

0 comments on commit 12c7e7e

Please sign in to comment.