From 7f8caa565a45ff98dad91b2302305ca048739bbb Mon Sep 17 00:00:00 2001 From: O3-Shop Date: Mon, 10 Apr 2023 23:27:20 +0200 Subject: [PATCH] fix small issues --- Application/fileman/dev.html | 2 +- Application/fileman/index.html | 2 +- CHANGELOG.md | 15 +++++++++++++++ README.md | 2 +- build/plugins/oxfullscreen/plugin.js | 24 +++++++++++++++--------- composer.json | 10 ++++++---- out/plugins/oxfullscreen/plugin.js | 22 ++++++++++++++-------- 7 files changed, 53 insertions(+), 24 deletions(-) create mode 100644 CHANGELOG.md diff --git a/Application/fileman/dev.html b/Application/fileman/dev.html index 7239b61..e884cad 100755 --- a/Application/fileman/dev.html +++ b/Application/fileman/dev.html @@ -98,7 +98,7 @@ -    © 2013 - RoxyFileman +    © 2013 - RoxyFileman + O3-Shop
Status bar
diff --git a/Application/fileman/index.html b/Application/fileman/index.html index 168fe9d..5f09c8c 100755 --- a/Application/fileman/index.html +++ b/Application/fileman/index.html @@ -92,7 +92,7 @@ -    © 2013 - RoxyFileman +    © 2013 - RoxyFileman + O3-Shop
Status bar
diff --git a/CHANGELOG.md b/CHANGELOG.md new file mode 100644 index 0000000..68ce840 --- /dev/null +++ b/CHANGELOG.md @@ -0,0 +1,15 @@ +# Changelog for O3-Shop TinyMCE Editor plugin + +All notable changes to this project will be documented in this file. +The format is based on [Keep a Changelog](http://keepachangelog.com/) +and this project adheres to [Semantic Versioning](http://semver.org/). + +## unreleased + +## [v1.0.0] - 2023-04-11 + +### Added +- Refactor plugin +- update TinyMCE to 6.4.1 + +[v1.0.0]: https://gitlab.o3-shop.com/o3/tinymce-editor/releases/tag/v1.0.0 \ No newline at end of file diff --git a/README.md b/README.md index 91774e4..b3610ea 100644 --- a/README.md +++ b/README.md @@ -80,7 +80,7 @@ SOFTWARE. ``` ### Roxy file manager [GPL v3] -(status: 2021-05-06) +(status: 2023-04-07) ``` GNU GENERAL PUBLIC LICENSE diff --git a/build/plugins/oxfullscreen/plugin.js b/build/plugins/oxfullscreen/plugin.js index d2cacbe..2f80cf2 100644 --- a/build/plugins/oxfullscreen/plugin.js +++ b/build/plugins/oxfullscreen/plugin.js @@ -1,14 +1,20 @@ /** - * vanilla-thunder/oxid-module-tinymce - * TinyMCE 5 Integration for OXID eShop V6.2 + * This file is part of O3-Shop TinyMCE editor module. * - * This program is free software; - * you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; - * either version 3 of the License, or (at your option) any later version. + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, version 3. * - * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - * You should have received a copy of the GNU General Public License along with this program; if not, see + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * You should have received a copy of the GNU General Public License + * along with O3-Shop. If not, see + * + * @copyright Copyright (c) 2022 Marat Bedoev, bestlife AG + * @copyright Copyright (c) 2023 O3-Shop (https://www.o3-shop.com) + * @license https://www.gnu.org/licenses/gpl-3.0 GNU General Public License 3 (GPLv3) */ /*global tinymce:true */ @@ -36,7 +42,7 @@ return { getMetadata: () => { return { - name: "TinyMCE Fullscreen Editing Plugin for OXID eShop", + name: "TinyMCE Fullscreen Editing Plugin for O3-Shop", url: "https://github.com/vanilla-thunder/oxid-module-tinymce" }; } diff --git a/composer.json b/composer.json index 8fcc330..5a7cc7c 100755 --- a/composer.json +++ b/composer.json @@ -1,7 +1,6 @@ { "name": "o3-shop/tinymce-editor", - "version": "1.0", - "description": "TinyMCE 5 Integration for O3-Shop", + "description": "TinyMCE 6 Integration for O3-Shop", "type": "oxideshop-module", "homepage": "https://www.o3-shop.com/", "license": [ @@ -21,7 +20,10 @@ "oxideshop": { "blacklist-filter": [ "composer.json", - "README.md" + "CHANGELOG.md", + "README.md", + ".php-cs-fixer.php", + "phpstan.neon" ], "target-directory": "o3-shop/tinymce-editor" } @@ -30,7 +32,7 @@ "exclude": ["/build"] }, "require": { - "php": ">=7.0", + "php": ">=7.4", "o3-shop/shop-ce": "^1.0" }, "autoload": { diff --git a/out/plugins/oxfullscreen/plugin.js b/out/plugins/oxfullscreen/plugin.js index 5092a69..9efbcb4 100755 --- a/out/plugins/oxfullscreen/plugin.js +++ b/out/plugins/oxfullscreen/plugin.js @@ -1,14 +1,20 @@ /** - * vanilla-thunder/oxid-module-tinymce - * TinyMCE 5 Integration for OXID eShop V6.2 + * This file is part of O3-Shop TinyMCE editor module. * - * This program is free software; - * you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; - * either version 3 of the License, or (at your option) any later version. + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, version 3. * - * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - * You should have received a copy of the GNU General Public License along with this program; if not, see + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * You should have received a copy of the GNU General Public License + * along with O3-Shop. If not, see + * + * @copyright Copyright (c) 2022 Marat Bedoev, bestlife AG + * @copyright Copyright (c) 2023 O3-Shop (https://www.o3-shop.com) + * @license https://www.gnu.org/licenses/gpl-3.0 GNU General Public License 3 (GPLv3) */ /*global tinymce:true */