Skip to content

Commit

Permalink
Merge branch 'newFully2' of https://github.com/arteck/ioBroker.fullyb…
Browse files Browse the repository at this point in the history
  • Loading branch information
arteck committed Oct 31, 2023
2 parents ff50de9 + c3f179f commit 3ba9b83
Show file tree
Hide file tree
Showing 47 changed files with 7,378 additions and 7,760 deletions.
4 changes: 4 additions & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
.prettierrc.js
**/.eslintrc.js
admin/blockly.js
admin/words.js
42 changes: 42 additions & 0 deletions .eslintrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
{
"root": true,
"env": {
"es6": true,
"node": true,
"mocha": true
},
"extends": ["eslint:recommended"],
"plugins": [],
"rules": {
"indent": [
"error",
4,
{
"SwitchCase": 1
}
],
"no-console": "off",
"no-unused-vars": [
"error",
{
"ignoreRestSiblings": true,
"argsIgnorePattern": "^_"
}
],
"no-var": "error",
"no-trailing-spaces": "error",
"prefer-const": "error",
"quotes": [
"error",
"single",
{
"avoidEscape": true,
"allowTemplateLiterals": true
}
],
"semi": ["error", "always"]
},
"parserOptions": {
"ecmaVersion": 2020
}
}
1 change: 1 addition & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
* text=auto eol=lf
2 changes: 2 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,6 @@ updates:
time: "04:00"
timezone: Europe/Berlin
open-pull-requests-limit: 5
assignees:
- arteck
versioning-strategy: increase
5 changes: 4 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
.git
.idea
*.code-workspace
/node_modules
node_modules
nbproject

