Skip to content

Commit

Permalink
MIT → GPL-3.0
Browse files Browse the repository at this point in the history
  • Loading branch information
brandonkelly committed Sep 13, 2023
1 parent 37687dc commit 684435f
Show file tree
Hide file tree
Showing 36 changed files with 817 additions and 29 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

## Unreleased

- CKEditor is now released under the GPL-3.0 license.
- 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))

## 3.5.1 - 2023-08-29
Expand Down
21 changes: 0 additions & 21 deletions LICENSE.md

This file was deleted.

674 changes: 674 additions & 0 deletions LICENSE.txt

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"ckeditor",
"yii2"
],
"license": "MIT",
"license": "GPL-3.0-or-later",
"authors": [
{
"name": "Pixel & Tonic",
Expand Down
5 changes: 5 additions & 0 deletions src/CkeConfig.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
<?php
/**
* @link https://craftcms.com/
* @copyright Copyright (c) Pixel & Tonic, Inc.
* @license GPL-3.0-or-later
*/

namespace craft\ckeditor;

Expand Down
5 changes: 5 additions & 0 deletions src/CkeConfigs.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
<?php
/**
* @link https://craftcms.com/
* @copyright Copyright (c) Pixel & Tonic, Inc.
* @license GPL-3.0-or-later
*/

namespace craft\ckeditor;

Expand Down
5 changes: 5 additions & 0 deletions src/Field.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
<?php
/**
* @link https://craftcms.com/
* @copyright Copyright (c) Pixel & Tonic, Inc.
* @license GPL-3.0-or-later
*/

namespace craft\ckeditor;

Expand Down
5 changes: 5 additions & 0 deletions src/Plugin.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
<?php
/**
* @link https://craftcms.com/
* @copyright Copyright (c) Pixel & Tonic, Inc.
* @license GPL-3.0-or-later
*/

namespace craft\ckeditor;

Expand Down
5 changes: 5 additions & 0 deletions src/console/controllers/ConvertController.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
<?php
/**
* @link https://craftcms.com/
* @copyright Copyright (c) Pixel & Tonic, Inc.
* @license GPL-3.0-or-later
*/

namespace craft\ckeditor\console\controllers;

Expand Down
5 changes: 5 additions & 0 deletions src/controllers/CkeConfigsController.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
<?php
/**
* @link https://craftcms.com/
* @copyright Copyright (c) Pixel & Tonic, Inc.
* @license GPL-3.0-or-later
*/

namespace craft\ckeditor\controllers;

Expand Down
5 changes: 5 additions & 0 deletions src/controllers/CkeditorController.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
<?php
/**
* @link https://craftcms.com/
* @copyright Copyright (c) Pixel & Tonic, Inc.
* @license GPL-3.0-or-later
*/

namespace craft\ckeditor\controllers;

Expand Down
2 changes: 1 addition & 1 deletion src/events/DefineLinkOptionsEvent.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
/**
* @link https://craftcms.com/
* @copyright Copyright (c) Pixel & Tonic, Inc.
* @license MIT
* @license GPL-3.0-or-later
*/

namespace craft\ckeditor\events;
Expand Down
2 changes: 1 addition & 1 deletion src/events/ModifyConfigEvent.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
/**
* @link https://craftcms.com/
* @copyright Copyright (c) Pixel & Tonic, Inc.
* @license MIT
* @license GPL-3.0-or-later
*/

namespace craft\ckeditor\events;
Expand Down
5 changes: 5 additions & 0 deletions src/helpers/CkeditorConfigSchema.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
<?php
/**
* @link https://craftcms.com/
* @copyright Copyright (c) Pixel & Tonic, Inc.
* @license GPL-3.0-or-later
*/

namespace craft\ckeditor\helpers;

Expand Down
5 changes: 5 additions & 0 deletions src/migrations/Install.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
<?php
/**
* @link https://craftcms.com/
* @copyright Copyright (c) Pixel & Tonic, Inc.
* @license GPL-3.0-or-later
*/

namespace craft\ckeditor\migrations;

Expand Down
5 changes: 5 additions & 0 deletions src/migrations/m230408_163704_v3_upgrade.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
<?php
/**
* @link https://craftcms.com/
* @copyright Copyright (c) Pixel & Tonic, Inc.
* @license GPL-3.0-or-later
*/

namespace craft\ckeditor\migrations;

Expand Down
2 changes: 1 addition & 1 deletion src/web/assets/BaseCkeditorPackageAsset.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
/**
* @link https://craftcms.com/
* @copyright Copyright (c) Pixel & Tonic, Inc.
* @license MIT
* @license GPL-3.0-or-later
*/

namespace craft\ckeditor\web\assets;
Expand Down
2 changes: 1 addition & 1 deletion src/web/assets/ckeconfig/CkeConfigAsset.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
/**
* @link https://craftcms.com/
* @copyright Copyright (c) Pixel & Tonic, Inc.
* @license MIT
* @license GPL-3.0-or-later
*/

namespace craft\ckeditor\web\assets\ckeconfig;
Expand Down
1 change: 1 addition & 0 deletions src/web/assets/ckeconfig/dist/ckeconfig.js

Large diffs are not rendered by default.

5 changes: 5 additions & 0 deletions src/web/assets/ckeconfig/dist/ckeconfig.js.LICENSE.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
/**
* @link https://craftcms.com/
* @copyright Copyright (c) Pixel & Tonic, Inc.
* @license GPL-3.0-or-later
*/
2 changes: 1 addition & 1 deletion src/web/assets/ckeconfig/dist/ckeconfig.js.map

Large diffs are not rendered by default.

6 changes: 6 additions & 0 deletions src/web/assets/ckeconfig/src/ConfigOptions.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
/**
* @link https://craftcms.com/
* @copyright Copyright (c) Pixel & Tonic, Inc.
* @license GPL-3.0-or-later
*/

/** global: CKEditor5, Garnish */
import './ckeconfig.css';
import $ from 'jquery';
Expand Down
6 changes: 6 additions & 0 deletions src/web/assets/ckeconfig/src/ToolbarBuilder.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
/**
* @link https://craftcms.com/
* @copyright Copyright (c) Pixel & Tonic, Inc.
* @license GPL-3.0-or-later
*/

/** global: CKEditor5, Garnish */
import './ckeconfig.css';
import $ from 'jquery';
Expand Down
6 changes: 6 additions & 0 deletions src/web/assets/ckeconfig/src/ckeconfig.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
/**
* @link https://craftcms.com/
* @copyright Copyright (c) Pixel & Tonic, Inc.
* @license GPL-3.0-or-later
*/

import ToolbarBuilder from './ToolbarBuilder';
import ConfigOptions from './ConfigOptions';

Expand Down
6 changes: 6 additions & 0 deletions src/web/assets/ckeconfig/webpack.config.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
/**
* @link https://craftcms.com/
* @copyright Copyright (c) Pixel & Tonic, Inc.
* @license GPL-3.0-or-later
*/

/* jshint esversion: 6 */
/* globals module, require */
const {getConfig} = require('@craftcms/webpack');
Expand Down
2 changes: 1 addition & 1 deletion src/web/assets/ckeditor/CkeditorAsset.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
/**
* @link https://craftcms.com/
* @copyright Copyright (c) Pixel & Tonic, Inc.
* @license MIT
* @license GPL-3.0-or-later
*/

namespace craft\ckeditor\web\assets\ckeditor;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,9 @@
* @license Copyright (c) 2003-2023, CKSource Holding sp. z o.o. All rights reserved.
* For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
*/

/**
* @link https://craftcms.com/
* @copyright Copyright (c) Pixel & Tonic, Inc.
* @license GPL-3.0-or-later
*/
2 changes: 1 addition & 1 deletion src/web/assets/ckeditor/dist/ckeditor5-craftcms.js.map

Large diffs are not rendered by default.

6 changes: 6 additions & 0 deletions src/web/assets/ckeditor/src/ckeditor5-craftcms.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
/**
* @link https://craftcms.com/
* @copyright Copyright (c) Pixel & Tonic, Inc.
* @license GPL-3.0-or-later
*/

import './ckeditor5-craftcms.css';
import {Alignment} from '@ckeditor/ckeditor5-alignment';
import {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
/**
* @link https://craftcms.com/
* @copyright Copyright (c) Pixel & Tonic, Inc.
* @license GPL-3.0-or-later
*/

import {icons} from 'ckeditor5/src/core';
import {ButtonView} from 'ckeditor5/src/ui';
import {ImageInsertUI} from '@ckeditor/ckeditor5-image';
Expand Down
6 changes: 6 additions & 0 deletions src/web/assets/ckeditor/src/image/imagetransform.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
/**
* @link https://craftcms.com/
* @copyright Copyright (c) Pixel & Tonic, Inc.
* @license GPL-3.0-or-later
*/

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

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

import {Plugin, icons} from 'ckeditor5/src/core';
import {
DropdownButtonView,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
/**
* @link https://craftcms.com/
* @copyright Copyright (c) Pixel & Tonic, Inc.
* @license GPL-3.0-or-later
*/

import {Command} from 'ckeditor5/src/core';

/**
Expand Down
6 changes: 6 additions & 0 deletions src/web/assets/ckeditor/src/link/linkui.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
/**
* @link https://craftcms.com/
* @copyright Copyright (c) Pixel & Tonic, Inc.
* @license GPL-3.0-or-later
*/

import {Plugin} from 'ckeditor5/src/core';
import {Collection} from 'ckeditor5/src/utils';
import {
Expand Down
6 changes: 6 additions & 0 deletions src/web/assets/ckeditor/webpack.config.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
/**
* @link https://craftcms.com/
* @copyright Copyright (c) Pixel & Tonic, Inc.
* @license GPL-3.0-or-later
*/

'use strict';

/* eslint-env node */
Expand Down

0 comments on commit 684435f

Please sign in to comment.