Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
15 changes: 15 additions & 0 deletions .github/workflows/work.yml
Original file line number Diff line number Diff line change
@@ -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
5 changes: 4 additions & 1 deletion core/class/docker2.class.php
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,10 @@ public static function backup() {
if ($eqLogic->getConfiguration('saveMount') == 0) {
continue;
}
$eqLogic->backupDocker();
try {
$eqLogic->backupDocker();
} catch (Exception $e) {
}
}
}

Expand Down
2 changes: 1 addition & 1 deletion core/i18n/de_DE.json
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@
"plugins\/docker2\/desktop\/js\/docker2.js": {
"Logs": "Protokolle",
"Nom du template ?": "Vorlagenname?",
"Assistants": "Zauberer",
"Assistants": "Assistenten",
"Fichier(s) ajouté(s) avec succès": "Datei(en) erfolgreich hinzugefügt",
"Opération réalisée avec succès": "Operation erfolgreich abgeschlossen",
"Etes-vous sûr de vouloir restaurer la dernière sauvegarde de ce conteneur ?": "Möchten Sie wirklich die letzte Sicherung dieses Containers wiederherstellen?",
Expand Down
2 changes: 1 addition & 1 deletion core/i18n/es_ES.json
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@
"plugins\/docker2\/desktop\/js\/docker2.js": {
"Logs": "Registros",
"Nom du template ?": "¿Nombre de la plantilla?",
"Assistants": "Magos",
"Assistants": "Asistentes",
"Fichier(s) ajouté(s) avec succès": "Archivo (s) agregado (s) exitosamente",
"Opération réalisée avec succès": "Operación realizada exitosamente",
"Etes-vous sûr de vouloir restaurer la dernière sauvegarde de ce conteneur ?": "¿Está seguro de que desea restaurar la última copia de seguridad de este contenedor?",
Expand Down
2 changes: 1 addition & 1 deletion core/i18n/pt_PT.json
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@
"plugins\/docker2\/desktop\/js\/docker2.js": {
"Logs": "Histórico",
"Nom du template ?": "Nome do modelo?",
"Assistants": "Feiticeiros",
"Assistants": "Assistentes",
"Fichier(s) ajouté(s) avec succès": "Arquivo (s) adicionado (s) com sucesso",
"Opération réalisée avec succès": "Operação concluída com sucesso",
"Etes-vous sûr de vouloir restaurer la dernière sauvegarde de ce conteneur ?": "Tem certeza de que deseja restaurar o último backup deste contêiner?",
Expand Down
4 changes: 2 additions & 2 deletions desktop/js/docker2.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@

function printEqLogic(_eqLogic) {
if (_eqLogic.configuration && _eqLogic.configuration.url_access) {
$('#link_dockerUrl').attr('href', _eqLogic.configuration.url_access.replace('#INTERNAL#', docker2_internal_ip))
$('#link_dockerUrl').text(_eqLogic.configuration.url_access.replace('#INTERNAL#', docker2_internal_ip))
$('#link_dockerUrl').attr('href', _eqLogic.configuration.url_access.replace('#INTERNAL#', docker2_internal_ip).replace('#internal#', docker2_internal_ip))
$('#link_dockerUrl').text(_eqLogic.configuration.url_access.replace('#INTERNAL#', docker2_internal_ip).replace('#internal#', docker2_internal_ip))
}
}

Expand Down
5 changes: 5 additions & 0 deletions docs/fr_FR/changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,11 @@
>
>Pour rappel s'il n'y a pas d'information sur la mise à jour, c'est que celle-ci concerne uniquement de la mise à jour de documentation, de traduction ou de texte.

# 01/09/2024

- Amélioration de la fonction de backup
- Correction d'un soucis sur le lien d'accès (non remplacement de #internal#)

# 06/05/2022

- Correction d'un problème d'installation sur Raspberry Pi
Expand Down
2 changes: 1 addition & 1 deletion plugin_info/info.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,4 +44,4 @@
],
"changelog_beta": "https:\/\/doc.jeedom.com\/#language#\/plugins\/programming\/docker2\/beta\/changelog",
"documentation_beta": "https:\/\/doc.jeedom.com\/#language#\/plugins\/programming\/docker2\/beta"
}
}