ソースを参照

Merge branch 'master' into stable

Piotrek Koszuliński 7 年 前
コミット
4b035660a7
5 ファイル変更69 行追加47 行削除
  1. 21 1
      CHANGELOG.md
  2. 3 1
      README.md
  3. 2 2
      docs/framework/guides/architecture/ui-library.md
  4. 35 35
      mgit.json
  5. 8 8
      package.json

+ 21 - 1
CHANGELOG.md

@@ -1,13 +1,33 @@
 Changelog
 =========
 
+## [10.0.1](https://github.com/ckeditor/ckeditor5/compare/v10.0.0...v10.0.1) (2018-05-22)
+
+## Release notes
+
+We would like to announce the release of CKEditor 5 v10.0.1 that contains a security fix for the [Link package](http://npmjs.com/package/@ckeditor/ckeditor5-link), so an upgrade is highly recommended for all CKEditor 5 installations that include it. Additionally, this release fixes an issue with the decoupled editor that blocked enabling real-time collaboration in this editor.
+
+You can read more in the [blog post](https://ckeditor.com/blog/CKEditor-5-v10.0.1-released/).
+
+### Dependencies
+
+Patch releases (bug fixes, internal changes):
+
+* [@ckeditor/ckeditor5-build-balloon](https://www.npmjs.com/package/@ckeditor/ckeditor5-build-balloon): v10.0.0 => [v10.0.1](https://github.com/ckeditor/ckeditor5-build-balloon/releases/tag/v10.0.1)
+* [@ckeditor/ckeditor5-build-classic](https://www.npmjs.com/package/@ckeditor/ckeditor5-build-classic): v10.0.0 => [v10.0.1](https://github.com/ckeditor/ckeditor5-build-classic/releases/tag/v10.0.1)
+* [@ckeditor/ckeditor5-build-decoupled-document](https://www.npmjs.com/package/@ckeditor/ckeditor5-build-decoupled-document): v10.0.0 => [v10.0.1](https://github.com/ckeditor/ckeditor5-build-decoupled-document/releases/tag/v10.0.1)
+* [@ckeditor/ckeditor5-build-inline](https://www.npmjs.com/package/@ckeditor/ckeditor5-build-inline): v10.0.0 => [v10.0.1](https://github.com/ckeditor/ckeditor5-build-inline/releases/tag/v10.0.1)
+* [@ckeditor/ckeditor5-editor-decoupled](https://www.npmjs.com/package/@ckeditor/ckeditor5-editor-decoupled): v10.0.0 => [v10.0.1](https://github.com/ckeditor/ckeditor5-editor-decoupled/releases/tag/v10.0.1)
+* [@ckeditor/ckeditor5-link](https://www.npmjs.com/package/@ckeditor/ckeditor5-link): v10.0.0 => [v10.0.1](https://github.com/ckeditor/ckeditor5-link/releases/tag/v10.0.1)
+
+
 ## [10.0.0](https://github.com/ckeditor/ckeditor5/compare/v1.0.0-beta.4...v10.0.0) (2018-04-25)
 
 ### Release notes
 
 The first stable release of CKEditor 5 🎉🎉🎉
 
-Blog post comming soon...
+You can read a summary blog post here: https://ckeditor.com/blog/CKEditor-5-v10.0.0-the-future-of-rich-text-editing-looks-stable/.
 
 PS. We decided to skip version numbers lower than v5.0.0 to avoid collisions with [CKEditor 3-4](http://github.com/ckeditor/ckeditor-dev).
 

+ 3 - 1
README.md

@@ -1,6 +1,8 @@
 CKEditor 5 [![Tweet](https://img.shields.io/twitter/url/http/shields.io.svg?style=social)](https://twitter.com/intent/tweet?text=Check%20out%20CKEditor%205%20on%20GitHub%20&url=https://github.com/ckeditor/ckeditor5)
 ===================================
 
+[![npm version](https://badge.fury.io/js/ckeditor5.svg)](https://www.npmjs.com/package/ckeditor5)
+
 [![Build Status](https://travis-ci.org/ckeditor/ckeditor5.svg?branch=master)](https://travis-ci.org/ckeditor/ckeditor5)
 [![BrowserStack Status](https://www.browserstack.com/automate/badge.svg?badge_key=d3hvenZqQVZERFQ5d09FWXdyT0ozVXhLaVltRFRjTTUyZGpvQWNmWVhUUT0tLUZqNlJ1YWRUd0RvdEVOaEptM1B2Q0E9PQ==--c9d3dee40b9b4471ff3fb516d9ecf8d09292c7e0)](https://www.browserstack.com/automate/public-build/d3hvenZqQVZERFQ5d09FWXdyT0ozVXhLaVltRFRjTTUyZGpvQWNmWVhUUT0tLUZqNlJ1YWRUd0RvdEVOaEptM1B2Q0E9PQ==--c9d3dee40b9b4471ff3fb516d9ecf8d09292c7e0)
 [![Dependency Status](https://img.shields.io/david/ckeditor/ckeditor5.svg)](https://david-dm.org/ckeditor/ckeditor5)
@@ -130,11 +132,11 @@ Read more on the [Support](https://docs.ckeditor.com/ckeditor5/latest/framework/
 
 The five latest releases:
 
+* [Security release – CKEditor 5 v10.0.1](https://github.com/ckeditor/ckeditor5/releases/tag/v10.0.1) (<time datetime="2018-05-22T12:04:45Z"><i>May 22, 2018</i></time>)
 * [First stable release – CKEditor 5 v10.0.0](https://github.com/ckeditor/ckeditor5/releases/tag/v10.0.0) (<time datetime="2018-04-25T14:12:00Z"><i>Apr 25, 2018</i></time>)
 * [Beta release of CKEditor 5 v1.0.0](https://ckeditor.com/blog/CKEditor-5-v1.0.0-beta-released/) (<time datetime="2018-04-10T12:12:00Z"><i>Apr 10, 2018</i></time>)
 * [Second alpha release of CKEditor 5 v1.0.0](https://ckeditor.com/blog/Second-alpha-release-of-CKEditor-5-v1.0.0/) (<time datetime="2017-11-14T12:52:18Z"><i>Nov 14, 2017</i></time>)
 * [First alpha release of CKEditor 5 v1.0.0](https://ckeditor.com/blog/First-alpha-release-of-CKEditor-5-v1.0.0/) (<time datetime="2017-10-03T13:09:29Z"><i>Oct 3, 2017</i></time>)
-* [11th developer preview of CKEditor 5](https://ckeditor.com/blog/11th-developer-preview-of-CKEditor-5-available/) (<time datetime="2017-09-03T19:35:48Z"><i>Sep 3, 2017</i></time>)
 
 For more CKEditor 5 release blog posts [browse the CKEditor blog](https://ckeditor.com/blog/?category=releases&tags=CKEditor-5).
 

+ 2 - 2
docs/framework/guides/architecture/ui-library.md

@@ -113,7 +113,7 @@ will result in:
 <input class="foo ck-enabled" type="text" placeholder="Type some text" />
 ```
 
-Alternatively, they can [bind](#event-system-and-observables) them directly to their own observable properties:
+Alternatively, they can {@link framework/guides/architecture/core-editor-architecture#event-system-and-observables bind} them directly to their own observable properties:
 
 ```js
 view.bind( 'placeholder', 'isEnabled' ).to( observable, 'placeholderText', 'isEnabled' );
@@ -154,7 +154,7 @@ view.element.placeholder = 'A new placeholder';
 	Check out the {@link module:ui/template~TemplateDefinition} to learn more about the template syntax and other advanced concepts.
 </info-box>
 
-Templates support [observable properties](#event-system-and-observables) bindings and handle native DOM events. A very simple template can look like this:
+Templates support {@link framework/guides/architecture/core-editor-architecture#event-system-and-observables observable properties} bindings and handle native DOM events. A very simple template can look like this:
 
 ```js
 new Template( {

+ 35 - 35
mgit.json

@@ -2,40 +2,40 @@
   "packages": "packages/",
   "packagesPrefix": "@ckeditor/ckeditor5-",
   "dependencies": {
-    "@ckeditor/ckeditor5-adapter-ckfinder": "ckeditor/ckeditor5-adapter-ckfinder#stable",
-    "@ckeditor/ckeditor5-alignment": "ckeditor/ckeditor5-alignment#stable",
-    "@ckeditor/ckeditor5-autoformat": "ckeditor/ckeditor5-autoformat#stable",
-    "@ckeditor/ckeditor5-basic-styles": "ckeditor/ckeditor5-basic-styles#stable",
-    "@ckeditor/ckeditor5-block-quote": "ckeditor/ckeditor5-block-quote#stable",
-    "@ckeditor/ckeditor5-build-balloon": "ckeditor/ckeditor5-build-balloon#stable",
-    "@ckeditor/ckeditor5-build-classic": "ckeditor/ckeditor5-build-classic#stable",
-    "@ckeditor/ckeditor5-build-decoupled-document": "ckeditor/ckeditor5-build-decoupled-document#stable",
-    "@ckeditor/ckeditor5-build-inline": "ckeditor/ckeditor5-build-inline#stable",
-    "@ckeditor/ckeditor5-clipboard": "ckeditor/ckeditor5-clipboard#stable",
-    "@ckeditor/ckeditor5-cloud-services": "ckeditor/ckeditor5-cloud-services#stable",
-    "@ckeditor/ckeditor5-core": "ckeditor/ckeditor5-core#stable",
-    "@ckeditor/ckeditor5-easy-image": "ckeditor/ckeditor5-easy-image#stable",
-    "@ckeditor/ckeditor5-editor-balloon": "ckeditor/ckeditor5-editor-balloon#stable",
-    "@ckeditor/ckeditor5-editor-classic": "ckeditor/ckeditor5-editor-classic#stable",
-    "@ckeditor/ckeditor5-editor-decoupled": "ckeditor/ckeditor5-editor-decoupled#stable",
-    "@ckeditor/ckeditor5-editor-inline": "ckeditor/ckeditor5-editor-inline#stable",
-    "@ckeditor/ckeditor5-engine": "ckeditor/ckeditor5-engine#stable",
-    "@ckeditor/ckeditor5-enter": "ckeditor/ckeditor5-enter#stable",
-    "@ckeditor/ckeditor5-essentials": "ckeditor/ckeditor5-essentials#stable",
-    "@ckeditor/ckeditor5-font": "ckeditor/ckeditor5-font#stable",
-    "@ckeditor/ckeditor5-heading": "ckeditor/ckeditor5-heading#stable",
-    "@ckeditor/ckeditor5-highlight": "ckeditor/ckeditor5-highlight#stable",
-    "@ckeditor/ckeditor5-image": "ckeditor/ckeditor5-image#stable",
-    "@ckeditor/ckeditor5-link": "ckeditor/ckeditor5-link#stable",
-    "@ckeditor/ckeditor5-list": "ckeditor/ckeditor5-list#stable",
-    "@ckeditor/ckeditor5-markdown-gfm": "ckeditor/ckeditor5-markdown-gfm#stable",
-    "@ckeditor/ckeditor5-paragraph": "ckeditor/ckeditor5-paragraph#stable",
-    "@ckeditor/ckeditor5-theme-lark": "ckeditor/ckeditor5-theme-lark#stable",
-    "@ckeditor/ckeditor5-typing": "ckeditor/ckeditor5-typing#stable",
-    "@ckeditor/ckeditor5-ui": "ckeditor/ckeditor5-ui#stable",
-    "@ckeditor/ckeditor5-undo": "ckeditor/ckeditor5-undo#stable",
-    "@ckeditor/ckeditor5-upload": "ckeditor/ckeditor5-upload#stable",
-    "@ckeditor/ckeditor5-utils": "ckeditor/ckeditor5-utils#stable",
-    "@ckeditor/ckeditor5-widget": "ckeditor/ckeditor5-widget#stable"
+    "@ckeditor/ckeditor5-adapter-ckfinder": "ckeditor/ckeditor5-adapter-ckfinder",
+    "@ckeditor/ckeditor5-alignment": "ckeditor/ckeditor5-alignment",
+    "@ckeditor/ckeditor5-autoformat": "ckeditor/ckeditor5-autoformat",
+    "@ckeditor/ckeditor5-basic-styles": "ckeditor/ckeditor5-basic-styles",
+    "@ckeditor/ckeditor5-block-quote": "ckeditor/ckeditor5-block-quote",
+    "@ckeditor/ckeditor5-build-balloon": "ckeditor/ckeditor5-build-balloon",
+    "@ckeditor/ckeditor5-build-classic": "ckeditor/ckeditor5-build-classic",
+    "@ckeditor/ckeditor5-build-decoupled-document": "ckeditor/ckeditor5-build-decoupled-document",
+    "@ckeditor/ckeditor5-build-inline": "ckeditor/ckeditor5-build-inline",
+    "@ckeditor/ckeditor5-clipboard": "ckeditor/ckeditor5-clipboard",
+    "@ckeditor/ckeditor5-cloud-services": "ckeditor/ckeditor5-cloud-services",
+    "@ckeditor/ckeditor5-core": "ckeditor/ckeditor5-core",
+    "@ckeditor/ckeditor5-easy-image": "ckeditor/ckeditor5-easy-image",
+    "@ckeditor/ckeditor5-editor-balloon": "ckeditor/ckeditor5-editor-balloon",
+    "@ckeditor/ckeditor5-editor-classic": "ckeditor/ckeditor5-editor-classic",
+    "@ckeditor/ckeditor5-editor-decoupled": "ckeditor/ckeditor5-editor-decoupled",
+    "@ckeditor/ckeditor5-editor-inline": "ckeditor/ckeditor5-editor-inline",
+    "@ckeditor/ckeditor5-engine": "ckeditor/ckeditor5-engine",
+    "@ckeditor/ckeditor5-enter": "ckeditor/ckeditor5-enter",
+    "@ckeditor/ckeditor5-essentials": "ckeditor/ckeditor5-essentials",
+    "@ckeditor/ckeditor5-font": "ckeditor/ckeditor5-font",
+    "@ckeditor/ckeditor5-heading": "ckeditor/ckeditor5-heading",
+    "@ckeditor/ckeditor5-highlight": "ckeditor/ckeditor5-highlight",
+    "@ckeditor/ckeditor5-image": "ckeditor/ckeditor5-image",
+    "@ckeditor/ckeditor5-link": "ckeditor/ckeditor5-link",
+    "@ckeditor/ckeditor5-list": "ckeditor/ckeditor5-list",
+    "@ckeditor/ckeditor5-markdown-gfm": "ckeditor/ckeditor5-markdown-gfm",
+    "@ckeditor/ckeditor5-paragraph": "ckeditor/ckeditor5-paragraph",
+    "@ckeditor/ckeditor5-theme-lark": "ckeditor/ckeditor5-theme-lark",
+    "@ckeditor/ckeditor5-typing": "ckeditor/ckeditor5-typing",
+    "@ckeditor/ckeditor5-ui": "ckeditor/ckeditor5-ui",
+    "@ckeditor/ckeditor5-undo": "ckeditor/ckeditor5-undo",
+    "@ckeditor/ckeditor5-upload": "ckeditor/ckeditor5-upload",
+    "@ckeditor/ckeditor5-utils": "ckeditor/ckeditor5-utils",
+    "@ckeditor/ckeditor5-widget": "ckeditor/ckeditor5-widget"
   }
 }

+ 8 - 8
package.json

@@ -1,6 +1,6 @@
 {
   "name": "ckeditor5",
-  "version": "10.0.0",
+  "version": "10.0.1",
   "description": "The development environment of CKEditor 5.",
   "keywords": [
     "CKEditor",
@@ -29,17 +29,17 @@
     "@ckeditor/ckeditor5-autoformat": "^10.0.0",
     "@ckeditor/ckeditor5-basic-styles": "^10.0.0",
     "@ckeditor/ckeditor5-block-quote": "^10.0.0",
-    "@ckeditor/ckeditor5-build-balloon": "^10.0.0",
-    "@ckeditor/ckeditor5-build-classic": "^10.0.0",
-    "@ckeditor/ckeditor5-build-decoupled-document": "^10.0.0",
-    "@ckeditor/ckeditor5-build-inline": "^10.0.0",
+    "@ckeditor/ckeditor5-build-balloon": "^10.0.1",
+    "@ckeditor/ckeditor5-build-classic": "^10.0.1",
+    "@ckeditor/ckeditor5-build-decoupled-document": "^10.0.1",
+    "@ckeditor/ckeditor5-build-inline": "^10.0.1",
     "@ckeditor/ckeditor5-clipboard": "^10.0.0",
     "@ckeditor/ckeditor5-cloud-services": "^10.0.0",
     "@ckeditor/ckeditor5-core": "^10.0.0",
     "@ckeditor/ckeditor5-easy-image": "^10.0.0",
     "@ckeditor/ckeditor5-editor-balloon": "^10.0.0",
     "@ckeditor/ckeditor5-editor-classic": "^10.0.0",
-    "@ckeditor/ckeditor5-editor-decoupled": "^10.0.0",
+    "@ckeditor/ckeditor5-editor-decoupled": "^10.0.1",
     "@ckeditor/ckeditor5-editor-inline": "^10.0.0",
     "@ckeditor/ckeditor5-engine": "^10.0.0",
     "@ckeditor/ckeditor5-enter": "^10.0.0",
@@ -48,7 +48,7 @@
     "@ckeditor/ckeditor5-heading": "^10.0.0",
     "@ckeditor/ckeditor5-highlight": "^10.0.0",
     "@ckeditor/ckeditor5-image": "^10.0.0",
-    "@ckeditor/ckeditor5-link": "^10.0.0",
+    "@ckeditor/ckeditor5-link": "^10.0.1",
     "@ckeditor/ckeditor5-list": "^10.0.0",
     "@ckeditor/ckeditor5-markdown-gfm": "^10.0.0",
     "@ckeditor/ckeditor5-paragraph": "^10.0.0",
@@ -75,7 +75,7 @@
     "husky": "^0.14.3",
     "lerna": "^2.2.0",
     "lint-staged": "^7.0.0",
-    "mgit2": "^0.7.2",
+    "mgit2": "^0.8.0",
     "minimatch": "^3.0.4",
     "postcss-loader": "^2.0.10",
     "raw-loader": "^0.5.1",