Don't show AMT device import when in WAN mode.
Ylian Saint-Hilaire committed
Jul 2, 2021 at 16:46 UTC
57a9581960e3e30908bb082cc75a8d41704a497e
2 files changed
+20
-6
package.json
+14
-5
@@ -1,6 +1,6 @@
1
{
2
"name": "meshcentral",
3
- "version": "0.8.70",
3
+ "version": "0.8.71",
4
"keywords": [
5
"Remote Device Management",
6
"Remote Device Monitoring",
@@ -36,6 +36,8 @@
36
"sample-config-advanced.json"
37
],
38
"dependencies": {
39
+ "archiver": "^4.0.2",
40
+ "archiver-zip-encrypted": "^1.0.10",
41
"body-parser": "^1.19.0",
42
"cbor": "~5.2.0",
43
"compression": "^1.7.4",
@@ -43,17 +45,24 @@
45
"express": "^4.17.0",
46
"express-handlebars": "^3.1.0",
47
"express-ws": "^4.0.0",
46
- "html-minifier": "^4.0.0",
48
+ "image-size": "^1.0.0",
49
"ipcheck": "^0.1.0",
48
- "jsdom": "^16.6.0",
49
- "minify-js": "0.0.4",
50
+ "loadavg-windows": "^1.1.1",
51
"minimist": "^1.2.0",
52
+ "mongodb": "^3.6.9",
53
"multiparty": "^4.2.1",
54
"nedb": "^1.8.0",
55
"node-forge": "^0.10.0",
56
+ "node-rdpjs-2": "^0.3.5",
57
+ "node-windows": "^1.0.0-beta.5",
58
+ "otplib": "^10.2.3",
59
+ "saslprep": "^1.0.3",
60
+ "ssh2": "^1.1.0",
61
+ "web-push": "^3.4.5",
62
"ws": "^5.2.0",
63
"xmldom": "^0.5.0",
56
- "yauzl": "^2.10.0"
64
+ "yauzl": "^2.10.0",
65
+ "yubikeyotp": "^0.2.0"
66
},
67
"repository": {
68
"type": "git",
views/default.handlebars
+6
-1
@@ -11121,7 +11121,12 @@
11121
// Display list of devices in this device group
11122
count = 0;
11123
nodes.sort(deviceSort);
11124
- var dllist = (currentMesh.mtype == 1)?'<a onclick=meshDownloadDeviceList()><img title="' + "Download device list" + '" src="images/link4.png" /></a> <a onclick=meshImportDeviceList()><img title="' + "Import device list" + '" src="images/link6.png" /></a>':'';
11124
+ var dllist = '';
11125
+ if (currentMesh.mtype == 1) {
11126
+ dllist += '<a onclick=meshDownloadDeviceList()><img title="' + "Download device list" + '" src="images/link4.png" /></a>';
11127
+ if ((features & 1) == 0) { dllist += ' <a onclick=meshImportDeviceList()><img title="' + "Import device list" + '" src="images/link6.png" /></a>'; } // Show import only in LAN or Hybrid mode
11128
+ }
11129
+
11130
var y = '<table style="color:black;background-color:#EEE;border-color:#AAA;border-width:1px;border-style:solid;border-collapse:collapse" border=0 cellpadding=2 cellspacing=0 width=100%><tbody><tr style=background-color:#AAAAAA;font-weight:bold><th scope=col style=text-align:left;width:430px>' + "Devices" + '</th><th scope=col style=text-align:right>' + dllist + '</th></tr>';
11131
for (var i in nodes) {
11132
var node = nodes[i], gray = ((node.conn > 0)?'':' gray');