Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

merge to beta #2996

Open
wants to merge 87 commits into
base: beta
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
87 commits
Select commit Hold shift + click to select a range
cd25bdc
Quelques corrections
MrWaloo Nov 13, 2024
1ec218b
Merge pull request #2978 from MrWaloo/alpha
zoic21 Nov 14, 2024
eed49e9
[Jenkins] Updated translation
Nov 14, 2024
a31ba9e
Update .htaccess for PHP8 against PHP5
limad Nov 18, 2024
0a1e553
Update cmd.class.php
Phpvarious Nov 21, 2024
31663dd
Merge pull request #2981 from Phpvarious/patch-4
zoic21 Nov 21, 2024
69661dc
Merge pull request #2980 from limad/patch-4
zoic21 Nov 22, 2024
78c3d32
different default port by protocol
Mips2648 Nov 22, 2024
2a34f2b
Merge pull request #2982 from Mips2648/alpha
Mips2648 Nov 22, 2024
8124212
Revert "different default port by protocol"
Mips2648 Nov 22, 2024
30bc076
Merge pull request #2983 from jeedom/revert-2982-alpha
Mips2648 Nov 22, 2024
334a0d5
get default port by protocol
Mips2648 Nov 22, 2024
4143e5b
Update cmd.class.php
limad Nov 23, 2024
e9f8cc6
Update cmd.class.php
limad Nov 24, 2024
21c000c
Update jeedom.class.php
zoic21 Nov 25, 2024
25effba
Display the placeholder if there is a placeholder in "test" button fo…
NebzHB Nov 25, 2024
17a3c39
fix typo
NebzHB Nov 25, 2024
8f94255
Merge pull request #2986 from NebzHB/patch-5
zoic21 Nov 25, 2024
d133684
Merge pull request #2985 from limad/patch-5
zoic21 Nov 25, 2024
511e5a5
Merge pull request #2984 from Mips2648/alpha
zoic21 Nov 25, 2024
2a86a4b
Update market.repo.php
zoic21 Nov 26, 2024
5ea0f64
[Jenkins] Updated translation
Nov 26, 2024
1f4db33
fix syntax
Sekiro-kost Nov 27, 2024
af77b34
fix syntax
Sekiro-kost Nov 27, 2024
4bea7ea
[Jenkins] Updated translation
Nov 27, 2024
87c41f5
Update cmd.class.php
zoic21 Dec 2, 2024
b907d62
Performance increase while importing an equipment without removing ex…
MrWaloo Dec 6, 2024
690f712
prevent divid by zero if wait time =0
zoic21 Dec 11, 2024
508133a
bugfix
zoic21 Dec 11, 2024
43c0cca
default wait time to 1s
zoic21 Dec 11, 2024
043e545
Prevent right issue on log
zoic21 Dec 12, 2024
94aa378
Update log.class.php
zoic21 Dec 12, 2024
69d3727
Merge pull request #2991 from MrWaloo/alpha
zoic21 Dec 17, 2024
81c92b3
Add backup list and restore method for cli
Hotfirenet Dec 17, 2024
5dd1aa4
[BUGFIX] Correction de bugs critiques dans la classe config
kwizer15 Dec 20, 2024
969d826
docs(ajax): amélioration de la documentation PHPDoc
kwizer15 Dec 22, 2024
11fde89
Don't refresh eqLogic battery widget
Flobul Jan 4, 2025
31772a6
Add battery-widget class
Flobul Jan 4, 2025
09eefcd
Update install.sh
zoic21 Jan 5, 2025
deb1a6d
Merge pull request #3008 from Flobul/alpha
zoic21 Jan 5, 2025
a6f92c4
Merge pull request #3004 from kwizer15/feat/php-doc-ajax
zoic21 Jan 5, 2025
eec687f
Merge pull request #3001 from kwizer15/fix/config-bug
zoic21 Jan 5, 2025
e20a2c8
Merge pull request #2997 from Hotfirenet/alpha
zoic21 Jan 5, 2025
5b3a1da
Update changelog.md
zoic21 Jan 5, 2025
d30b875
Update dom.ui.js
zoic21 Jan 5, 2025
77d1f7f
Update composer.json
zoic21 Jan 5, 2025
5d2ba73
[Jenkins] Updated translation
Jan 5, 2025
da9075f
add workflow to validate composer dependencies
pifou25 Sep 21, 2024
b194740
Update log.class.php
zoic21 Jan 6, 2025
7d52c06
Update massedit.php
zoic21 Jan 6, 2025
45c81ab
[Jenkins] Updated translation
Jan 7, 2025
bdfb10c
[Jenkins] Updated translation
Jan 7, 2025
5bb64b6
change duration intervalle of 2 deamon start
Sekiro-kost Jan 8, 2025
0f5d172
[Jenkins] Updated translation
Jan 8, 2025
db0a7de
Merge pull request #2905 from pifou25/feat/validate_composer
zoic21 Jan 11, 2025
3f5de45
add confirmationMessage for disable plugins
Sekiro-kost Jan 14, 2025
9ab6cd6
hide installButtons if minVersionJeedom is not compatible
Sekiro-kost Jan 14, 2025
90dee92
fix: do not exclude all folders named "log", this could break plugin …
Mips2648 Jan 20, 2025
313e665
Revert "fix: do not exclude all folders named "log", this could break…
Mips2648 Jan 20, 2025
0aaa9f4
fix: do not exclude all folders named "log", this could break plugin …
Mips2648 Jan 20, 2025
61c6ce2
Merge pull request #3016 from Mips2648/alpha
Mips2648 Jan 25, 2025
65bd005
don't show linked command from current eqLogic
Mips2648 Jan 25, 2025
aeb3c4f
don't show object owning the eqLogic
Mips2648 Jan 25, 2025
8c13aec
adapt prompt
Mips2648 Jan 27, 2025
cd4b305
do not show use commands (only the ones used by this eqLogic)
Mips2648 Jan 27, 2025
e6794d2
Random network check
zoic21 Jan 31, 2025
3228cbb
Reformulation
Hotfirenet Jan 31, 2025
8430545
Merge pull request #3021 from jeedom/patch-1
zoic21 Feb 5, 2025
cb55ea7
[Jenkins] Updated translation
Feb 5, 2025
543c49e
[Jenkins] Updated translation
Feb 5, 2025
71d1a8b
Fix error on setSchedule
NebzHB Feb 6, 2025
538a550
Merge pull request #3024 from NebzHB/patch-7
zoic21 Feb 7, 2025
2f280b7
Merge branch 'jeedom:alpha' into alpha
Sekiro-kost Feb 13, 2025
bef2944
correction of undefined variables
Sekiro-kost Feb 13, 2025
5297f2f
Update reloadCache.php
Sekiro-kost Feb 13, 2025
fa258a4
fixing some undeclared variables
Sekiro-kost Feb 13, 2025
5c9a29f
add missing
Sekiro-kost Feb 13, 2025
18608ea
Optimise makeSuccess, error if _result is an object
Hotfirenet Feb 17, 2025
5ada35b
Fix define param default value
Hotfirenet Feb 17, 2025
ee7b168
Revert "Update reloadCache.php"
Sekiro-kost Feb 19, 2025
c64573d
Revert "correction of undefined variables"
Sekiro-kost Feb 19, 2025
c9a0a83
Merge pull request #3032 from jeedom/corrections-variables-missing
Sekiro-kost Feb 19, 2025
baf8345
Merge pull request #3013 from Sekiro-kost/alpha
Sekiro-kost Feb 19, 2025
ad5b061
Merge pull request #3035 from Hotfirenet/alpha
Sekiro-kost Feb 19, 2025
adfd7d7
[Jenkins] Updated translation
Feb 19, 2025
7629364
Merge pull request #3019 from Mips2648/fix-eqlogic-delete-confirmation
Sekiro-kost Feb 20, 2025
a1199cc
[Jenkins] Updated translation
Feb 20, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 30 additions & 0 deletions .github/workflows/composer-validate.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
name: Validate Composer dependencies
# this workflows check composer dependency installation
# using the commited composer.lock
# validate on php7.4 and 8.2

