diff --git a/.gitignore b/.gitignore index d2b1865..c8b4bf0 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /*.zip /locales/*.mo /vendor +/themes/*/login.css \ No newline at end of file diff --git a/.vscode/extensions.json b/.vscode/extensions.json deleted file mode 100644 index 6f99b91..0000000 --- a/.vscode/extensions.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "recommendations": [ - "bmewburn.vscode-intelephense-client", - "felixfbecker.php-debug", - "valeryanm.vscode-phpsab" - ] -} diff --git a/.vscode/settings.json b/.vscode/settings.json deleted file mode 100644 index 02d70fb..0000000 --- a/.vscode/settings.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "phpsab.snifferEnable": true, - "phpsab.standard": ".phpcs.xml", - "phpsab.composerJsonPath": "composer.json", - "intelephense.environment.includePaths": ["../../"], - "intelephense.format.braces": "k&r", - "[php]": { - "editor.defaultFormatter": "bmewburn.vscode-intelephense-client" - } -} diff --git a/README.md b/README.md index d19e498..edfff5b 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,10 @@ # Trademark for GLPI >= 9.5 +![Lint](https://github.com/lyseontech/trademark/workflows/Lint/badge.svg) +[![CodeFactor](https://www.codefactor.io/repository/github/lyseontech/trademark/badge)](https://www.codefactor.io/repository/github/lyseontech/trademark) +[![Total Downloads](https://img.shields.io/github/downloads/lyseontech/trademark/total.svg)](https://github.com/lyseontech/trademark/releases) +[![Current Release](https://img.shields.io/github/release/lyseontech/trademark.svg)](https://github.com/lyseontech/trademark/releases/latest) + Allow customization of logos, background and custom CSSs # Installation diff --git a/RoboFile.php b/RoboFile.php index 4495916..832693d 100644 --- a/RoboFile.php +++ b/RoboFile.php @@ -10,7 +10,7 @@ class RoboFile extends \Robo\Tasks { protected $name = "trademark"; - protected $issues = "https://github.com/edgardmessias/glpi-trademark/issues"; + protected $issues = "https://github.com/librecode/trademark/issues"; protected $locale_keywords = "t_trademark"; protected function getLocaleFiles() { diff --git a/composer.json b/composer.json index c056d29..11c6c1c 100644 --- a/composer.json +++ b/composer.json @@ -1,7 +1,7 @@ { - "name": "edgardmessias/glpi-trademark", - "description": "Fix Mail Collector for GLPI", - "license": "GPL v2+", + "name": "librecode/trademark", + "description": "Allow customization of logos, background and custom CSSs", + "license": "AGPL", "require": { "scssphp/scssphp": "^1.4" }, diff --git a/composer.lock b/composer.lock index c376cc4..ca06a56 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "da4e9b82fe266e9aea340b72becaf970", + "content-hash": "2eebd67eba3007aa5c85a88310ed1cc3", "packages": [ { "name": "scssphp/scssphp", @@ -720,21 +720,21 @@ }, { "name": "league/container", - "version": "2.4.1", + "version": "2.5.0", "source": { "type": "git", "url": "https://github.com/thephpleague/container.git", - "reference": "43f35abd03a12977a60ffd7095efd6a7808488c0" + "reference": "8438dc47a0674e3378bcce893a0a04d79a2c22b3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/container/zipball/43f35abd03a12977a60ffd7095efd6a7808488c0", - "reference": "43f35abd03a12977a60ffd7095efd6a7808488c0", + "url": "https://api.github.com/repos/thephpleague/container/zipball/8438dc47a0674e3378bcce893a0a04d79a2c22b3", + "reference": "8438dc47a0674e3378bcce893a0a04d79a2c22b3", "shasum": "" }, "require": { "container-interop/container-interop": "^1.2", - "php": "^5.4.0 || ^7.0" + "php": "^5.4 || ^7.0 || ^8.0" }, "provide": { "container-interop/container-interop-implementation": "^1.2", @@ -744,7 +744,9 @@ "orno/di": "~2.0" }, "require-dev": { - "phpunit/phpunit": "4.*" + "phpunit/phpunit": "^4.8.36", + "scrutinizer/ocular": "^1.3", + "squizlabs/php_codesniffer": "^3.5" }, "type": "library", "extra": { @@ -783,22 +785,28 @@ ], "support": { "issues": "https://github.com/thephpleague/container/issues", - "source": "https://github.com/thephpleague/container/tree/2.x" + "source": "https://github.com/thephpleague/container/tree/2.5.0" }, - "time": "2017-05-10T09:20:27+00:00" + "funding": [ + { + "url": "https://github.com/philipobenito", + "type": "github" + } + ], + "time": "2021-02-22T09:20:06+00:00" }, { "name": "pear/archive_tar", - "version": "1.4.12", + "version": "1.4.13", "source": { "type": "git", "url": "https://github.com/pear/Archive_Tar.git", - "reference": "19bb8e95490d3e3ad92fcac95500ca80bdcc7495" + "reference": "2b87b41178cc6d4ad3cba678a46a1cae49786011" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/pear/Archive_Tar/zipball/19bb8e95490d3e3ad92fcac95500ca80bdcc7495", - "reference": "19bb8e95490d3e3ad92fcac95500ca80bdcc7495", + "url": "https://api.github.com/repos/pear/Archive_Tar/zipball/2b87b41178cc6d4ad3cba678a46a1cae49786011", + "reference": "2b87b41178cc6d4ad3cba678a46a1cae49786011", "shasum": "" }, "require": { @@ -865,7 +873,7 @@ "type": "patreon" } ], - "time": "2021-01-18T19:32:54+00:00" + "time": "2021-02-16T10:50:50+00:00" }, { "name": "pear/console_getopt", @@ -1736,7 +1744,7 @@ }, { "name": "symfony/polyfill-ctype", - "version": "v1.22.0", + "version": "v1.22.1", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-ctype.git", @@ -1795,7 +1803,7 @@ "portable" ], "support": { - "source": "https://github.com/symfony/polyfill-ctype/tree/v1.22.0" + "source": "https://github.com/symfony/polyfill-ctype/tree/v1.22.1" }, "funding": [ { @@ -1815,16 +1823,16 @@ }, { "name": "symfony/polyfill-mbstring", - "version": "v1.22.0", + "version": "v1.22.1", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "f377a3dd1fde44d37b9831d68dc8dea3ffd28e13" + "reference": "5232de97ee3b75b0360528dae24e73db49566ab1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/f377a3dd1fde44d37b9831d68dc8dea3ffd28e13", - "reference": "f377a3dd1fde44d37b9831d68dc8dea3ffd28e13", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/5232de97ee3b75b0360528dae24e73db49566ab1", + "reference": "5232de97ee3b75b0360528dae24e73db49566ab1", "shasum": "" }, "require": { @@ -1875,7 +1883,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.22.0" + "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.22.1" }, "funding": [ { @@ -1891,11 +1899,11 @@ "type": "tidelift" } ], - "time": "2021-01-07T16:49:33+00:00" + "time": "2021-01-22T09:19:47+00:00" }, { "name": "symfony/polyfill-php73", - "version": "v1.22.0", + "version": "v1.22.1", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php73.git", @@ -1954,7 +1962,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php73/tree/v1.22.0" + "source": "https://github.com/symfony/polyfill-php73/tree/v1.22.1" }, "funding": [ { @@ -1974,7 +1982,7 @@ }, { "name": "symfony/polyfill-php80", - "version": "v1.22.0", + "version": "v1.22.1", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php80.git", @@ -2037,7 +2045,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php80/tree/v1.22.0" + "source": "https://github.com/symfony/polyfill-php80/tree/v1.22.1" }, "funding": [ { diff --git a/locales/en_GB.po b/locales/en_GB.po index a87a445..0d4e44f 100644 --- a/locales/en_GB.po +++ b/locales/en_GB.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: trademark 1.2.3\n" -"Report-Msgid-Bugs-To: https://github.com/edgardmessias/glpi-trademark/" +"Report-Msgid-Bugs-To: https://github.com/librecode/trademark/" "issues\n" "POT-Creation-Date: 2021-02-17 13:42-0300\n" "PO-Revision-Date: 2021-02-17 13:42-0300\n" diff --git a/locales/pt_BR.po b/locales/pt_BR.po index a7459cd..c56fb92 100644 --- a/locales/pt_BR.po +++ b/locales/pt_BR.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: trademark 1.0.0\n" -"Report-Msgid-Bugs-To: https://github.com/edgardmessias/glpi-trademark/" +"Report-Msgid-Bugs-To: https://github.com/librecode/trademark/" "issues\n" "POT-Creation-Date: 2021-02-17 13:42-0300\n" "PO-Revision-Date: 2021-01-30 16:27-0300\n" diff --git a/locales/trademark.pot b/locales/trademark.pot index 7210115..8657f1c 100644 --- a/locales/trademark.pot +++ b/locales/trademark.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: trademark 1.2.3\n" -"Report-Msgid-Bugs-To: https://github.com/edgardmessias/glpi-trademark/" +"Report-Msgid-Bugs-To: https://github.com/librecode/trademark/" "issues\n" "POT-Creation-Date: 2021-02-17 13:42-0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" diff --git a/pics/login.preview.png b/pics/login.preview.png index a631b61..371961f 100644 Binary files a/pics/login.preview.png and b/pics/login.preview.png differ diff --git a/plugin.xml b/plugin.xml index a6a994d..f8c7c1c 100644 --- a/plugin.xml +++ b/plugin.xml @@ -3,7 +3,7 @@ Trademark for GLPI trademark stable - https://raw.githubusercontent.com/phamorais/trademark/master/plugin.png + https://raw.githubusercontent.com/lyseontech/trademark/master/plugin.png @@ -12,10 +12,10 @@ = 9.5 - ![Lint](https://github.com/phamorais/trademark/workflows/Lint/badge.svg) - [![CodeFactor](https://www.codefactor.io/repository/github/phamorais/trademark/badge)](https://www.codefactor.io/repository/github/phamorais/trademark) - [![Total Downloads](https://img.shields.io/github/downloads/phamorais/trademark/total.svg)](https://github.com/phamorais/trademark/releases) - [![Current Release](https://img.shields.io/github/release/phamorais/trademark.svg)](https://github.com/phamorais/trademark/releases/latest) + ![Lint](https://github.com/lyseontech/trademark/workflows/Lint/badge.svg) + [![CodeFactor](https://www.codefactor.io/repository/github/lyseontech/trademark/badge)](https://www.codefactor.io/repository/github/lyseontech/trademark) + [![Total Downloads](https://img.shields.io/github/downloads/lyseontech/trademark/total.svg)](https://github.com/lyseontech/trademark/releases) + [![Current Release](https://img.shields.io/github/release/lyseontech/trademark.svg)](https://github.com/lyseontech/trademark/releases/latest) Allow customization of logos, background and custom CSSs @@ -26,10 +26,10 @@ ]]> - https://github.com/phamorais/trademark - https://github.com/phamorais/trademark/releases - https://github.com/phamorais/trademark/issues - https://github.com/phamorais/trademark/wiki + https://github.com/lyseontech/trademark + https://github.com/lyseontech/trademark/releases + https://github.com/lyseontech/trademark/issues + https://github.com/lyseontech/trademark/wiki Edgard Lorraine Messias @@ -53,7 +53,7 @@ - https://raw.githubusercontent.com/phamorais/trademark/master/screenshots/image_1.png - https://raw.githubusercontent.com/phamorais/trademark/master/screenshots/image_2.png + https://raw.githubusercontent.com/lyseontech/trademark/master/screenshots/image_1.png + https://raw.githubusercontent.com/lyseontech/trademark/master/screenshots/image_2.png diff --git a/setup.php b/setup.php index 244c6e2..bf74d72 100644 --- a/setup.php +++ b/setup.php @@ -52,8 +52,8 @@ function plugin_version_trademark() { return [ 'name' => t_trademark('Trademark'), 'version' => PLUGIN_TRADEMARK_VERSION, - 'author' => 'Nextflow, Edgard', - 'homepage' => 'https://nextflow.com.br/plugin-glpi/trademark', + 'author' => 'LibreCode, Edgard', + 'homepage' => 'https://github.com/lyseontech/trademark', 'license' => 'GPL v2+', 'minGlpiVersion' => PLUGIN_TRADEMARK_MIN_GLPI_VERSION, 'requirements' => [ diff --git a/themes/aurora-boreal/login.logo.png b/themes/aurora-boreal/login.logo.png index 31324fb..371961f 100644 Binary files a/themes/aurora-boreal/login.logo.png and b/themes/aurora-boreal/login.logo.png differ diff --git a/themes/aurora-boreal/login.preview.jpg b/themes/aurora-boreal/login.preview.jpg index b6311b1..371961f 100644 Binary files a/themes/aurora-boreal/login.preview.jpg and b/themes/aurora-boreal/login.preview.jpg differ diff --git a/themes/baloons/login.logo.png b/themes/baloons/login.logo.png index 407a903..371961f 100644 Binary files a/themes/baloons/login.logo.png and b/themes/baloons/login.logo.png differ diff --git a/themes/baloons/login.preview.jpg b/themes/baloons/login.preview.jpg index 72967c8..371961f 100644 Binary files a/themes/baloons/login.preview.jpg and b/themes/baloons/login.preview.jpg differ diff --git a/themes/cloud/login.logo.png b/themes/cloud/login.logo.png index 0edaf00..371961f 100644 Binary files a/themes/cloud/login.logo.png and b/themes/cloud/login.logo.png differ diff --git a/themes/cloud/login.preview.jpg b/themes/cloud/login.preview.jpg index 9c2b088..371961f 100644 Binary files a/themes/cloud/login.preview.jpg and b/themes/cloud/login.preview.jpg differ diff --git a/themes/desktop/login.logo.png b/themes/desktop/login.logo.png index 0edaf00..371961f 100644 Binary files a/themes/desktop/login.logo.png and b/themes/desktop/login.logo.png differ diff --git a/themes/desktop/login.preview.jpg b/themes/desktop/login.preview.jpg index b4ae88c..371961f 100644 Binary files a/themes/desktop/login.preview.jpg and b/themes/desktop/login.preview.jpg differ diff --git a/themes/light/login.logo.png b/themes/light/login.logo.png index fb04646..371961f 100644 Binary files a/themes/light/login.logo.png and b/themes/light/login.logo.png differ diff --git a/themes/light/login.preview.jpg b/themes/light/login.preview.jpg index b55fd68..371961f 100644 Binary files a/themes/light/login.preview.jpg and b/themes/light/login.preview.jpg differ diff --git a/themes/neon/login.logo.png b/themes/neon/login.logo.png index 31324fb..371961f 100644 Binary files a/themes/neon/login.logo.png and b/themes/neon/login.logo.png differ diff --git a/themes/neon/login.preview.jpg b/themes/neon/login.preview.jpg index d42006f..371961f 100644 Binary files a/themes/neon/login.preview.jpg and b/themes/neon/login.preview.jpg differ diff --git a/themes/night/login.logo.png b/themes/night/login.logo.png index 31324fb..371961f 100644 Binary files a/themes/night/login.logo.png and b/themes/night/login.logo.png differ diff --git a/themes/night/login.preview.jpg b/themes/night/login.preview.jpg index d1f5244..371961f 100644 Binary files a/themes/night/login.preview.jpg and b/themes/night/login.preview.jpg differ diff --git a/themes/power-red/login.logo.png b/themes/power-red/login.logo.png index 772ac73..371961f 100644 Binary files a/themes/power-red/login.logo.png and b/themes/power-red/login.logo.png differ diff --git a/themes/power-red/login.preview.jpg b/themes/power-red/login.preview.jpg index 42cd614..371961f 100644 Binary files a/themes/power-red/login.preview.jpg and b/themes/power-red/login.preview.jpg differ diff --git a/themes/prompt-developer/login.logo.png b/themes/prompt-developer/login.logo.png index 31324fb..371961f 100644 Binary files a/themes/prompt-developer/login.logo.png and b/themes/prompt-developer/login.logo.png differ diff --git a/themes/prompt-developer/login.preview.jpg b/themes/prompt-developer/login.preview.jpg index d2493e6..371961f 100644 Binary files a/themes/prompt-developer/login.preview.jpg and b/themes/prompt-developer/login.preview.jpg differ