Merge branch 'master' into dependabot/github_actions/actions/checkout-4

ioBroker · Nov 6, 2023 · 2bb0656 · 2bb0656
2 parents b7280b5 + 9ad34fb
commit 2bb0656
Show file tree

Hide file tree

Showing 121 changed files with 591 additions and 221 deletions.
diff --git a/.github/workflows/test-and-release.yml b/.github/workflows/test-and-release.yml
@@ -31,7 +31,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Use Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: 18.x
 
@@ -51,7 +51,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/setup-node@v3
+      - uses: actions/setup-node@v4
         with:
           node-version: 18.x
       - run: npm i
@@ -72,7 +72,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Use Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: ${{ matrix.node-version }}
 
@@ -106,7 +106,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Use Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: 18.x
 

diff --git a/CHANGELOG_OLD.md b/CHANGELOG_OLD.md
@@ -1,4 +1,15 @@
 The newest change log is in README.md
+## 7.0.8 (2023-06-12)
+* (klein0r) Corrected trigger block
+* (klein0r) Corrected typescript V5
+* (bluefox) coffescript was degraded to the previous version
+* (bluefox) tried to correct vscode font
+* (bluefox) reverted blockly to the previous version
+
+## 7.0.5 (2023-06-06)
+* (klein0r) reset timeouts in blockly
+* (klein0r) added additional blockly blocks
+
 ## 7.0.4 (2023-06-06)
 * (bluefox) packages updated
 * (bluefox) Files are used for export of scripts

diff --git a/README.md b/README.md
@@ -46,6 +46,16 @@ Since v5.5.0 of the JavaScript adapter the following locations (relative to the
 <!--
 	### **WORK IN PROGRESS**
 -->
+### **WORK IN PROGRESS**
+* (klein0r) Added function to format time difference `formatTimeDiff`
+* (klein0r) Added blockly blocks for `formatTimeDiff`
+
+### 7.1.6 (2023-10-24)
+* (bluefox) Fixed pushover rules block
+
+### 7.1.5 (2023-10-09)
+* (bluefox) Added play-ground for ChatGPT (API key required)
+
 ### 7.1.4 (2023-08-09)
 * (bluefox) Added version to the side menu
 * (klein0r) Added blockly blocks for `getHistory` and calculated times
@@ -58,17 +68,6 @@ Since v5.5.0 of the JavaScript adapter the following locations (relative to the
 * (klein0r) Updated blockly core to v9.3.3
 * (bluefox) corrected blockly
 
-### 7.0.8 (2023-06-12)
-* (klein0r) Corrected trigger block
-* (klein0r) Corrected typescript V5
-* (bluefox) coffescript was degraded to the previous version
-* (bluefox) tried to correct vscode font
-* (bluefox) reverted blockly to the previous version
-
-### 7.0.5 (2023-06-06)
-* (klein0r) reset timeouts in blockly
-* (klein0r) added additional blockly blocks
-
 ## License
 The MIT License (MIT)
 

diff --git a/admin-config/adminWords.js b/admin-config/adminWords.js
diff --git a/admin-config/i18n/de/translations.json b/admin-config/i18n/de/translations.json
@@ -1,5 +1,5 @@
 {
-  "Activate syntax help for these npm modules:": "Aktivieren Sie die Syntaxhilfe für diese npm-Module:",
+  "Activate syntax help for these npm modules:": "Die Syntaxhilfe für diese npm-Module aktivieren:",
   "Add module": "NPM-Modul hinzufügen",
   "Additional npm modules:": "Zusätzliche NPM-Module",
   "Allow self-signed certificates for URL requests": "Selbstsignierte Zertifikate für URL-Anfragen erlauben",
@@ -55,5 +55,5 @@
   "tooltip_libraries": "Zusätzliche NPM Pakete mit Komma getrennt. Man kann die Pakete mit require('name') benutzen.",
   "tooltip_longitude": "Der Längengrad im Format 5.345 für Astro-Funktion",
   "tooltip_useSystemGPS": "Die Koordinaten aus den Systemeinstellungen verwenden",
-  "Maximum setState requests per Minute per Script": "Maximale SetState-Anfragen pro Minute pro Skript"
+  "Maximum setState requests per Minute per Script": "Maximale setState-Anfragen pro Minute pro Skript"
 }
diff --git a/admin-config/i18n/ru/translations.json b/admin-config/i18n/ru/translations.json
@@ -1,5 +1,5 @@
 {
-  "Activate syntax help for these npm modules:": "Активируйте справку по синтаксису для этих модулей npm:",
+  "Activate syntax help for these npm modules:": "Активировать справку по синтаксису для этих модулей npm:",
   "Add module": "Добавить NPM модуль",
   "Additional npm modules:": "Дополнительные NPM Модули",
   "Allow self-signed certificates for URL requests": "Разрешить самоподписанные сертификаты для запросов URL",
@@ -51,9 +51,9 @@
   "tooltip_enableExec": "Разрешить вызывать exec в скриптах",
   "tooltip_enableSendToHost": "Разрешить посылать специальные сообщения в скриптах",
   "tooltip_enableSetObject": "Разрешить изменять системные объекты в скриптах",
-  "tooltip_latitude": "Широта в виде 5.435 для астро функций",
+  "tooltip_latitude": "Широта в виде 5.435 для астро-функций",
   "tooltip_libraries": "Дополнительные NPM пакеты через запятую. Их можно использовать в скриптах, как require('name').",
-  "tooltip_longitude": "Широта в виде 5.435 для астро функций",
+  "tooltip_longitude": "Широта в виде 5.435 для астро-функций",
   "tooltip_useSystemGPS": "Использовать координаты из системных настроек",
-  "Maximum setState requests per Minute per Script": "Максимальный наборГосударственные запросы в минуту на скрипт"
+  "Maximum setState requests per Minute per Script": "Максимальное количество setState запросов в минуту на скрипт"
 }
diff --git a/admin-config/index_m.html b/admin-config/index_m.html
@@ -522,7 +522,7 @@
             <div class="row">
                 <div class="input-field col s12">
                     <input class="value validate" placeholder="1000" id="maxSetStatePerMinute" type="number" min="20" max="100000">
-                    <span for="maxSetStatePerMinute" class="translate">Maximum setState requests per Minute per Script</span>
+                    <label for="maxSetStatePerMinute" class="translate">Maximum setState requests per Minute per Script</label>
                 </div>
             </div>
             <div class="row">
@@ -531,6 +531,12 @@
                     <span for="allowSelfSignedCerts" class="translate">Allow self-signed certificates for URL requests</span>
                 </div>
             </div>
+            <div class="row">
+                <div class="input-field col s12">
+                    <input class="value validate" id="gptKey" type="text">
+                    <label for="gptKey" class="translate">ChatGPT API key</label>
+                </div>
+            </div>
         </div>
         <div id="tab-astro" class="col s12 page">
             <div class="row top-padding">