on:
pull_request:
branches:
- alpha

jobs:
build-test:
runs-on: ubuntu-latest

# define every php version to test
strategy:
# do not stop at first fail
fail-fast: false
matrix:
php: [7.4, 8.2]

steps:
- uses: actions/checkout@v3

- name: Validate dependencies php${{ matrix.php }}
uses: php-actions/composer@v6
with:
php_version: ${{ matrix.php }}
command: validate
args: --no-check-publish
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ Thumbs.db
.buildpath
.vscode
ui
composer.lock

test.php
core/config/common.config.php
Expand Down
2 changes: 1 addition & 1 deletion .htaccess
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ mod_gzip_item_exclude mime ^image/.*
mod_gzip_item_exclude rspheader ^Content-Encoding:.*gzip.*
</ifModule>

<IfModule mod_php5.c>
<IfModule mod_php.c>
php_value post_max_size 1G
php_value upload_max_filesize 1G
php_value max_execution_time 600
Expand Down
9 changes: 7 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,16 @@
"symfony/expression-language": "5 - 7",
"pragmarx/google2fa-qrcode": "^3",
"bacon/bacon-qr-code": "2 - 3",
"psr/log": "^1.1"
"influxdata/influxdb-client-php": "^3",
"psr/log": "^1.1",
"php": ">=7.4"
},
"config": {
"allow-plugins": {
"php-http/discovery": true
},
"platform": {
"php": "7.4"
}
}
}
}
Loading