Skip to content

Commit 684435f

Browse files
committed
MIT → GPL-3.0
1 parent 37687dc commit 684435f

36 files changed

+817
-29
lines changed

CHANGELOG.md

+1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
## Unreleased
44

5+
- CKEditor is now released under the GPL-3.0 license.
56
- HTML Purifier is now configured to allow `style` attributes on `<ol>` and `<ul>` tags, when bulleted/numbered lists are allowed. ([#136](https://github.com/craftcms/ckeditor/issues/136))
67

78
## 3.5.1 - 2023-08-29

LICENSE.md

-21
This file was deleted.

LICENSE.txt

+674
Large diffs are not rendered by default.

composer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"ckeditor",
1010
"yii2"
1111
],
12-
"license": "MIT",
12+
"license": "GPL-3.0-or-later",
1313
"authors": [
1414
{
1515
"name": "Pixel & Tonic",

src/CkeConfig.php

+5
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
11
<?php
2+
/**
3+
* @link https://craftcms.com/
4+
* @copyright Copyright (c) Pixel & Tonic, Inc.
5+
* @license GPL-3.0-or-later
6+
*/
27

38
namespace craft\ckeditor;
49

src/CkeConfigs.php

+5
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
11
<?php
2+
/**
3+
* @link https://craftcms.com/
4+
* @copyright Copyright (c) Pixel & Tonic, Inc.
5+
* @license GPL-3.0-or-later
6+
*/
27

38
namespace craft\ckeditor;
49

src/Field.php

+5
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
11
<?php
2+
/**
3+
* @link https://craftcms.com/
4+
* @copyright Copyright (c) Pixel & Tonic, Inc.
5+
* @license GPL-3.0-or-later
6+
*/
27

38
namespace craft\ckeditor;
49

src/Plugin.php

+5
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
11
<?php
2+
/**
3+
* @link https://craftcms.com/
4+
* @copyright Copyright (c) Pixel & Tonic, Inc.
5+
* @license GPL-3.0-or-later
6+
*/
27

38
namespace craft\ckeditor;
49

src/console/controllers/ConvertController.php

+5
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
11
<?php
2+
/**
3+
* @link https://craftcms.com/
4+
* @copyright Copyright (c) Pixel & Tonic, Inc.
5+
* @license GPL-3.0-or-later
6+
*/
27

38
namespace craft\ckeditor\console\controllers;
49

src/controllers/CkeConfigsController.php

+5
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
11
<?php
2+
/**
3+
* @link https://craftcms.com/
4+
* @copyright Copyright (c) Pixel & Tonic, Inc.
5+
* @license GPL-3.0-or-later
6+
*/
27

38
namespace craft\ckeditor\controllers;
49

src/controllers/CkeditorController.php

+5
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
11
<?php
2+
/**
3+
* @link https://craftcms.com/
4+
* @copyright Copyright (c) Pixel & Tonic, Inc.
5+
* @license GPL-3.0-or-later
6+
*/
27

38
namespace craft\ckeditor\controllers;
49

src/events/DefineLinkOptionsEvent.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
/**
33
* @link https://craftcms.com/
44
* @copyright Copyright (c) Pixel & Tonic, Inc.
5-
* @license MIT
5+
* @license GPL-3.0-or-later
66
*/
77

88
namespace craft\ckeditor\events;

src/events/ModifyConfigEvent.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
/**
33
* @link https://craftcms.com/
44
* @copyright Copyright (c) Pixel & Tonic, Inc.
5-
* @license MIT
5+
* @license GPL-3.0-or-later
66
*/
77

88
namespace craft\ckeditor\events;

src/helpers/CkeditorConfigSchema.php

+5
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
11
<?php
2+
/**
3+
* @link https://craftcms.com/
4+
* @copyright Copyright (c) Pixel & Tonic, Inc.
5+
* @license GPL-3.0-or-later
6+
*/
27

38
namespace craft\ckeditor\helpers;
49

src/migrations/Install.php

+5
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
11
<?php
2+
/**
3+
* @link https://craftcms.com/
4+
* @copyright Copyright (c) Pixel & Tonic, Inc.
5+
* @license GPL-3.0-or-later
6+
*/
27

38
namespace craft\ckeditor\migrations;
49

src/migrations/m230408_163704_v3_upgrade.php

+5
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
11
<?php
2+
/**
3+
* @link https://craftcms.com/
4+
* @copyright Copyright (c) Pixel & Tonic, Inc.
5+
* @license GPL-3.0-or-later
6+
*/
27

38
namespace craft\ckeditor\migrations;
49

src/web/assets/BaseCkeditorPackageAsset.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
/**
33
* @link https://craftcms.com/
44
* @copyright Copyright (c) Pixel & Tonic, Inc.
5-
* @license MIT
5+
* @license GPL-3.0-or-later
66
*/
77

88
namespace craft\ckeditor\web\assets;

src/web/assets/ckeconfig/CkeConfigAsset.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
/**
33
* @link https://craftcms.com/
44
* @copyright Copyright (c) Pixel & Tonic, Inc.
5-
* @license MIT
5+
* @license GPL-3.0-or-later
66
*/
77

88
namespace craft\ckeditor\web\assets\ckeconfig;

src/web/assets/ckeconfig/dist/ckeconfig.js

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
/**
2+
* @link https://craftcms.com/
3+
* @copyright Copyright (c) Pixel & Tonic, Inc.
4+
* @license GPL-3.0-or-later
5+
*/

src/web/assets/ckeconfig/dist/ckeconfig.js.map

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/web/assets/ckeconfig/src/ConfigOptions.js

+6
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
/**
2+
* @link https://craftcms.com/
3+
* @copyright Copyright (c) Pixel & Tonic, Inc.
4+
* @license GPL-3.0-or-later
5+
*/
6+
17
/** global: CKEditor5, Garnish */
28
import './ckeconfig.css';
39
import $ from 'jquery';

src/web/assets/ckeconfig/src/ToolbarBuilder.js

+6
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
/**
2+
* @link https://craftcms.com/
3+
* @copyright Copyright (c) Pixel & Tonic, Inc.
4+
* @license GPL-3.0-or-later
5+
*/
6+
17
/** global: CKEditor5, Garnish */
28
import './ckeconfig.css';
39
import $ from 'jquery';

src/web/assets/ckeconfig/src/ckeconfig.js

+6
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
/**
2+
* @link https://craftcms.com/
3+
* @copyright Copyright (c) Pixel & Tonic, Inc.
4+
* @license GPL-3.0-or-later
5+
*/
6+
17
import ToolbarBuilder from './ToolbarBuilder';
28
import ConfigOptions from './ConfigOptions';
39

src/web/assets/ckeconfig/webpack.config.js

+6
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
/**
2+
* @link https://craftcms.com/
3+
* @copyright Copyright (c) Pixel & Tonic, Inc.
4+
* @license GPL-3.0-or-later
5+
*/
6+
17
/* jshint esversion: 6 */
28
/* globals module, require */
39
const {getConfig} = require('@craftcms/webpack');

src/web/assets/ckeditor/CkeditorAsset.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
/**
33
* @link https://craftcms.com/
44
* @copyright Copyright (c) Pixel & Tonic, Inc.
5-
* @license MIT
5+
* @license GPL-3.0-or-later
66
*/
77

88
namespace craft\ckeditor\web\assets\ckeditor;

src/web/assets/ckeditor/dist/ckeditor5-craftcms.js.LICENSE.txt

+6
Original file line numberDiff line numberDiff line change
@@ -14,3 +14,9 @@
1414
* @license Copyright (c) 2003-2023, CKSource Holding sp. z o.o. All rights reserved.
1515
* For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
1616
*/
17+
18+
/**
19+
* @link https://craftcms.com/
20+
* @copyright Copyright (c) Pixel & Tonic, Inc.
21+
* @license GPL-3.0-or-later
22+
*/

src/web/assets/ckeditor/dist/ckeditor5-craftcms.js.map

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/web/assets/ckeditor/src/ckeditor5-craftcms.js

+6
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
/**
2+
* @link https://craftcms.com/
3+
* @copyright Copyright (c) Pixel & Tonic, Inc.
4+
* @license GPL-3.0-or-later
5+
*/
6+
17
import './ckeditor5-craftcms.css';
28
import {Alignment} from '@ckeditor/ckeditor5-alignment';
39
import {

src/web/assets/ckeditor/src/image/imageinsert/imageinsertui.js

+6
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
/**
2+
* @link https://craftcms.com/
3+
* @copyright Copyright (c) Pixel & Tonic, Inc.
4+
* @license GPL-3.0-or-later
5+
*/
6+
17
import {icons} from 'ckeditor5/src/core';
28
import {ButtonView} from 'ckeditor5/src/ui';
39
import {ImageInsertUI} from '@ckeditor/ckeditor5-image';

src/web/assets/ckeditor/src/image/imagetransform.js

+6
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
/**
2+
* @link https://craftcms.com/
3+
* @copyright Copyright (c) Pixel & Tonic, Inc.
4+
* @license GPL-3.0-or-later
5+
*/
6+
17
import {Plugin} from 'ckeditor5/src/core';
28
import ImageTransformEditing from './imagetransform/imagetransformediting';
39
import ImageTransformUI from './imagetransform/imagetransformui';

src/web/assets/ckeditor/src/image/imagetransform/imagetransformediting.js

+6
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
/**
2+
* @link https://craftcms.com/
3+
* @copyright Copyright (c) Pixel & Tonic, Inc.
4+
* @license GPL-3.0-or-later
5+
*/
6+
17
import {Plugin} from 'ckeditor5/src/core';
28
import ImageUtils from '@ckeditor/ckeditor5-image/src/imageutils';
39
import TransformImageCommand from './transformimagecommand';

src/web/assets/ckeditor/src/image/imagetransform/imagetransformui.js

+6
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
/**
2+
* @link https://craftcms.com/
3+
* @copyright Copyright (c) Pixel & Tonic, Inc.
4+
* @license GPL-3.0-or-later
5+
*/
6+
17
import {Plugin, icons} from 'ckeditor5/src/core';
28
import {
39
DropdownButtonView,

src/web/assets/ckeditor/src/image/imagetransform/transformimagecommand.js

+6
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
/**
2+
* @link https://craftcms.com/
3+
* @copyright Copyright (c) Pixel & Tonic, Inc.
4+
* @license GPL-3.0-or-later
5+
*/
6+
17
import {Command} from 'ckeditor5/src/core';
28

39
/**

src/web/assets/ckeditor/src/link/linkui.js

+6
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
/**
2+
* @link https://craftcms.com/
3+
* @copyright Copyright (c) Pixel & Tonic, Inc.
4+
* @license GPL-3.0-or-later
5+
*/
6+
17
import {Plugin} from 'ckeditor5/src/core';
28
import {Collection} from 'ckeditor5/src/utils';
39
import {

src/web/assets/ckeditor/webpack.config.js

+6
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
/**
2+
* @link https://craftcms.com/
3+
* @copyright Copyright (c) Pixel & Tonic, Inc.
4+
* @license GPL-3.0-or-later
5+
*/
6+
17
'use strict';
28

39
/* eslint-env node */

0 commit comments

Comments
 (0)