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-engine/1198
Browse files Browse the repository at this point in the history
  • Loading branch information
Reinmar committed Jan 16, 2018
2 parents 8270183 + 4622ad1 commit 622b004
Show file tree
Hide file tree
Showing 44 changed files with 45 additions and 45 deletions.
2 changes: 1 addition & 1 deletion .eslintrc.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* @license Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
* @license Copyright (c) 2003-2018, CKSource - Frederico Knabben. All rights reserved.
* For licensing, see LICENSE.md.
*/

Expand Down
2 changes: 1 addition & 1 deletion LICENSE.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Software License Agreement
==========================

**CKEditor 5 Headings Feature**https://github.com/ckeditor/ckeditor5-heading <br>
Copyright (c) 2003-2017, [CKSource](http://cksource.com) Frederico Knabben. All rights reserved.
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:

Expand Down
2 changes: 1 addition & 1 deletion docs/_snippets/features/custom-heading-levels.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* @license Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
* @license Copyright (c) 2003-2018, CKSource - Frederico Knabben. All rights reserved.
* For licensing, see LICENSE.md.
*/

Expand Down
2 changes: 1 addition & 1 deletion lang/translations/bg.po
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
# Copyright (c) 2003-2018, CKSource - Frederico Knabben. All rights reserved.
msgid ""
msgstr ""
"Language: bg\n"
Expand Down
2 changes: 1 addition & 1 deletion lang/translations/da.po
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
# Copyright (c) 2003-2018, CKSource - Frederico Knabben. All rights reserved.
msgid ""
msgstr ""
"Language: da\n"
Expand Down
2 changes: 1 addition & 1 deletion lang/translations/de.po
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
# Copyright (c) 2003-2018, CKSource - Frederico Knabben. All rights reserved.
msgid ""
msgstr ""
"Language: de\n"
Expand Down
2 changes: 1 addition & 1 deletion lang/translations/el.po
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
# Copyright (c) 2003-2018, CKSource - Frederico Knabben. All rights reserved.
msgid ""
msgstr ""
"Language: el\n"
Expand Down
2 changes: 1 addition & 1 deletion lang/translations/en-au.po
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
# Copyright (c) 2003-2018, CKSource - Frederico Knabben. All rights reserved.
msgid ""
msgstr ""
"Language: en_AU\n"
Expand Down
2 changes: 1 addition & 1 deletion lang/translations/en.po
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
# Copyright (c) 2003-2018, CKSource - Frederico Knabben. All rights reserved.
msgid ""
msgstr ""
"Language: \n"
Expand Down
2 changes: 1 addition & 1 deletion lang/translations/eo.po
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
# Copyright (c) 2003-2018, CKSource - Frederico Knabben. All rights reserved.
msgid ""
msgstr ""
"Language: eo\n"
Expand Down
2 changes: 1 addition & 1 deletion lang/translations/es.po
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
# Copyright (c) 2003-2018, CKSource - Frederico Knabben. All rights reserved.
msgid ""
msgstr ""
"Language: es\n"
Expand Down
2 changes: 1 addition & 1 deletion lang/translations/fi.po
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
# Copyright (c) 2003-2018, CKSource - Frederico Knabben. All rights reserved.
msgid ""
msgstr ""
"Language: fi\n"
Expand Down
2 changes: 1 addition & 1 deletion lang/translations/fr.po
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
# Copyright (c) 2003-2018, CKSource - Frederico Knabben. All rights reserved.
msgid ""
msgstr ""
"Language: fr\n"
Expand Down
2 changes: 1 addition & 1 deletion lang/translations/gl.po
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
# Copyright (c) 2003-2018, CKSource - Frederico Knabben. All rights reserved.
msgid ""
msgstr ""
"Language: gl\n"
Expand Down
2 changes: 1 addition & 1 deletion lang/translations/hr.po
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
# Copyright (c) 2003-2018, CKSource - Frederico Knabben. All rights reserved.
msgid ""
msgstr ""
"Language: hr\n"
Expand Down
2 changes: 1 addition & 1 deletion lang/translations/hu.po
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
# Copyright (c) 2003-2018, CKSource - Frederico Knabben. All rights reserved.
msgid ""
msgstr ""
"Language: hu\n"
Expand Down
2 changes: 1 addition & 1 deletion lang/translations/it.po
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
# Copyright (c) 2003-2018, CKSource - Frederico Knabben. All rights reserved.
msgid ""
msgstr ""
"Language: it\n"
Expand Down
2 changes: 1 addition & 1 deletion lang/translations/ja.po
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
# Copyright (c) 2003-2018, CKSource - Frederico Knabben. All rights reserved.
msgid ""
msgstr ""
"Language: ja\n"
Expand Down
2 changes: 1 addition & 1 deletion lang/translations/km.po
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
# Copyright (c) 2003-2018, CKSource - Frederico Knabben. All rights reserved.
msgid ""
msgstr ""
"Language: km\n"
Expand Down
2 changes: 1 addition & 1 deletion lang/translations/kn.po
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
# Copyright (c) 2003-2018, CKSource - Frederico Knabben. All rights reserved.
msgid ""
msgstr ""
"Language: kn\n"
Expand Down
2 changes: 1 addition & 1 deletion lang/translations/ko.po
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
# Copyright (c) 2003-2018, CKSource - Frederico Knabben. All rights reserved.
msgid ""
msgstr ""
"Language: ko\n"
Expand Down
2 changes: 1 addition & 1 deletion lang/translations/ku.po
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
# Copyright (c) 2003-2018, CKSource - Frederico Knabben. All rights reserved.
msgid ""
msgstr ""
"Language: ku\n"
Expand Down
2 changes: 1 addition & 1 deletion lang/translations/nb.po
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
# Copyright (c) 2003-2018, CKSource - Frederico Knabben. All rights reserved.
msgid ""
msgstr ""
"Language: nb\n"
Expand Down
2 changes: 1 addition & 1 deletion lang/translations/pl.po
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
# Copyright (c) 2003-2018, CKSource - Frederico Knabben. All rights reserved.
msgid ""
msgstr ""
"Language: pl\n"
Expand Down
2 changes: 1 addition & 1 deletion lang/translations/pt-br.po
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
# Copyright (c) 2003-2018, CKSource - Frederico Knabben. All rights reserved.
msgid ""
msgstr ""
"Language: pt_BR\n"
Expand Down
2 changes: 1 addition & 1 deletion lang/translations/pt.po
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
# Copyright (c) 2003-2018, CKSource - Frederico Knabben. All rights reserved.
msgid ""
msgstr ""
"Language: pt\n"
Expand Down
2 changes: 1 addition & 1 deletion lang/translations/ro.po
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
# Copyright (c) 2003-2018, CKSource - Frederico Knabben. All rights reserved.
msgid ""
msgstr ""
"Language: ro\n"
Expand Down
2 changes: 1 addition & 1 deletion lang/translations/ru.po
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
# Copyright (c) 2003-2018, CKSource - Frederico Knabben. All rights reserved.
msgid ""
msgstr ""
"Language: ru\n"
Expand Down
2 changes: 1 addition & 1 deletion lang/translations/sk.po
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
# Copyright (c) 2003-2018, CKSource - Frederico Knabben. All rights reserved.
msgid ""
msgstr ""
"Language: sk\n"
Expand Down
2 changes: 1 addition & 1 deletion lang/translations/sv.po
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
# Copyright (c) 2003-2018, CKSource - Frederico Knabben. All rights reserved.
msgid ""
msgstr ""
"Language: sv\n"
Expand Down
2 changes: 1 addition & 1 deletion lang/translations/tr.po
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
# Copyright (c) 2003-2018, CKSource - Frederico Knabben. All rights reserved.
msgid ""
msgstr ""
"Language: tr\n"
Expand Down
2 changes: 1 addition & 1 deletion lang/translations/zh-cn.po
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
# Copyright (c) 2003-2018, CKSource - Frederico Knabben. All rights reserved.
msgid ""
msgstr ""
"Language: zh_CN\n"
Expand Down
2 changes: 1 addition & 1 deletion lang/translations/zh.po
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
# Copyright (c) 2003-2018, CKSource - Frederico Knabben. All rights reserved.
msgid ""
msgstr ""
"Language: zh_TW\n"
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@
"@ckeditor/ckeditor5-image": "^1.0.0-alpha.2",
"@ckeditor/ckeditor5-typing": "^1.0.0-alpha.2",
"@ckeditor/ckeditor5-undo": "^1.0.0-alpha.2",
"eslint": "^4.8.0",
"eslint": "^4.15.0",
"eslint-config-ckeditor5": "^1.0.7",
"husky": "^0.14.3",
"lint-staged": "^4.2.3"
"lint-staged": "^6.0.0"
},
"engines": {
"node": ">=6.0.0",
Expand Down
2 changes: 1 addition & 1 deletion src/heading.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* @license Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
* @license Copyright (c) 2003-2018, CKSource - Frederico Knabben. All rights reserved.
* For licensing, see LICENSE.md.
*/

Expand Down
2 changes: 1 addition & 1 deletion src/headingcommand.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* @license Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
* @license Copyright (c) 2003-2018, CKSource - Frederico Knabben. All rights reserved.
* For licensing, see LICENSE.md.
*/

Expand Down
2 changes: 1 addition & 1 deletion src/headingengine.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* @license Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
* @license Copyright (c) 2003-2018, CKSource - Frederico Knabben. All rights reserved.
* For licensing, see LICENSE.md.
*/

Expand Down
2 changes: 1 addition & 1 deletion tests/heading.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* @license Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
* @license Copyright (c) 2003-2018, CKSource - Frederico Knabben. All rights reserved.
* For licensing, see LICENSE.md.
*/

Expand Down
2 changes: 1 addition & 1 deletion tests/headingcommand.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* @license Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
* @license Copyright (c) 2003-2018, CKSource - Frederico Knabben. All rights reserved.
* For licensing, see LICENSE.md.
*/

Expand Down
2 changes: 1 addition & 1 deletion tests/headingengine.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* @license Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
* @license Copyright (c) 2003-2018, CKSource - Frederico Knabben. All rights reserved.
* For licensing, see LICENSE.md.
*/

Expand Down
2 changes: 1 addition & 1 deletion tests/integration.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* @license Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
* @license Copyright (c) 2003-2018, CKSource - Frederico Knabben. All rights reserved.
* For licensing, see LICENSE.md.
*/

Expand Down
2 changes: 1 addition & 1 deletion tests/manual/heading.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* @license Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
* @license Copyright (c) 2003-2018, CKSource - Frederico Knabben. All rights reserved.
* For licensing, see LICENSE.md.
*/

Expand Down
2 changes: 1 addition & 1 deletion tests/tickets/40.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* @license Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
* @license Copyright (c) 2003-2018, CKSource - Frederico Knabben. All rights reserved.
* For licensing, see LICENSE.md.
*/

Expand Down
2 changes: 1 addition & 1 deletion theme/heading.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
* Copyright (c) 2003-2018, CKSource - Frederico Knabben. All rights reserved.
* For licensing, see LICENSE.md.
*/

Expand Down

0 comments on commit 622b004

Please sign in to comment.