Skip to content

Commit

Permalink
Merge branch 'mermaid-widget'
Browse files Browse the repository at this point in the history
  • Loading branch information
mlewand committed Mar 8, 2022
2 parents 40b47c2 + 5fc4a04 commit 3a52e1f
Show file tree
Hide file tree
Showing 165 changed files with 222 additions and 196 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-2021, CKSource - Frederico Knabben. All rights reserved.
* @license Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
* For licensing, see LICENSE.md.
*/

Expand Down
4 changes: 2 additions & 2 deletions LICENSE.md
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
# Software License Agreement

**GitHub Writer**https://github.com/ckeditor/github-writer
Copyright (c) 2003-2021, [CKSource](http://cksource.com) Frederico Knabben. All rights reserved.
Copyright (c) 2003-2022, [CKSource](http://cksource.com) Holding sp. z o.o. All rights reserved.

Licensed under the terms of [GNU General Public License Version 2 or later](http://www.gnu.org/licenses/gpl.html).

## Trademarks

**CKEditor** is a trademark of [CKSource](http://cksource.com) Frederico Knabben. 
**CKEditor** is a trademark of [CKSource](http://cksource.com) Holding sp. z o.o.

**GitHub** is a trademark of [GitHub](https://github.com/), Inc.

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ The source code contains additional readme files with technical details about th

---

Copyright (c) 2003-2021, [CKSource](https://cksource.com/) Frederico Knabben. All rights reserved.
Copyright (c) 2003-2022, [CKSource](http://cksource.com) Holding sp. z o.o. All rights reserved.

GitHub is a trademark of [GitHub](https://github.com/), Inc.

2 changes: 1 addition & 1 deletion dev/static-module-loader.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* @license Copyright (c) 2003-2021, CKSource - Frederico Knabben. All rights reserved.
* @license Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
* For licensing, see LICENSE.md.
*/

Expand Down
2 changes: 1 addition & 1 deletion dev/updateemojis.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* @license Copyright (c) 2003-2021, CKSource - Frederico Knabben. All rights reserved.
* @license Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
* For licensing, see LICENSE.md.
*/

Expand Down
2 changes: 1 addition & 1 deletion dev/webpack.config.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* @license Copyright (c) 2003-2021, CKSource - Frederico Knabben. All rights reserved.
* @license Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
* For licensing, see LICENSE.md.
*/

Expand Down
55 changes: 28 additions & 27 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,38 +31,39 @@
},
"homepage": "https://github.com/ckeditor/github-writer",
"dependencies": {
"@ckeditor/ckeditor5-autoformat": "^31.0.0",
"@ckeditor/ckeditor5-basic-styles": "^31.0.0",
"@ckeditor/ckeditor5-block-quote": "^31.0.0",
"@ckeditor/ckeditor5-clipboard": "^31.0.0",
"@ckeditor/ckeditor5-code-block": "^31.0.0",
"@ckeditor/ckeditor5-core": "^31.0.0",
"@ckeditor/ckeditor5-editor-decoupled": "^31.0.0",
"@ckeditor/ckeditor5-engine": "^31.0.0",
"@ckeditor/ckeditor5-enter": "^31.0.0",
"@ckeditor/ckeditor5-essentials": "^31.0.0",
"@ckeditor/ckeditor5-heading": "^31.0.0",
"@ckeditor/ckeditor5-horizontal-line": "^31.0.0",
"@ckeditor/ckeditor5-image": "^31.0.0",
"@ckeditor/ckeditor5-autoformat": "^32.0.0",
"@ckeditor/ckeditor5-basic-styles": "^32.0.0",
"@ckeditor/ckeditor5-block-quote": "^32.0.0",
"@ckeditor/ckeditor5-clipboard": "^32.0.0",
"@ckeditor/ckeditor5-code-block": "^32.0.0",
"@ckeditor/ckeditor5-core": "^32.0.0",
"@ckeditor/ckeditor5-editor-decoupled": "^32.0.0",
"@ckeditor/ckeditor5-engine": "^32.0.0",
"@ckeditor/ckeditor5-enter": "^32.0.0",
"@ckeditor/ckeditor5-essentials": "^32.0.0",
"@ckeditor/ckeditor5-heading": "^32.0.0",
"@ckeditor/ckeditor5-horizontal-line": "^32.0.0",
"@ckeditor/ckeditor5-image": "^32.0.0",
"@ckeditor/ckeditor5-inspector": "^2.2.2",
"@ckeditor/ckeditor5-link": "^31.0.0",
"@ckeditor/ckeditor5-list": "^31.0.0",
"@ckeditor/ckeditor5-markdown-gfm": "^31.0.0",
"@ckeditor/ckeditor5-mention": "^31.0.0",
"@ckeditor/ckeditor5-paragraph": "^31.0.0",
"@ckeditor/ckeditor5-paste-from-office": "^31.0.0",
"@ckeditor/ckeditor5-remove-format": "^31.0.0",
"@ckeditor/ckeditor5-table": "^31.0.0",
"@ckeditor/ckeditor5-theme-lark": "^31.0.0",
"@ckeditor/ckeditor5-ui": "^31.0.0",
"@ckeditor/ckeditor5-upload": "^31.0.0",
"@ckeditor/ckeditor5-utils": "^31.0.0",
"@ckeditor/ckeditor5-widget": "^31.0.0",
"@ckeditor/ckeditor5-link": "^32.0.0",
"@ckeditor/ckeditor5-list": "^32.0.0",
"@ckeditor/ckeditor5-markdown-gfm": "^32.0.0",
"@ckeditor/ckeditor5-mention": "^32.0.0",
"@ckeditor/ckeditor5-mermaid": "ckeditor/ckeditor5-mermaid#master",
"@ckeditor/ckeditor5-paragraph": "^32.0.0",
"@ckeditor/ckeditor5-paste-from-office": "^32.0.0",
"@ckeditor/ckeditor5-remove-format": "^32.0.0",
"@ckeditor/ckeditor5-table": "^32.0.0",
"@ckeditor/ckeditor5-theme-lark": "^32.0.0",
"@ckeditor/ckeditor5-ui": "^32.0.0",
"@ckeditor/ckeditor5-upload": "^32.0.0",
"@ckeditor/ckeditor5-utils": "^32.0.0",
"@ckeditor/ckeditor5-widget": "^32.0.0",
"@mlewand/ckeditor5-keyboard-marker": "^1.0.3",
"linguist-languages": "^7.15.0"
},
"devDependencies": {
"@ckeditor/ckeditor5-dev-utils": "^25.4.0",
"@ckeditor/ckeditor5-dev-utils": "^28.0.1",
"chai": "^4.3.4",
"copy-webpack-plugin": "^6.4.1",
"eslint": "^7.28.0",
Expand Down
2 changes: 1 addition & 1 deletion src/app/app.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* @license Copyright (c) 2003-2021, CKSource - Frederico Knabben. All rights reserved.
* @license Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
* For licensing, see LICENSE.md.
*/

Expand Down
2 changes: 1 addition & 1 deletion src/app/data/emojis.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* @license Copyright (c) 2003-2021, CKSource - Frederico Knabben. All rights reserved.
* @license Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
* For licensing, see LICENSE.md.
*/

Expand Down
2 changes: 1 addition & 1 deletion src/app/data/languages.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* @license Copyright (c) 2003-2021, CKSource - Frederico Knabben. All rights reserved.
* @license Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
* For licensing, see LICENSE.md.
*/

Expand Down
5 changes: 3 additions & 2 deletions src/app/editor/ckeditorconfig.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* @license Copyright (c) 2003-2021, CKSource - Frederico Knabben. All rights reserved.
* @license Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
* For licensing, see LICENSE.md.
*/

Expand All @@ -26,7 +26,8 @@ const CKEditorConfig = {
'bulletedlist', 'numberedlist', 'todolist', '|',
'savedreplies', 'kebab'
],
kebabToolbar: [ 'strikethrough', 'kbd', 'removeFormat', '|', 'imageupload', 'horizontalline', 'insertTable', '|', 'mode' ],
kebabToolbar: [ 'strikethrough', 'kbd', 'removeFormat', '|',
'imageupload', 'horizontalline', 'insertTable', 'mermaid', '|', 'mode' ],
table: {
contentToolbar: [ 'tableColumn', 'tableRow' ]
},
Expand Down
2 changes: 1 addition & 1 deletion src/app/editor/ckeditorconfigmentions.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* @license Copyright (c) 2003-2021, CKSource - Frederico Knabben. All rights reserved.
* @license Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
* For licensing, see LICENSE.md.
*/

Expand Down
7 changes: 5 additions & 2 deletions src/app/editor/ckeditorgithubeditor.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* @license Copyright (c) 2003-2021, CKSource - Frederico Knabben. All rights reserved.
* @license Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
* For licensing, see LICENSE.md.
*/

Expand Down Expand Up @@ -58,6 +58,8 @@ import CodeBlockLanguageSelector from '../plugins/codeblocklanguageselector';
import SavedReplies from '../plugins/savedreplies';
import LiveModelData from '../plugins/livemodeldata';

import Mermaid from '@ckeditor/ckeditor5-mermaid/src/mermaid';

// Inject our very own CKEditor theme overrides.
import '../theme/githubwriter.css';

Expand Down Expand Up @@ -113,5 +115,6 @@ CKEditorGitHubEditor.builtinPlugins = [
AutoLinkUrl, AutoLinkGitHub,
QuoteSelection, SavedReplies, Messenger, EditorExtras, ControlClick, SmartCaret,
CodeBlockLanguageSelector,
LiveModelData
LiveModelData,
Mermaid
];
2 changes: 1 addition & 1 deletion src/app/editor/createeditormixin.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* @license Copyright (c) 2003-2021, CKSource - Frederico Knabben. All rights reserved.
* @license Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
* For licensing, see LICENSE.md.
*/

Expand Down
2 changes: 1 addition & 1 deletion src/app/editor/datamixin.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* @license Copyright (c) 2003-2021, CKSource - Frederico Knabben. All rights reserved.
* @license Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
* For licensing, see LICENSE.md.
*/

Expand Down
2 changes: 1 addition & 1 deletion src/app/editor/editor.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* @license Copyright (c) 2003-2021, CKSource - Frederico Knabben. All rights reserved.
* @license Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
* For licensing, see LICENSE.md.
*/

Expand Down
2 changes: 1 addition & 1 deletion src/app/editor/modemixin.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* @license Copyright (c) 2003-2021, CKSource - Frederico Knabben. All rights reserved.
* @license Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
* For licensing, see LICENSE.md.
*/

Expand Down
2 changes: 1 addition & 1 deletion src/app/editor/modes.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* @license Copyright (c) 2003-2021, CKSource - Frederico Knabben. All rights reserved.
* @license Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
* For licensing, see LICENSE.md.
*/

Expand Down
2 changes: 1 addition & 1 deletion src/app/editor/setupmixin.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* @license Copyright (c) 2003-2021, CKSource - Frederico Knabben. All rights reserved.
* @license Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
* For licensing, see LICENSE.md.
*/

Expand Down
2 changes: 1 addition & 1 deletion src/app/editor/submitstatusmixin.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* @license Copyright (c) 2003-2021, CKSource - Frederico Knabben. All rights reserved.
* @license Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
* For licensing, see LICENSE.md.
*/

Expand Down
2 changes: 1 addition & 1 deletion src/app/editor/utils.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* @license Copyright (c) 2003-2021, CKSource - Frederico Knabben. All rights reserved.
* @license Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
* For licensing, see LICENSE.md.
*/

Expand Down
2 changes: 1 addition & 1 deletion src/app/features/codeditor.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* @license Copyright (c) 2003-2021, CKSource - Frederico Knabben. All rights reserved.
* @license Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
* For licensing, see LICENSE.md.
*/

Expand Down
2 changes: 1 addition & 1 deletion src/app/features/codelinecommenteditor.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* @license Copyright (c) 2003-2021, CKSource - Frederico Knabben. All rights reserved.
* @license Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
* For licensing, see LICENSE.md.
*/

Expand Down
2 changes: 1 addition & 1 deletion src/app/features/commenteditor.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* @license Copyright (c) 2003-2021, CKSource - Frederico Knabben. All rights reserved.
* @license Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
* For licensing, see LICENSE.md.
*/

Expand Down
2 changes: 1 addition & 1 deletion src/app/features/milestoneeditor.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* @license Copyright (c) 2003-2021, CKSource - Frederico Knabben. All rights reserved.
* @license Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
* For licensing, see LICENSE.md.
*/

Expand Down
2 changes: 1 addition & 1 deletion src/app/features/newcodeditor.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* @license Copyright (c) 2003-2021, CKSource - Frederico Knabben. All rights reserved.
* @license Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
* For licensing, see LICENSE.md.
*/

Expand Down
2 changes: 1 addition & 1 deletion src/app/features/newcommenteditor.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* @license Copyright (c) 2003-2021, CKSource - Frederico Knabben. All rights reserved.
* @license Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
* For licensing, see LICENSE.md.
*/

Expand Down
2 changes: 1 addition & 1 deletion src/app/features/newinlinecommenteditor.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* @license Copyright (c) 2003-2021, CKSource - Frederico Knabben. All rights reserved.
* @license Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
* For licensing, see LICENSE.md.
*/

Expand Down
2 changes: 1 addition & 1 deletion src/app/features/newissueeditor.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* @license Copyright (c) 2003-2021, CKSource - Frederico Knabben. All rights reserved.
* @license Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
* For licensing, see LICENSE.md.
*/

Expand Down
2 changes: 1 addition & 1 deletion src/app/features/newpullrequesteditor.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* @license Copyright (c) 2003-2021, CKSource - Frederico Knabben. All rights reserved.
* @license Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
* For licensing, see LICENSE.md.
*/

Expand Down
2 changes: 1 addition & 1 deletion src/app/features/releaseeditor.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* @license Copyright (c) 2003-2021, CKSource - Frederico Knabben. All rights reserved.
* @license Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
* For licensing, see LICENSE.md.
*/

Expand Down
2 changes: 1 addition & 1 deletion src/app/features/revieweditor.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* @license Copyright (c) 2003-2021, CKSource - Frederico Knabben. All rights reserved.
* @license Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
* For licensing, see LICENSE.md.
*/

Expand Down
2 changes: 1 addition & 1 deletion src/app/features/savedreplyeditor.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* @license Copyright (c) 2003-2021, CKSource - Frederico Knabben. All rights reserved.
* @license Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
* For licensing, see LICENSE.md.
*/

Expand Down
2 changes: 1 addition & 1 deletion src/app/features/wikieditor.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* @license Copyright (c) 2003-2021, CKSource - Frederico Knabben. All rights reserved.
* @license Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
* For licensing, see LICENSE.md.
*/

Expand Down
2 changes: 1 addition & 1 deletion src/app/modules/filteredlistview.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* @license Copyright (c) 2003-2021, CKSource - Frederico Knabben. All rights reserved.
* @license Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
* For licensing, see LICENSE.md.
*/

Expand Down
2 changes: 1 addition & 1 deletion src/app/modules/listfilter.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* @license Copyright (c) 2003-2021, CKSource - Frederico Knabben. All rights reserved.
* @license Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
* For licensing, see LICENSE.md.
*/

Expand Down
2 changes: 1 addition & 1 deletion src/app/modules/textexpander.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* @license Copyright (c) 2003-2021, CKSource - Frederico Knabben. All rights reserved.
* @license Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
* For licensing, see LICENSE.md.
*/

Expand Down
2 changes: 1 addition & 1 deletion src/app/modules/textfinder.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* @license Copyright (c) 2003-2021, CKSource - Frederico Knabben. All rights reserved.
* @license Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
* For licensing, see LICENSE.md.
*/

Expand Down
2 changes: 1 addition & 1 deletion src/app/modules/textwalker.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* @license Copyright (c) 2003-2021, CKSource - Frederico Knabben. All rights reserved.
* @license Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
* For licensing, see LICENSE.md.
*/

Expand Down
2 changes: 1 addition & 1 deletion src/app/modules/util.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* @license Copyright (c) 2003-2021, CKSource - Frederico Knabben. All rights reserved.
* @license Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
* For licensing, see LICENSE.md.
*/

Expand Down
2 changes: 1 addition & 1 deletion src/app/page.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* @license Copyright (c) 2003-2021, CKSource - Frederico Knabben. All rights reserved.
* @license Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
* For licensing, see LICENSE.md.
*/

Expand Down
Loading

0 comments on commit 3a52e1f

Please sign in to comment.