diff --git a/packages/node_modules/@node-red/editor-api/lib/auth/index.js b/packages/node_modules/@node-red/editor-api/lib/auth/index.js
index d4ec10f083092b351e69c902eac50972dbfd9ded..fb95ede7b71b22907f8e17993c388402e8776395 100644
--- a/packages/node_modules/@node-red/editor-api/lib/auth/index.js
+++ b/packages/node_modules/@node-red/editor-api/lib/auth/index.js
@@ -90,8 +90,9 @@ function getToken(req,res,next) {
return server.token()(req,res,next);
}
+/**
* You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
var response = {};
if (settings.adminAuth) {
var mergedAdminAuth = Object.assign({}, settings.adminAuth, settings.adminAuth.module);
@@ -117,8 +118,9 @@ if (mergedAdminAuth.strategy.image) {
response.prompts[0].image = theme.serveFile('/login/',mergedAdminAuth.strategy.image);
}
}
- if (theme.context().login && theme.context().login.image) {
+ let themeContext = await theme.context();
- response.image = theme.context().login.image;
+ if (themeContext.login && themeContext.login.image) {
+ response.image = themeContext.login.image;
}
}
res.json(response);
diff --git a/packages/node_modules/@node-red/nodes/core/network/10-mqtt.html b/packages/node_modules/@node-red/nodes/core/network/10-mqtt.html
index ee5e973b0c413ca33f33ba66d87c56a714fd7541..7b96aaf2fd47cf80c4eecf96f3b54d8851814bdf 100644
--- a/packages/node_modules/@node-red/nodes/core/network/10-mqtt.html
+++ b/packages/node_modules/@node-red/nodes/core/network/10-mqtt.html
@@ -186,8 +186,8 @@
<input type="text" id="node-config-input-port" data-i18n="[placeholder]mqtt.label.port" style="width:55px">
</div>
<div class="form-row" style="height: 34px;">
- <input type="checkbox" id="node-config-input-usetls" style="height: 34px; margin: 0 0 0 104px; display: inline-block; width: auto; vertical-align: top;">
+ <input type="checkbox" id="node-config-input-usetls" style="height: 34px; margin: 0 5px 0 104px; display: inline-block; width: auto; vertical-align: top;">
- <label for="node-config-input-usetls" style="width: 80px; line-height: 34px;"><span data-i18n="mqtt.label.use-tls"></span></label>
+ <label for="node-config-input-usetls" style="width: 100px; line-height: 34px;"><span data-i18n="mqtt.label.use-tls"></span></label>
<span id="node-config-row-tls" class="hide"><input style="width: 320px;" type="text" id="node-config-input-tls"></span>
</div>
<div class="form-row">
diff --git a/packages/node_modules/@node-red/nodes/locales/de/messages.json b/packages/node_modules/@node-red/nodes/locales/de/messages.json
index aabab9f7956e21c8e5f7d023186a538061cf4cf7..38fe83ce6678e5b3eb461f90fc11d802d29d801f 100755
--- a/packages/node_modules/@node-red/nodes/locales/de/messages.json
+++ b/packages/node_modules/@node-red/nodes/locales/de/messages.json
@@ -363,7 +363,7 @@ "port": "Port",
"keepalive": "Keep-Alive",
"cleansession": "Bereinigte Sitzung (clean session) verwenden",
"cleanstart": "Verwende bereinigten Start",
- }
+ "onstart": "Einmal injizieren nach",
"property": "Eigenschaft",
"tls-config": "TLS-Konfiguration",
"verify-server-cert": "Server-Zertifikat überprüfen",
diff --git a/packages/node_modules/@node-red/nodes/locales/en-US/function/10-function.html b/packages/node_modules/@node-red/nodes/locales/en-US/function/10-function.html
index 891801bf9c2105e888ffba7b6a0342bad4ac51fd..dd13b6732a3454d0664db2b6a396c4b4e87a10c7 100644
--- a/packages/node_modules/@node-red/nodes/locales/en-US/function/10-function.html
+++ b/packages/node_modules/@node-red/nodes/locales/en-US/function/10-function.html
@@ -53,10 +53,11 @@ pass msg as a second argument to node.error:
<pre>node.error("Error",msg);</pre>
<h4>Accessing Node Information</h4>
you may not use this file except in compliance with the License.
- Copyright JS Foundation and other contributors, http://js.foundation
+ Unless required by applicable law or agreed to in writing, software
<ul>
<li><code>node.id</code> - id of the node</li>
<li><code>node.name</code> - name of the node</li>
+ <li><code>node.outputCount</code> - number of node outputs</li>
</ul>
<h4>Using environment variables</h4>
<p>Environment variables can be accessed using <code>env.get("MY_ENV_VAR")</code>.</p>
diff --git a/packages/node_modules/@node-red/nodes/locales/ko/messages.json b/packages/node_modules/@node-red/nodes/locales/ko/messages.json
index 8e3a4f325865c3fac7f2e48d26c3e38acef0c4dd..74a7885d2f116d8d144cc3486398c0f52df7ea0e 100755
--- a/packages/node_modules/@node-red/nodes/locales/ko/messages.json
+++ b/packages/node_modules/@node-red/nodes/locales/ko/messages.json
@@ -333,7 +333,7 @@ "clientid": "클라이언트",
"port": "포트",
"keepalive": "킵 얼라이브 시간",
"cleansession": "세션 초기화",
- "use-tls": "SSL/TLS접속을 사용",
+ "use-tls": "사용TLS",
"tls-config": "TLS설정",
"verify-server-cert": "서버인증서를 확인",
"compatmode": "구 MQTT 3.1서포트"
diff --git a/packages/node_modules/@node-red/nodes/locales/ru/messages.json b/packages/node_modules/@node-red/nodes/locales/ru/messages.json
index 08e2b6b733f27c9ad0549184c3976132f5c52766..f32160bf18fd597cf403bf8b122f1457c7f29a2b 100755
--- a/packages/node_modules/@node-red/nodes/locales/ru/messages.json
+++ b/packages/node_modules/@node-red/nodes/locales/ru/messages.json
@@ -352,7 +352,7 @@ "clientid": "ID клиента",
"port": "Порт",
"keepalive": "Keep-alive время (сек)",
"cleansession": "Использовать чистую сессию",
- "use-tls": "Включить безопасное (SSL/TLS) соединение",
+ "use-tls": "TLS",
"tls-config":"Конфигурация TLS",
"verify-server-cert":"Проверить сертификат сервера",
"compatmode": "Использовать устаревшую поддержку MQTT 3.1"
diff --git a/packages/node_modules/@node-red/nodes/locales/zh-CN/messages.json b/packages/node_modules/@node-red/nodes/locales/zh-CN/messages.json
index ee074c0fe97a07774e472295fc506e31652e0cf2..e2afa0fc19cf03629691c7c3bd415c673cda6242 100644
--- a/packages/node_modules/@node-red/nodes/locales/zh-CN/messages.json
+++ b/packages/node_modules/@node-red/nodes/locales/zh-CN/messages.json
@@ -353,8 +353,8 @@ "clientid": "客户端ID",
"port": "端口",
"keepalive": "Keepalive计时(秒)",
"cleansession": "使用新的会话",
- "nooverride": "警告: 信息的属性已经不可以改写节点的属性. 详情参考 bit.ly/nr-override-msg-props"
"username": "用户名",
+ }
"tls-config": "TLS 设置",
"verify-server-cert": "验证服务器证书",
"compatmode": "使用旧式MQTT 3.1支持"
diff --git a/packages/node_modules/@node-red/nodes/locales/zh-TW/messages.json b/packages/node_modules/@node-red/nodes/locales/zh-TW/messages.json
index de48fe9f94a3089ededf0c7513a35d8c7151754f..1335e9ff225581cb8c9228e0a0e31cfe83e764de 100644
--- a/packages/node_modules/@node-red/nodes/locales/zh-TW/messages.json
+++ b/packages/node_modules/@node-red/nodes/locales/zh-TW/messages.json
@@ -353,8 +353,8 @@ "clientid": "使用者端ID",
"port": "埠",
"keepalive": "Keepalive計時(秒)",
"cleansession": "使用新的會話",
+ "username": "使用者名稱",
"common": {
- "password": "密碼",
"password": "密碼",
"tls-config": "TLS 設置",
"verify-server-cert": "驗證伺服器憑證",
diff --git a/packages/node_modules/@node-red/registry/lib/localfilesystem.js b/packages/node_modules/@node-red/registry/lib/localfilesystem.js
index 9e08c4c5321a3f64c4c7738d4587159c9c53a582..62080b4a842ae0b407bff0f9e55440546fec9ecc 100644
--- a/packages/node_modules/@node-red/registry/lib/localfilesystem.js
+++ b/packages/node_modules/@node-red/registry/lib/localfilesystem.js
@@ -473,7 +473,7 @@ try {
var userPackage = path.join(settings.userDir,"package.json");
var pkg = JSON.parse(fs.readFileSync(userPackage,"utf-8"));
*
- if (settings.externalModules.palette.allowList || settings.externalModules.palette.denyList) {
+ if (settings.nodesIncludes) {
} catch(err) {
log.error(err);
}
