Переглянути джерело

Merge branch 'master' into t/235

Krzysztof Krztoń 7 роки тому
батько
коміт
1aba708233

+ 16 - 0
packages/ckeditor5-utils/CHANGELOG.md

@@ -1,6 +1,22 @@
 Changelog
 =========
 
+## [10.0.0](https://github.com/ckeditor/ckeditor5-utils/compare/v1.0.0-beta.4...v10.0.0) (2018-04-25)
+
+### Other changes
+
+* Changed the license to GPL2+ only. See [ckeditor/ckeditor5#991](https://github.com/ckeditor/ckeditor5/issues/991). ([3177252](https://github.com/ckeditor/ckeditor5-utils/commit/3177252))
+
+### BREAKING CHANGES
+
+* The license under which CKEditor 5 is released has been changed from a triple GPL, LGPL and MPL license to a GPL2+ only. See [ckeditor/ckeditor5#991](https://github.com/ckeditor/ckeditor5/issues/991) for more information.
+
+
+## [1.0.0-beta.4](https://github.com/ckeditor/ckeditor5-utils/compare/v1.0.0-beta.2...v1.0.0-beta.4) (2018-04-19)
+
+Internal changes only (updated dependencies, documentation, etc.).
+
+
 ## [1.0.0-beta.2](https://github.com/ckeditor/ckeditor5-utils/compare/v1.0.0-beta.1...v1.0.0-beta.2) (2018-04-10)
 
 Internal changes only (updated dependencies, documentation, etc.).

+ 4 - 12
packages/ckeditor5-utils/LICENSE.md

@@ -1,27 +1,19 @@
 Software License Agreement
 ==========================
 
-**CKEditor 5 Utilities** – https://github.com/ckeditor/ckeditor5-utils <br>
+**CKEditor 5 utilities** – https://github.com/ckeditor/ckeditor5-utils <br>
 Copyright (c) 2003-2018, [CKSource](http://cksource.com) Frederico Knabben. All rights reserved.
 
-Licensed under the terms of any of the following licenses at your choice:
-
-* [GNU General Public License Version 2 or later (the "GPL")](http://www.gnu.org/licenses/gpl.html)
-* [GNU Lesser General Public License Version 2.1 or later (the "LGPL")](http://www.gnu.org/licenses/lgpl.html)
-* [Mozilla Public License Version 1.1 or later (the "MPL")](http://www.mozilla.org/MPL/MPL-1.1.html)
-
-You are not required to, but if you want to explicitly declare the license you have chosen to be bound to when using, reproducing, modifying and distributing this software, just include a text file titled "legal.txt" in your version of this software, indicating your license choice. In any case, your choice will not restrict any recipient of your version of this software to use, reproduce, modify and distribute this software under any of the above licenses.
+Licensed under the terms of [GNU General Public License Version 2 or later](http://www.gnu.org/licenses/gpl.html).
 
 Sources of Intellectual Property Included in CKEditor
 -----------------------------------------------------
 
 Where not otherwise indicated, all CKEditor content is authored by CKSource engineers and consists of CKSource-owned intellectual property. In some specific instances, CKEditor will incorporate work done by developers outside of CKSource with their express permission.
 
-Third parties' software included:
+The following libraries are included in CKEditor under the [MIT license](https://opensource.org/licenses/MIT):
 
-* Lo-Dash (src/lib/lodash) <br>
-  Copyright 2012-2015 [The Dojo Foundation](http://dojofoundation.org/) <br>
-  Available under [MIT license](http://lodash.com/license)
+* Lo-Dash - Copyright (c) JS Foundation and other contributors https://js.foundation/. Based on Underscore.js, copyright Jeremy Ashkenas, DocumentCloud and Investigative Reporters & Editors http://underscorejs.org/.
 
 Trademarks
 ----------

+ 1 - 1
packages/ckeditor5-utils/README.md

@@ -18,4 +18,4 @@ See the [`@ckeditor/ckeditor5-utils` package](https://docs.ckeditor.com/ckeditor
 
 ## License
 
-Licensed under the GPL, LGPL and MPL licenses, at your choice. For full details about the license, please check the `LICENSE.md` file.
+Licensed under the terms of [GNU General Public License Version 2 or later](http://www.gnu.org/licenses/gpl.html). For full details about the license, please check the `LICENSE.md` file.

+ 6 - 4
packages/ckeditor5-utils/package.json

@@ -1,14 +1,16 @@
 {
   "name": "@ckeditor/ckeditor5-utils",
-  "version": "1.0.0-beta.2",
+  "version": "10.0.0",
   "description": "Miscellaneous utils used by CKEditor 5.",
   "keywords": [
+    "ckeditor",
     "ckeditor5",
+    "ckeditor 5",
     "ckeditor5-lib"
   ],
   "devDependencies": {
-    "@ckeditor/ckeditor5-core": "^1.0.0-beta.2",
-    "@ckeditor/ckeditor5-engine": "^1.0.0-beta.2",
+    "@ckeditor/ckeditor5-core": "^10.0.0",
+    "@ckeditor/ckeditor5-engine": "^10.0.0",
     "del": "^2.2.0",
     "eslint": "^4.15.0",
     "eslint-config-ckeditor5": "^1.0.7",
@@ -21,7 +23,7 @@
     "npm": ">=3.0.0"
   },
   "author": "CKSource (http://cksource.com/)",
-  "license": "(GPL-2.0 OR LGPL-2.1 OR MPL-1.1)",
+  "license": "GPL-2.0-or-later",
   "homepage": "https://ckeditor.com",
   "bugs": "https://github.com/ckeditor/ckeditor5-utils/issues",
   "repository": {

+ 1 - 0
packages/ckeditor5-utils/src/translation-service.js

@@ -9,6 +9,7 @@
  * @module utils/translation-service
  */
 
+/* istanbul ignore else */
 if ( !window.CKEDITOR_TRANSLATIONS ) {
 	window.CKEDITOR_TRANSLATIONS = {};
 }