Merge pull request #930 from liferay/feature/feature_sets

Fixes #906 | Implement feature sets

CONTRIBUTING.md

@@ -138,4 +138,24 @@ git checkout -b feature/fix_foo
 
 2. Send a fix PR to `master`
 
-3. Follow steps 3-11 of a scheduled release
+3. Follow steps 3-11 of a scheduled release
+
+## Updating CKEditor.
+
+1. Open your favourite browser and navigate to https://ckeditor.com/cke4/builder.
+
+2. On this page you should see a button labelled "Upload build-config.js", *click it*:
+
+	This will open a file dialog letting you choose CKEditor's build configuration file:
+
+	This file is located in `lib/ckeditor/build-config.js`, select it to upload it.
+
+4. Optionally if you want to add more plugins, scroll down and you should see two panels:
+
+	On the left you'll see the list of selected plugins (automatically detected by parsing the `build-config.js` file uploaded previously) and on the right a list of the available plugins. Click on the plugins you wish to add and on the left arrow button ("<"), this will add the new plugins into the "selected plugins" panel.
+
+5. Finally, scroll to the bottom of the page, agree to the terms of use and click the "Download CKEditor" button.
+
+6. Once the file downloaded, unzip it and *replace* the `lib/ckeditor` directory with the new directory you unzipped.
+
+7. Run `gulp release` and have a look at the demo to make sure everything is working correctly.

lib/ckeditor/LICENSE.md

@@ -1,8 +1,8 @@
 Software License Agreement
 ==========================
 
-CKEditor - The text editor for Internet - http://ckeditor.com
-Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
+CKEditor - The text editor for Internet - https://ckeditor.com/
+Copyright (c) 2003-2018, 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-2017, CKSource - Frederico Knabben.
+* CKSource Samples Framework (included in the samples) - Copyright (c) 2014-2018, 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 <[email protected]> and others.
 

lib/ckeditor/build-config.js

@@ -1,5 +1,5 @@
 /**
- * @license Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
+ * @license Copyright (c) 2003-2018, 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/6d1d57a1fe71d6b50266bccaed3f2d1c
+ * (2) http://ckeditor.com/builder/e05e62fb481ae83a4074f743c787736f
  *     Visit online builder to build CKEditor, starting with the same setup as before.
  *
- * (3) http://ckeditor.com/builder/download/6d1d57a1fe71d6b50266bccaed3f2d1c
+ * (3) http://ckeditor.com/builder/download/e05e62fb481ae83a4074f743c787736f
  *     Straight download link to the latest version of CKEditor (Optimized) with the same setup as before.
  *
  * NOTE:
@@ -38,6 +38,7 @@ var CKBUILDER_CONFIG = {
 		'.jshintignore',
 		'.jshintrc',
 		'.mailmap',
+		'.npm',
 		'.travis.yml',
 		'README.md',
 		'bender-err.log',
@@ -55,7 +56,9 @@ var CKBUILDER_CONFIG = {
 		'basicstyles' : 1,
 		'blockquote' : 1,
 		'clipboard' : 1,
+		'colorbutton' : 1,
 		'enterkey' : 1,
+		'font' : 1,
 		'horizontalrule' : 1,
 		'indentblock' : 1,
 		'indentlist' : 1,