Skip to content

Commit

Permalink
Merge pull request #2889 from jeedom/beta
Browse files Browse the repository at this point in the history
Stable 4.4.16
  • Loading branch information
zoic21 authored Sep 9, 2024
2 parents bee5986 + 77689a7 commit 5de9f9c
Show file tree
Hide file tree
Showing 6 changed files with 14 additions and 7 deletions.
1 change: 0 additions & 1 deletion .github/workflows/docker-image-latest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ on:
# only trigger CI when push on following branches
branches:
- 'master'
- 'beta'
# this is to manually trigger the worklow
workflow_dispatch:
inputs:
Expand Down
3 changes: 2 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -64,4 +64,5 @@ EXPOSE 80
EXPOSE 443
COPY --chown=root:root --chmod=550 install/OS_specific/Docker/init.sh /root/
COPY --chown=root:root --chmod=550 install/bashrc /root/.bashrc
CMD ["bash", "/root/init.sh"]

CMD ["bash", "/root/init.sh"]
2 changes: 1 addition & 1 deletion core/config/version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
4.4.15
4.4.16
1 change: 1 addition & 0 deletions core/php/jeecli.php
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@
die();
}
$plugin->setIsEnable(1,true,true);
jeedom::cleanFileSystemRight();
break;
case 'dependancy_end':
if (!isset($argv[3])) {
Expand Down
7 changes: 3 additions & 4 deletions desktop/js/replace.js
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ if (!jeeFrontEnd.replace) {
var key = null
document.querySelectorAll('#objectFilter .objectFilterKey').forEach(_filter => {
if (_filter.checked) {
key = parseInt(_filter.getAttribute('data-key'))
if (isNaN(key)) key = null
key = _filter.getAttribute('data-key')
if (key == '') key = null
jeeP.filteredObjects.push(key)
}
})
Expand Down Expand Up @@ -541,5 +541,4 @@ document.getElementById('eqSource').addEventListener('change', function(event) {
jeeP.selectReplacerEqlogic(_target.closest('select.selectEqReplace'))
return
}
})

})
7 changes: 7 additions & 0 deletions docs/fr_FR/changelog.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
# Changelog Jeedom V4.4

# 4.4.16

- Correction d'un bug sur les filtre de la page de remplacement [LIEN](https://github.com/jeedom/core/commit/ab0a197cf7ec99b7ae79db68ae9478afd3ffc6f1)
- Correction de bugs sur la version docker [LIEN](https://github.com/jeedom/core/commit/32e68dae9ec16eb58bdc66d8fdccbc0bdd1503bd)
- Correction d'un bug sur les droits lors de l'installation d'un plugin en dependance d'un autre [LIEN](https://github.com/jeedom/core/issues/2888)


# 4.4.15

- Correction d'un bug ou la connexion à Jeedom ne pouvait pas etre auto remplis par le navigateur [LIEN](https://github.com/jeedom/core/pull/2854)
Expand Down

0 comments on commit 5de9f9c

Please sign in to comment.