Merge branch 'master' of https://github.com/Ylianst/MeshCentral

apprelays.js

@@ -642,12 +642,14 @@ module.exports.CreateWebRelay = function (parent, db, args, domain) {
             }
         } else {
             // Tunnel is now in web socket pass-thru mode
-            if ((typeof header.connection == 'string') && (header.connection.toLowerCase() == 'upgrade')) {
-                // Websocket upgrade succesful
-                obj.socketParseState = 2;
-            } else {
-                // Unable to upgrade to web socket
-                obj.close();
+            if (header != null) {
+                if ((typeof header.connection == 'string') && (header.connection.toLowerCase() == 'upgrade')) {
+                    // Websocket upgrade succesful
+                    obj.socketParseState = 2;
+                } else {
+                    // Unable to upgrade to web socket
+                    obj.close();
+                }
             }
         }
     }

docs/docs/meshcentral/devicetabs.md

@@ -36,10 +36,10 @@ Chat
 
 Legend
 
-* **_Black color_**: Device is powered on
+* **_Black color_**: Device is powered on (Intel AMT & agents)
 * **_Purple color_**: Device is in sleep state (Intel AMT agents only)
 * **_Teal color_**: Device is connected through AMT/CIRA, but not powered on (Intel AMT agents only)
-* **_Grey color_**: Device is powered off (Intel AMT agents only)
+* **_Grey color_**: Device is powered off (Intel AMT & agents)
 
 ### Text Links
 
@@ -47,12 +47,12 @@ You can set alternate port in the link if it's not default by right-clicking.
 
 ![](images/general_alternateports.png)
 
-* Interfaces 
-* Location 
-* MeshCmd 
-* RDP 
-* Web-VNC 
-* Web-RDP 
+* Interfaces
+* Location
+* MeshCmd
+* RDP
+* Web-VNC
+* Web-RDP
 * Web-SSH
 * XTerm
 * HTTP
@@ -103,7 +103,7 @@ Right-clicking on Connect button allows you to:
 ![](images/terminal_connectbutton.png)
 
 ## Files
- 
+
 For transferring files to and from the agent.
 
 ## Events
@@ -131,6 +131,6 @@ Note you can show CPU and Memory usage info by clicking the icon in the top righ
 
 ## Console
 
-For debugging and communicating with the mesh agent. 
+For debugging and communicating with the mesh agent.
 
 It allows JS commands to be issued to the device but also run extra commands from the meshcore. Type `help` for all available options

translate/translate.json

@@ -28179,6 +28179,7 @@
     },
     {
       "en": "Gateway: {0}",
+      "nl": "Gateway: {0}",
       "xloc": [
         "default-mobile.handlebars->11->556",
         "default.handlebars->45->1453"
@@ -29324,12 +29325,14 @@
     {
       "de": "HTTP Verbindung",
       "en": "HTTP Connection",
+      "nl": "HTTP verbinding",
       "xloc": [
         "default.handlebars->45->750"
       ]
     },
     {
       "en": "HTTP remote connection port:",
+      "nl": "HTTP poort voor externe verbinding:",
       "xloc": [
         "default.handlebars->45->749"
       ]
@@ -29362,12 +29365,14 @@
     {
       "de": "HTTPS Verbindung",
       "en": "HTTPS Connection",
+      "nl": "HTTPS verbinding",
       "xloc": [
         "default.handlebars->45->752"
       ]
     },
     {
       "en": "HTTPS remote connection port:",
+      "nl": "HTTPS poort voor externe verbinding:",
       "xloc": [
         "default.handlebars->45->751"
       ]
@@ -39180,6 +39185,7 @@
     },
     {
       "en": "Mask: {0}",
+      "nl": "Mask: {0}",
       "xloc": [
         "default-mobile.handlebars->11->555",
         "default.handlebars->45->1452"
@@ -75613,9 +75619,6 @@
         "default-mobile.handlebars->11->144"
       ]
     },
-    {
-      "en": "Á/span>"
-    },
     {
       "cs": "↺",
       "da": "↺",
@@ -75875,4 +75878,4 @@
       ]
     }
   ]
-}
+}