Updated CKEditor to 4.6.1

Geeklog-Core · Dec 9, 2016 · 55ac7dc · 55ac7dc
1 parent 44d12a3
commit 55ac7dc
Show file tree

Hide file tree

Showing 286 changed files with 2,152 additions and 1,679 deletions.
diff --git a/public_html/docs/english/changes.html b/public_html/docs/english/changes.html
@@ -29,7 +29,7 @@ <h2><a name="changes212">Geeklog 2.1.2</a></h2>
 <li>Postgresql 9.1.7 or later</li>
 </ul>
 
-<p>This Geeklog release no longer supports Microsoft SQL Server (mssql). The Professional and Professional CSS themes also have been removed.</p>
+<p>This Geeklog release no longer supports Microsoft SQL Server (mssql). The Professional and Professional CSS themes also have been removed. Geeklog ships with jQuery v1.11.3, jQuery UI v1.11.4, CKEditor v4.6.1, UIkit v2.27.2, Filemanager v2.2.0, and OAuth class v1.152.</p>
 
 <h3>Major New Features and Improvements</h3>
 

diff --git a/public_html/docs/history b/public_html/docs/history
@@ -31,7 +31,7 @@ Not Released (2.1.2)
 - [Update] Removed Professional and Professional CSS themes [Tom]
 - [Update] UIkit framework to version 2.27.2 [Dengen]
 - [Update] jQuery to version 1.11.3 and jQuery UI to version 1.11.4. [Dengen] ** FIX
-- [Update] CKEditor to version 4.5.4 [Dengen] ** FIX
+- [Update] CKEditor to version 4.6.1 [Tom]
 - [Update] OAuth class to version 1.152 [Tom]
 - [Bug] Geeklog can now handle emoji icons and 4-byte characters. They can either be removed from the input or saved (depending on website setup) [Mystralkk]
 - [Bug] Daily Digest URLs in articles are converted into absolute URLs. [Mystralkk]

diff --git a/public_html/editors/ckeditor/CHANGES.md b/public_html/editors/ckeditor/CHANGES.md
diff --git a/public_html/editors/ckeditor/LICENSE.md b/public_html/editors/ckeditor/LICENSE.md
@@ -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:
@@ -37,7 +37,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-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.
 

diff --git a/public_html/editors/ckeditor/README.md b/public_html/editors/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

diff --git a/public_html/editors/ckeditor/adapters/jquery.js b/public_html/editors/ckeditor/adapters/jquery.js
diff --git a/public_html/editors/ckeditor/build-config.js b/public_html/editors/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
  */
 
@@ -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/40c425ed2fa12159c4b74a7f6bbc282f
  *     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/40c425ed2fa12159c4b74a7f6bbc282f
  *     Straight download link to the latest version of CKEditor (Optimized) with the same setup as before.
  *
  * NOTE:
@@ -25,7 +25,7 @@
  */
 
 var CKBUILDER_CONFIG = {
-	skin: 'moono',
+	skin: 'moono-lisa',
 	preset: 'full',
 	ignore: [
 		'.bender',
@@ -59,6 +59,7 @@ var CKBUILDER_CONFIG = {
 		'colorbutton' : 1,
 		'colordialog' : 1,
 		'contextmenu' : 1,
+		'copyformatting' : 1,
 		'dialogadvtab' : 1,
 		'div' : 1,
 		'elementspath' : 1,
@@ -121,6 +122,7 @@ var CKBUILDER_CONFIG = {
 		'cy' : 1,
 		'da' : 1,
 		'de' : 1,
+		'de-ch' : 1,
 		'el' : 1,
 		'en' : 1,
 		'en-au' : 1,
@@ -157,6 +159,7 @@ var CKBUILDER_CONFIG = {
 		'nb' : 1,
 		'nl' : 1,
 		'no' : 1,
+		'oc' : 1,
 		'pl' : 1,
 		'pt' : 1,
 		'pt-br' : 1,