Przeglądaj źródła

Merge branch 'master' into t/62

Aleksander Nowodzinski 8 lat temu
rodzic
commit
356540bb10

+ 9 - 0
packages/ckeditor5-core/.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,9 @@
+### Suggested merge commit message ([convention](https://github.com/ckeditor/ckeditor5-design/wiki/Git-commit-message-convention))
+
+Type: Message. Closes #000.
+
+---
+
+### Additional information
+
+*For example – encountered issues, assumptions you had to make, other affected tickets, etc.*

+ 2 - 5
packages/ckeditor5-core/.gitignore

@@ -1,10 +1,7 @@
 # These files will be ignored by Git and by our linting tools:
-#	grunt jshint
-#	grunt jscs
+#	gulp lint
+#	gulp lint-staged
 #
 # Be sure to append /** to folders to have everything inside them ignored.
 
-# All "dot directories".
-.*/**
-
 node_modules/**

+ 1 - 2
packages/ckeditor5-core/.travis.yml

@@ -15,8 +15,7 @@ before_install:
   - export DISPLAY=:99.0
   - sh -e /etc/init.d/xvfb start
 install:
-  - npm install gulp mgit2 lerna codeclimate-test-reporter
-  - npm install @ckeditor/ckeditor5-dev-tests @ckeditor/ckeditor5-dev-lint
+  - npm install @ckeditor/ckeditor5-dev-tests
   - ckeditor5-dev-tests-install-dependencies
 script:
   - ckeditor5-dev-tests-travis

+ 0 - 25
packages/ckeditor5-core/CHANGES.md

@@ -1,25 +0,0 @@
-CKEditor 5 Core Editor Architecture Changelog
-========================================
-
-## CKEditor 5 Core Editor Architecture 0.0.2
-
-**Major|Minor|Patch Release** - Build Date: yyyy-mm-dd
-
-New Features:
-
-* [#Issue Number](http://issue/url): Item 1.
-* Item 2
-
-Fixed Issues:
-
-* [#Issue Number](http://issue/url): Item 1.
-* Item 2
-
-Other Changes:
-
-* Item 1
-* Item 2
-
-## CKEditor 5 Core Editor Architecture 0.0.1
-
-...

+ 2 - 1
packages/ckeditor5-core/lang/contexts.json

@@ -1,3 +1,4 @@
 {
-
+	"Save": "Label for the Save button.",
+	"Cancel": "Label for the Cancel button."
 }

+ 1 - 1
packages/ckeditor5-core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ckeditor/ckeditor5-core",
-  "version": "0.5.0",
+  "version": "0.6.0",
   "description": "",
   "keywords": [],
   "dependencies": {

+ 1 - 1
packages/ckeditor5-core/src/editor/editor.js

@@ -35,7 +35,7 @@ export default class Editor {
 		 * Holds all configurations specific to this editor instance.
 		 *
 		 * @readonly
-		 * @member {utils.Config}
+		 * @member {module:utils/config~Config}
 		 */
 		this.config = new Config( config );