Ver código fonte

Merge branch 'master' into t/460

Piotrek Koszuliński 8 anos atrás
pai
commit
b54a1d2522
3 arquivos alterados com 4 adições e 1 exclusões
  1. 2 1
      .travis.yml
  2. 1 0
      mgit.json
  3. 1 0
      package.json

+ 2 - 1
.travis.yml

@@ -20,7 +20,8 @@ install:
   - lerna bootstrap
 script:
   - npm t
-  - gulp docs:api --validate-only
+  # Temporarily disable API docs validation until https://github.com/ckeditor/ckeditor5-dev/issues/229 is resolved.
+  # - gulp docs:api --validate-only
 after_success:
   - ./node_modules/.bin/ckeditor5-dev-docs
 notifications:

+ 1 - 0
mgit.json

@@ -8,6 +8,7 @@
     "@ckeditor/ckeditor5-build-classic": "ckeditor/ckeditor5-build-classic",
     "@ckeditor/ckeditor5-clipboard": "ckeditor/ckeditor5-clipboard",
     "@ckeditor/ckeditor5-core": "ckeditor/ckeditor5-core",
+    "@ckeditor/ckeditor5-editor-balloon-toolbar": "ckeditor/ckeditor5-editor-balloon-toolbar",
     "@ckeditor/ckeditor5-editor-classic": "ckeditor/ckeditor5-editor-classic",
     "@ckeditor/ckeditor5-editor-inline": "ckeditor/ckeditor5-editor-inline",
     "@ckeditor/ckeditor5-engine": "ckeditor/ckeditor5-engine",

+ 1 - 0
package.json

@@ -17,6 +17,7 @@
     "@ckeditor/ckeditor5-core": "^0.8.1",
     "@ckeditor/ckeditor5-editor-classic": "^0.7.3",
     "@ckeditor/ckeditor5-editor-inline": "^0.1.1",
+    "@ckeditor/ckeditor5-editor-balloon-toolbar": "^0.0.1",
     "@ckeditor/ckeditor5-engine": "^0.10.0",
     "@ckeditor/ckeditor5-enter": "^0.9.1",
     "@ckeditor/ckeditor5-heading": "^0.9.1",