From 4263865907bca719e39aca803fa22aa54cd513f3 Mon Sep 17 00:00:00 2001 From: Jean-Christian Denis Date: Tue, 24 Oct 2023 00:02:29 +0200 Subject: [PATCH] fix repository branch --- CHANGELOG.md | 6 ++++++ README.md | 6 +++--- _define.php | 2 +- dcstore.xml | 4 ++-- src/Backend.php | 4 ++-- src/Frontend.php | 4 ++-- src/Install.php | 4 ++-- src/Manage.php | 4 ++-- src/My.php | 7 +++---- src/Prepend.php | 4 ++-- src/Uninstall.php | 4 ++-- 11 files changed, 27 insertions(+), 22 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 37e2386..b9ba242 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +moreCSS 2.5.2 - 2023.10.23 +=========================================================== +* Require Dotclear 2.28 +* Require PHP 8.1 +* Fix repository branch + moreCSS 2.5.1 - 2023.10.13 =========================================================== * Require Dotclear 2.28 diff --git a/README.md b/README.md index dcd772d..d9d6ebd 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # README -[![Release](https://img.shields.io/badge/release-2.5.1-a2cbe9.svg)](https://git.dotclear.watch/JcDenis/moreCSS/releases) -![Date](https://img.shields.io/badge/date-2023.10.13-c44d58.svg) +[![Release](https://img.shields.io/badge/release-2.5.2-a2cbe9.svg)](https://git.dotclear.watch/JcDenis/moreCSS/releases) +![Date](https://img.shields.io/badge/date-2023.10.23-c44d58.svg) [![Dotclear](https://img.shields.io/badge/dotclear-v2.28-137bbb.svg)](https://fr.dotclear.org/download) [![Dotaddict](https://img.shields.io/badge/dotaddict-official-9ac123.svg)](https://plugins.dotaddict.org/dc2/details/moreCSS) [![License](https://img.shields.io/github/license/JcDenis/moreCSS)](https://git.dotclear.watch/JcDenis/moreCSS/blob/master/LICENSE) @@ -16,7 +16,7 @@ _moreCSS_ is a plugin for the open-source web publishing software called [Dotcle * Dotclear 2.28 * PHP 8.1+ -* content admin permissions to manage CSS +* Dotclear content admin permissions to manage CSS ## USAGE diff --git a/_define.php b/_define.php index f1cd27a..5629fe8 100644 --- a/_define.php +++ b/_define.php @@ -17,7 +17,7 @@ $this->registerModule( 'Style sheet', 'Another CSS stylesheet for the active theme', 'Osku and contributors', - '2.5.1', + '2.5.2', [ 'requires' => [['core', '2.28']], 'permissions' => 'My', diff --git a/dcstore.xml b/dcstore.xml index 92a0988..7d7bd53 100644 --- a/dcstore.xml +++ b/dcstore.xml @@ -2,10 +2,10 @@ Style sheet - 2.5.1 + 2.5.2 Osku and contributors Another CSS stylesheet for the active theme - https://git.dotclear.watch/JcDenis/moreCSS/releases/download/v2.5.1/plugin-moreCSS.zip + https://git.dotclear.watch/JcDenis/moreCSS/releases/download/v2.5.2/plugin-moreCSS.zip 2.28 https://git.dotclear.watch/JcDenis/moreCSS/src/branch/master/README.md https://git.dotclear.watch/JcDenis/moreCSS/issues diff --git a/src/Backend.php b/src/Backend.php index 31b555b..ab3bf19 100644 --- a/src/Backend.php +++ b/src/Backend.php @@ -19,8 +19,8 @@ use Dotclear\Core\Process; use Dotclear\Core\Backend\Favorites; /** - * @brief moreCSS manage class. - * @ingroup moreCSS + * @brief moreCSS manage class. + * @ingroup moreCSS * * @author Osku (author) * @author Jean-Christian Denis (latest) diff --git a/src/Frontend.php b/src/Frontend.php index 516f298..3d4c478 100644 --- a/src/Frontend.php +++ b/src/Frontend.php @@ -8,8 +8,8 @@ use Dotclear\App; use Dotclear\Core\Process; /** - * @brief moreCSS frontend class. - * @ingroup moreCSS + * @brief moreCSS frontend class. + * @ingroup moreCSS * * @author Osku (author) * @author Jean-Christian Denis (latest) diff --git a/src/Install.php b/src/Install.php index 4f8138e..0a605de 100644 --- a/src/Install.php +++ b/src/Install.php @@ -9,8 +9,8 @@ use Dotclear\Core\Process; use Exception; /** - * @brief moreCSS install class. - * @ingroup moreCSS + * @brief moreCSS install class. + * @ingroup moreCSS * * @author Osku (author) * @author Jean-Christian Denis (latest) diff --git a/src/Manage.php b/src/Manage.php index 40e6156..97e5eeb 100644 --- a/src/Manage.php +++ b/src/Manage.php @@ -23,8 +23,8 @@ use Dotclear\Helper\Html\Html; use Exception; /** - * @brief moreCSS manage class. - * @ingroup moreCSS + * @brief moreCSS manage class. + * @ingroup moreCSS * * @author Osku (author) * @author Jean-Christian Denis (latest) diff --git a/src/My.php b/src/My.php index a6b1485..573f898 100644 --- a/src/My.php +++ b/src/My.php @@ -8,8 +8,8 @@ use Dotclear\App; use Dotclear\Module\MyPlugin; /** - * @brief moreCSS My helper. - * @ingroup moreCSS + * @brief moreCSS My helper. + * @ingroup moreCSS * * @author Osku (author) * @author Jean-Christian Denis (latest) @@ -20,9 +20,8 @@ class My extends MyPlugin protected static function checkCustomContext(int $context): ?bool { return match ($context) { - // Allow BACKEND and MANAGE and MENU to also content admin + // Add content admin perm to backend self::MANAGE, self::MENU => App::task()->checkContext('BACKEND') - && App::blog()->isDefined() && App::auth()->check(App::auth()->makePermissions([ App::auth()::PERMISSION_ADMIN, App::auth()::PERMISSION_CONTENT_ADMIN, diff --git a/src/Prepend.php b/src/Prepend.php index 1c411f0..aa47654 100644 --- a/src/Prepend.php +++ b/src/Prepend.php @@ -8,8 +8,8 @@ use Dotclear\App; use Dotclear\Core\Process; /** - * @brief moreCSS prepend class. - * @ingroup moreCSS + * @brief moreCSS prepend class. + * @ingroup moreCSS * * @author Osku (author) * @author Jean-Christian Denis (latest) diff --git a/src/Uninstall.php b/src/Uninstall.php index c7a4ddb..a34fdc5 100644 --- a/src/Uninstall.php +++ b/src/Uninstall.php @@ -8,8 +8,8 @@ use Dotclear\Core\Process; use Dotclear\Plugin\Uninstaller\Uninstaller; /** - * @brief moreCSS uninstall class. - * @ingroup moreCSS + * @brief moreCSS uninstall class. + * @ingroup moreCSS * * @author Osku (author) * @author Jean-Christian Denis (latest)