From ecc1deb156d209169d54ef452079b9f5f80c8417 Mon Sep 17 00:00:00 2001 From: Mips2648 Date: Tue, 2 Jul 2024 09:49:42 +0200 Subject: [PATCH 01/11] add workflow --- .github/dependabot.yml | 30 +++++++++++++++++++ .github/pull_request_template.md | 50 ++++++++++++++++++++++++++++++++ .github/workflows/prettier.yml | 14 +++++++++ .github/workflows/work.yml | 15 ++++++++++ 4 files changed, 109 insertions(+) create mode 100644 .github/dependabot.yml create mode 100644 .github/pull_request_template.md create mode 100644 .github/workflows/prettier.yml create mode 100644 .github/workflows/work.yml diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 0000000..a125be9 --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,30 @@ +# depandabot to update your package.json or requirements.txt - remove useless sections +# check all configuration options : +# https://docs.github.com/fr/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file +# also works with private repository +# https://docs.github.com/fr/code-security/dependabot/working-with-dependabot/configuring-access-to-private-registries-for-dependabot +version: 2 +updates: + # Maintain python pip dependencies in your 'requirement.txt' file + - package-ecosystem: "pip" + directory: "/resources" + target-branch: "beta" + schedule: + interval: weekly + + # Maintain NodeJS dependencies in 'package.json' + - package-ecosystem: npm + directory: "/resources/" + schedule: + interval: weekly + open-pull-requests-limit: 10 + versioning-strategy: increase + target-branch: "beta" + + # Maintain any github-actions workflow + # https://docs.github.com/en/code-security/dependabot/working-with-dependabot/keeping-your-actions-up-to-date-with-dependabot + - package-ecosystem: "github-actions" + directory: "/" + schedule: + interval: "monthly" + target-branch: "beta" diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md new file mode 100644 index 0000000..8793e1f --- /dev/null +++ b/.github/pull_request_template.md @@ -0,0 +1,50 @@ + + + + +## Description + + + +### Suggested changelog entry + + + +### Related issues/external references + +Fixes # + + +## Types of changes + +- [ ] Bug fix _(non-breaking change which fixes)_ +- [ ] New feature _(non-breaking change which adds functionality)_ +- [ ] Breaking change _(fix or feature that would cause existing functionality to change)_ + - [ ] This change is only breaking for integrators, not for external standards or end-users. +- [ ] Documentation improvement + + +## PR checklist + +- [ ] I have checked there is no other PR open for the same change. +- [ ] I have read the [Contribution Guidelines](https://doc.jeedom.com/fr_FR/contribute/). +- [ ] I grant the project the right to include and distribute the code under the GNU. +- [ ] I have added tests to cover my changes. +- [ ] I have verified that the code complies with the projects coding standards. +- [ ] [Required for new sniffs] I have added MD documentation for the sniff. + + diff --git a/.github/workflows/prettier.yml b/.github/workflows/prettier.yml new file mode 100644 index 0000000..08026e2 --- /dev/null +++ b/.github/workflows/prettier.yml @@ -0,0 +1,14 @@ +on: + # Create branch > prettier / this workflows create commit on branch prettier. + push: + branches: + - prettier + pull_request: + branches: + - prettier + +name : 'Prettier Plugin Jeedom' + +jobs: + prettier: + uses: jeedom/workflows/.github/workflows/prettier.yml@main diff --git a/.github/workflows/work.yml b/.github/workflows/work.yml new file mode 100644 index 0000000..345021e --- /dev/null +++ b/.github/workflows/work.yml @@ -0,0 +1,15 @@ +on: + # Workflows check plugin Jeedom + push: + branches: + - beta + pull_request: + branches: + - beta + - master + +name : 'Full Workflows Plugin Jeedom' + +jobs: + plugin: + uses: jeedom/workflows/.github/workflows/plugin.yml@main From b158dca0c95b9419d8cc7b0c499fc83c9cc076e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc?= <1536036+zoic21@users.noreply.github.com> Date: Mon, 26 Aug 2024 12:05:09 +0200 Subject: [PATCH 02/11] Update script.php --- desktop/php/script.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/desktop/php/script.php b/desktop/php/script.php index a677869..a948638 100644 --- a/desktop/php/script.php +++ b/desktop/php/script.php @@ -48,7 +48,7 @@ foreach ($eqLogics as $eqLogic) { $opacity = ($eqLogic->getIsEnable()) ? '' : 'disableCard'; echo '
'; - echo ''; + echo ''; echo '
'; echo '' . $eqLogic->getHumanName(true, true) . ''; echo '