Skip to content
This repository has been archived by the owner on Jun 26, 2020. It is now read-only.

Commit

Permalink
Merge branch 'master' into t/ckeditor5-table/126
Browse files Browse the repository at this point in the history
# Conflicts:
#	package.json
  • Loading branch information
jodator committed Dec 20, 2018
2 parents 6f37ed0 + 1571328 commit 64abfeb
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 16 deletions.
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
Changelog
=========

## [10.1.1](https://github.com/ckeditor/ckeditor5-block-quote/compare/v10.1.0...v10.1.1) (2018-12-05)

Internal changes only (updated dependencies, documentation, etc.).


## [10.1.0](https://github.com/ckeditor/ckeditor5-block-quote/compare/v10.0.2...v10.1.0) (2018-10-08)

### Features
Expand Down
30 changes: 15 additions & 15 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@ckeditor/ckeditor5-block-quote",
"version": "10.1.0",
"version": "10.1.1",
"description": "Block quote feature for CKEditor 5.",
"keywords": [
"ckeditor",
Expand All @@ -10,24 +10,24 @@
"ckeditor5-plugin"
],
"dependencies": {
"@ckeditor/ckeditor5-core": "^11.0.1",
"@ckeditor/ckeditor5-ui": "^11.1.0",
"@ckeditor/ckeditor5-utils": "^11.0.0"
"@ckeditor/ckeditor5-core": "^11.1.0",
"@ckeditor/ckeditor5-ui": "^11.2.0",
"@ckeditor/ckeditor5-utils": "^11.1.0"
},
"devDependencies": {
"@ckeditor/ckeditor5-basic-styles": "^10.0.3",
"@ckeditor/ckeditor5-editor-classic": "^11.0.1",
"@ckeditor/ckeditor5-engine": "^11.0.0",
"@ckeditor/ckeditor5-enter": "^10.1.2",
"@ckeditor/ckeditor5-essentials": "^10.1.2",
"@ckeditor/ckeditor5-heading": "^10.1.0",
"@ckeditor/ckeditor5-image": "^11.0.0",
"@ckeditor/ckeditor5-list": "^11.0.2",
"@ckeditor/ckeditor5-paragraph": "^10.0.3",
"@ckeditor/ckeditor5-basic-styles": "^10.1.0",
"@ckeditor/ckeditor5-editor-classic": "^11.0.2",
"@ckeditor/ckeditor5-engine": "^12.0.0",
"@ckeditor/ckeditor5-enter": "^10.1.3",
"@ckeditor/ckeditor5-essentials": "^10.1.3",
"@ckeditor/ckeditor5-heading": "^10.1.1",
"@ckeditor/ckeditor5-image": "^12.0.0",
"@ckeditor/ckeditor5-list": "^11.0.3",
"@ckeditor/ckeditor5-paragraph": "^10.0.4",
"@ckeditor/ckeditor5-table": "^11.0.0",
"@ckeditor/ckeditor5-typing": "^11.0.1",
"@ckeditor/ckeditor5-typing": "^11.0.2",
"eslint": "^5.5.0",
"eslint-config-ckeditor5": "^1.0.7",
"eslint-config-ckeditor5": "^1.0.9",
"husky": "^0.14.3",
"lint-staged": "^7.0.0"
},
Expand Down
3 changes: 2 additions & 1 deletion tests/blockquotecommand.js
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,8 @@ describe( 'BlockQuoteCommand', () => {

model.schema.extend( 'widget', {
allowIn: '$root',
isLimit: true
isLimit: true,
isObject: true
} );
model.schema.extend( '$text', { allowIn: 'widget' } );

Expand Down

0 comments on commit 64abfeb

Please sign in to comment.