# npm package files
Expand All @@ -12,3 +12,6 @@ Thumbs.db
# i18n intermediate files
admin/i18n/flat.txt
admin/i18n/*/flat.txt

# ioBroker dev-server
.dev-server/
10 changes: 0 additions & 10 deletions .npmignore

This file was deleted.

7 changes: 7 additions & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
package.json
package-lock.json
README.md
io-package.json
docs/**
.github/**
admin/words.js
9 changes: 9 additions & 0 deletions .prettierrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"semi": true,
"trailingComma": "all",
"singleQuote": true,
"printWidth": 200,
"useTabs": false,
"tabWidth": 4,
"endOfLine": "lf"
}
8 changes: 2 additions & 6 deletions .releaseconfig.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
{
"plugins": [
"iobroker",
"license",
"manual-review"
]
}
"plugins": ["iobroker", "license", "manual-review"]
}
12 changes: 11 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,10 @@ A small excerpt just of the command options:

![möglichkeiten](https://github.com/arteck/iobroker.fullyBrowser/blob/master/doku/auszug1.png)

## Documentation

- [🇬🇧 English Documentation](./docs/en/README.md)
- [🇩🇪 Deutsche Dokumentation](./docs/de/README.md)

<!--
Placeholder for the next version (at the beginning of the line):
Expand All @@ -32,8 +36,14 @@ A small excerpt just of the command options:


## Changelog

### **WORK IN PROGRESS**
* (arteck) breaking change - new structure from fully-mqtt Adapter from Acgua
* here is the Orginal https://github.com/Acgua/ioBroker.fully-mqtt

#----------------------------------------------------------------------
### 2.2.0 (2023-10-27)
* (arteck) intrvall corr
* (arteck) intervall corr

### 2.1.6 (2022-11-23)
* (arteck) add name of device to admin
Expand Down
33 changes: 33 additions & 0 deletions admin/i18n/de/translations.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
{
"A detailed documentation with explanations and all further information can be found on this GitHub page:": "Eine ausführliche Dokumentation mit Erklärungen und allen weiteren Informationen finden Sie auf dieser GitHub-Seite:",
"Add new devices by clicking the plus (+) symbol...": "Neue Geräte hinzufügen, indem Sie auf das Plus-Symbol (+) klicken…",
"Always update info objects, even if value did not change": "Info-Zustände werden damit immer aktualisiert, auch wenn sich der Wert nicht ändert",
"Always update info states": "Info-Zustände immer aktualisieren",
"Client and Connection errors as info in log": "Client- und Verbindungs-Fehler als Info im Log",
"Create default event objects (facesDetected, hideKeyboard, etc.) at the first adapter startup": "Standard Event-Objekte (facesDetected, hideKeyboard, usw.) werden hiermit beim ersten Adapter-Start erzeugt",
"Create default event objects at adapter start": "Standard Event-Objekte beim Adapter-Start anlegen",
"Device Name": "Gerätename",
"Do not process published info more than every x seconds": "Publizierte Infos nicht öfter als alle x Sekunden verarbeiten",
"Do not verify user and password": "Benutzername und Passwort nicht verifizieren",
"Enabled": "Aktiviert",
"Expert Settings": "Experten-Einstellungen",
"Fully Browser Devices": "Fully-Browser-Geräte",
"Fully MQTT Adapter Documentation": "Fully-MQTT Adapter-Dokumentation",
"IP Address": "IP-Adresse",
"Log '... Command xxx successfully set to x' as 'debug' and not 'info'": "'... Command xxx successfully set to x' als 'Debug' und nicht als 'Info' im Log ausgeben",
"Logs client and connection errors as 'info' and not as 'error'": "Client- und Verbindungs-Fehler als 'Info' und nicht als 'Error' im Log ausgeben",
"MQTT Configuration": "MQTT-Konfiguration",
"MQTT Password": "MQTT-Passwort",
"Main Settings": "Haupt-Einstellungen",
"Password": "Passwort",
"Port is always required, but you can leave user name and password empty. Fully Browser App: Settings -> Other Settings -> MQTT Integration (PLUS)": "Die Angabe der Port-Nummer ist immer erforderlich, aber Benutzername und Passwort kann leer gelassen werden. Fully Browser App: Settings -> Other Settings -> MQTT Integration (PLUS)",
"Protocol": "Protokoll",
"Remote Admin Password": "Remote Admin Passwort",
"Successful commands as debug in log": "Erfolgreich gesendete Kommandos als Debug im Log",
"This disables the username and password verification": "Die Überprüfung von Benutzername und Passwort wird damit deaktiviert",
"User name": "Benutzername",
"Welcome to Fully MQTT adapter": "Willkommen beim Fully-MQTT Adapter",
"in milliseconds (500-15000, default: 6000)": "in Millisekunden (500-15000, Default: 6000)",
"in seconds (2-120, default: 30)": "in Sekunden (2-120, Default: 30)",
"in seconds (min: 5, default: 60); ignored if MQTT is used": "in Sekunden (min: 5, Default: 60); ignoriert wenn MQTT verwendet wird"
}
33 changes: 33 additions & 0 deletions admin/i18n/en/translations.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
{
"A detailed documentation with explanations and all further information can be found on this GitHub page:": "A detailed documentation with explanations and all further information can be found on this GitHub page:",
"Add new devices by clicking the plus (+) symbol...": "Add new devices by clicking the plus (+) symbol…",
"Always update info objects, even if value did not change": "Always update info objects, even if value did not change",
"Always update info states": "Always update info states",
"Client and Connection errors as info in log": "Client and Connection errors as info in log",
"Create default event objects (facesDetected, hideKeyboard, etc.) at the first adapter startup": "Create default event objects (facesDetected, hideKeyboard, etc.) at the first adapter startup",
"Create default event objects at adapter start": "Create default event objects at adapter start",
"Device Name": "Device Name",
"Do not process published info more than every x seconds": "Do not process published info more than every x seconds",
"Do not verify user and password": "Do not verify user and password",
"Enabled": "Enabled",
"Expert Settings": "Expert Settings",
"Fully Browser Devices": "Fully Browser Devices",
"Fully MQTT Adapter Documentation": "Fully MQTT Adapter Documentation",
"IP Address": "IP Address",
"Log '... Command xxx successfully set to x' as 'debug' and not 'info'": "Log '... Command xxx successfully set to x' as 'debug' and not 'info'",
"Logs client and connection errors as 'info' and not as 'error'": "Logs client and connection errors as 'info' and not as 'error'",
"MQTT Configuration": "MQTT Configuration",
"MQTT Password": "MQTT Password",
"Main Settings": "Main Settings",
"Password": "Password",
"Port is always required, but you can leave user name and password empty. Fully Browser App: Settings -> Other Settings -> MQTT Integration (PLUS)": "Port is always required, but you can leave user name and password empty. Fully Browser App: Settings -> Other Settings -> MQTT Integration (PLUS)",
"Protocol": "Protocol",
"Remote Admin Password": "Remote Admin Password",
"Successful commands as debug in log": "Successful commands as debug in log",
"This disables the username and password verification": "This disables the username and password verification",
"User name": "Username",
"Welcome to Fully MQTT adapter": "Welcome to Fully MQTT adapter",
"in milliseconds (500-15000, default: 6000)": "in milliseconds (500-15000, default: 6000)",
"in seconds (2-120, default: 30)": "in seconds (2-120, default: 30)",
"in seconds (min: 5, default: 60); ignored if MQTT is used": "in seconds (min: 5, default: 60); ignored if MQTT is used"
}
33 changes: 33 additions & 0 deletions admin/i18n/es/translations.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
{
"A detailed documentation with explanations and all further information can be found on this GitHub page:": "Puede encontrar una documentación detallada con explicaciones y toda la información adicional en esta página de GitHub:",
"Add new devices by clicking the plus (+) symbol...": "Agregue nuevos dispositivos haciendo clic en el símbolo más (+)...",
"Always update info objects, even if value did not change": "Siempre actualice los objetos de información, incluso si el valor no cambió",
"Always update info states": "Actualizar siempre los estados de información",
"Client and Connection errors as info in log": "Errores de cliente y conexión como información en el registro",
"Create default event objects (facesDetected, hideKeyboard, etc.) at the first adapter startup": "Cree objetos de eventos predeterminados (facesDetected, hideKeyboard, etc.) en el primer inicio del adaptador",
"Create default event objects at adapter start": "Crear objetos de eventos predeterminados al inicio del adaptador",
"Device Name": "Nombre del dispositivo",
"Do not process published info more than every x seconds": "No procesar información publicada más de cada x segundos",
"Do not verify user and password": "No verificar usuario y contraseña",
"Enabled": "Activado",
"Expert Settings": "Configuración experta",
"Fully Browser Devices": "Dispositivos completamente navegadores",
"Fully MQTT Adapter Documentation": "Documentación del adaptador completamente MQTT",
"IP Address": "Dirección IP",
"Log '... Command xxx successfully set to x' as 'debug' and not 'info'": "Registrar '... El comando xxx se configuró con éxito en x' como 'depuración' y no como 'información'",
"Logs client and connection errors as 'info' and not as 'error'": "Registra los errores de conexión y del cliente como 'información' y no como 'error'",
"MQTT Configuration": "Configuración MQTT",
"MQTT Password": "Contraseña MQTT",
"Main Settings": "Ajustes principales",
"Password": "Contraseña",
"Port is always required, but you can leave user name and password empty. Fully Browser App: Settings -> Other Settings -> MQTT Integration (PLUS)": "El puerto siempre es obligatorio, pero puede dejar el nombre de usuario y la contraseña vacíos. Aplicación de navegador completo: Configuración -> Otras configuraciones -> Integración MQTT (MÁS)",
"Protocol": "Protocolo",
"Remote Admin Password": "Contraseña de administrador remoto",
"Successful commands as debug in log": "Comandos exitosos como depuración en el registro",
"This disables the username and password verification": "Esto deshabilita la verificación de nombre de usuario y contraseña.",
"User name": "Nombre de usuario",
"Welcome to Fully MQTT adapter": "Bienvenido al adaptador completamente MQTT",
"in milliseconds (500-15000, default: 6000)": "en milisegundos (500-15000, predeterminado: 6000)",
"in seconds (2-120, default: 30)": "en segundos (2-120, predeterminado: 30)",
"in seconds (min: 5, default: 60); ignored if MQTT is used": "en segundos (mín.: 5, predeterminado: 60); ignorado si se usa MQTT"
}
33 changes: 33 additions & 0 deletions admin/i18n/fr/translations.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
{
"A detailed documentation with explanations and all further information can be found on this GitHub page:": "Une documentation détaillée avec des explications et toutes les autres informations peuvent être trouvées sur cette page GitHub :",
"Add new devices by clicking the plus (+) symbol...": "Ajoutez de nouveaux appareils en cliquant sur le symbole plus (+)...",
"Always update info objects, even if value did not change": "Toujours mettre à jour les objets d'information, même si la valeur n'a pas changé",
"Always update info states": "Toujours mettre à jour les états d'informations",
"Client and Connection errors as info in log": "Erreurs de client et de connexion sous forme d'informations dans le journal",
"Create default event objects (facesDetected, hideKeyboard, etc.) at the first adapter startup": "Créer des objets d'événement par défaut (facesDetected, hideKeyboard, etc.) au premier démarrage de l'adaptateur",
"Create default event objects at adapter start": "Créer des objets d'événement par défaut au démarrage de l'adaptateur",
"Device Name": "Nom de l'appareil",
"Do not process published info more than every x seconds": "Ne traitez pas les informations publiées plus de toutes les x secondes",
"Do not verify user and password": "Ne pas vérifier l'utilisateur et le mot de passe",
"Enabled": "Activé",
"Expert Settings": "Paramètres experts",
"Fully Browser Devices": "Appareils entièrement navigateurs",
"Fully MQTT Adapter Documentation": "Documentation complète de l'adaptateur MQTT",
"IP Address": "Adresse IP",
"Log '... Command xxx successfully set to x' as 'debug' and not 'info'": "Journal '... La commande xxx a été définie avec succès sur x' en tant que 'debug' et non 'info'",
"Logs client and connection errors as 'info' and not as 'error'": "Consigne les erreurs de client et de connexion en tant qu''info' et non en tant qu''erreur'",
"MQTT Configuration": "Configuration MQTT",
"MQTT Password": "Mot de passe MQTT",
"Main Settings": "Réglages principaux",
"Password": "Mot de passe",
"Port is always required, but you can leave user name and password empty. Fully Browser App: Settings -> Other Settings -> MQTT Integration (PLUS)": "Le port est toujours requis, mais vous pouvez laisser le nom d'utilisateur et le mot de passe vides. Application entièrement navigateur : Paramètres -> Autres paramètres -> Intégration MQTT (PLUS)",
"Protocol": "Protocole",
"Remote Admin Password": "Mot de passe administrateur distant",
"Successful commands as debug in log": "Commandes réussies en tant que débogage dans le journal",
"This disables the username and password verification": "Cela désactive la vérification du nom d'utilisateur et du mot de passe",
"User name": "Nom d'utilisateur",
"Welcome to Fully MQTT adapter": "Bienvenue dans l'adaptateur entièrement MQTT",
"in milliseconds (500-15000, default: 6000)": "en millisecondes (500-15000, par défaut : 6000)",
"in seconds (2-120, default: 30)": "en secondes (2-120, par défaut : 30)",
"in seconds (min: 5, default: 60); ignored if MQTT is used": "en secondes (min : 5, par défaut : 60) ; ignoré si MQTT est utilisé"
}
33 changes: 33 additions & 0 deletions admin/i18n/it/translations.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
{
"A detailed documentation with explanations and all further information can be found on this GitHub page:": "Una documentazione dettagliata con spiegazioni e tutte le ulteriori informazioni può essere trovata su questa pagina GitHub:",
"Add new devices by clicking the plus (+) symbol...": "Aggiungi nuovi dispositivi facendo clic sul simbolo più (+)...",
"Always update info objects, even if value did not change": "Aggiorna sempre gli oggetti info, anche se il valore non è cambiato",
"Always update info states": "Aggiorna sempre gli stati delle informazioni",
"Client and Connection errors as info in log": "Errori del client e della connessione come informazioni nel registro",
"Create default event objects (facesDetected, hideKeyboard, etc.) at the first adapter startup": "Crea oggetti evento predefiniti (facesDetected, hideKeyboard, ecc.) al primo avvio dell'adattatore",
"Create default event objects at adapter start": "Crea oggetti evento predefiniti all'avvio dell'adattatore",
"Device Name": "Nome del dispositivo",
"Do not process published info more than every x seconds": "Non elaborare le informazioni pubblicate più di ogni x secondi",
"Do not verify user and password": "Non verificare utente e password",
"Enabled": "Abilitato",
"Expert Settings": "Impostazioni avanzate",
"Fully Browser Devices": "Dispositivi completamente browser",
"Fully MQTT Adapter Documentation": "Documentazione completa dell'adattatore MQTT",
"IP Address": "Indirizzo IP",
"Log '... Command xxx successfully set to x' as 'debug' and not 'info'": "Registra \"... Il comando xxx è stato impostato correttamente su x\" come \"debug\" e non come \"info\"",
"Logs client and connection errors as 'info' and not as 'error'": "Registra gli errori del client e della connessione come \"info\" e non come \"errore\"",
"MQTT Configuration": "Configurazione MQTT",
"MQTT Password": "Password MQTT",
"Main Settings": "Impostazioni principali",
"Password": "Parola d'ordine",
"Port is always required, but you can leave user name and password empty. Fully Browser App: Settings -> Other Settings -> MQTT Integration (PLUS)": "La porta è sempre richiesta, ma puoi lasciare il nome utente e la password vuoti. App completamente browser: Impostazioni -> Altre impostazioni -> Integrazione MQTT (PLUS)",
"Protocol": "Protocollo",
"Remote Admin Password": "Password dell'amministratore remoto",
"Successful commands as debug in log": "Comandi riusciti come debug nel registro",
"This disables the username and password verification": "Ciò disabilita la verifica del nome utente e della password",
"User name": "Nome utente",
"Welcome to Fully MQTT adapter": "Benvenuto nell'adattatore Fully MQTT",
"in milliseconds (500-15000, default: 6000)": "in millisecondi (500-15000, predefinito: 6000)",
"in seconds (2-120, default: 30)": "in secondi (2-120, predefinito: 30)",
"in seconds (min: 5, default: 60); ignored if MQTT is used": "in secondi (min: 5, default: 60); ignorato se viene utilizzato MQTT"
}
Loading

0 comments on commit 3ba9b83

Please sign in to comment.