Skip to content

Commit 4879c29

Browse files
rubinatorzrubinatorz
committed
Merge branch 'master' of https://github.com/rabobank-cdc/DeTTECT 
2 parents 752702f + bee6773 commit 4879c29

File tree

6 files changed

+8
-7
lines changed

6 files changed

+8
-7
lines changed

‎editor/dist/dettect-editor/index.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
<!DOCTYPE html><html lang="en"><head><meta charset="utf-8"><link rel="apple-touch-icon" sizes="76x76" href="apple-icon.png"><link rel="icon" type="image/png" sizes="96x96" href="favicon.png"><meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"><title>DeTT&CT Editor</title><meta name="viewport" content="width=device-width,initial-scale=1,maximum-scale=1.5"><link href="https://fonts.googleapis.com/css?family=Poppins:200,300,400,600,700,800" rel="stylesheet"><link href="https://use.fontawesome.com/releases/v5.0.6/css/all.css" rel="stylesheet"><link href="https://cdnjs.cloudflare.com/ajax/libs/bootstrap-rtl/3.4.0/css/bootstrap-rtl.css" rel="stylesheet"><link href="custom.css" rel="stylesheet"><link href="css/app.f93902b0.css" rel="preload" as="style"><link href="css/chunk-vendors.61e31f7f.css" rel="preload" as="style"><link href="js/app.3384ae9f.js" rel="preload" as="script"><link href="js/chunk-vendors.6d70f8e7.js" rel="preload" as="script"><link href="css/chunk-vendors.61e31f7f.css" rel="stylesheet"><link href="css/app.f93902b0.css" rel="stylesheet"></head><body><div class="wrapper" id="app"></div><script src="js/chunk-vendors.6d70f8e7.js"></script><script src="js/app.3384ae9f.js"></script></body></html>
1+
<!DOCTYPE html><html lang="en"><head><meta charset="utf-8"><link rel="apple-touch-icon" sizes="76x76" href="apple-icon.png"><link rel="icon" type="image/png" sizes="96x96" href="favicon.png"><meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"><title>DeTT&CT Editor</title><meta name="viewport" content="width=device-width,initial-scale=1,maximum-scale=1.5"><link href="https://fonts.googleapis.com/css?family=Poppins:200,300,400,600,700,800" rel="stylesheet"><link href="https://use.fontawesome.com/releases/v5.0.6/css/all.css" rel="stylesheet"><link href="https://cdnjs.cloudflare.com/ajax/libs/bootstrap-rtl/3.4.0/css/bootstrap-rtl.css" rel="stylesheet"><link href="custom.css" rel="stylesheet"><link href="css/app.f93902b0.css" rel="preload" as="style"><link href="css/chunk-vendors.61e31f7f.css" rel="preload" as="style"><link href="js/app.f3b98390.js" rel="preload" as="script"><link href="js/chunk-vendors.6d70f8e7.js" rel="preload" as="script"><link href="css/chunk-vendors.61e31f7f.css" rel="stylesheet"><link href="css/app.f93902b0.css" rel="stylesheet"></head><body><div class="wrapper" id="app"></div><script src="js/chunk-vendors.6d70f8e7.js"></script><script src="js/app.f3b98390.js"></script></body></html>

‎editor/dist/dettect-editor/js/app.3384ae9f.js‎

Lines changed: 0 additions & 2 deletions
This file was deleted.

‎editor/dist/dettect-editor/js/app.3384ae9f.js.map‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎editor/dist/dettect-editor/js/app.f3b98390.js‎

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎editor/dist/dettect-editor/js/app.f3b98390.js.map‎

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎editor/src/constants.js‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -94,18 +94,19 @@ export default {
9494
comment: '',
9595
auto_generated: false
9696
},
97-
PLATFORMS: ['all', 'PRE', 'Windows', 'macOS', 'Linux', 'Office Suite', 'SaaS', 'IaaS', 'Network', 'Containers', 'Identity Provider'],
97+
PLATFORMS: ['all', 'PRE', 'Windows', 'macOS', 'Linux', 'Office Suite', 'Identity Provider', 'SaaS', 'IaaS', 'Network Devices', 'Containers', 'ESXi'],
9898
PLATFORM_CONVERSION: {
9999
pre: 'PRE',
100100
windows: 'Windows',
101101
macos: 'macOS',
102102
linux: 'Linux',
103103
'office suite': 'Office Suite',
104+
'identity provider': 'Identity Provider',
104105
saas: 'SaaS',
105106
iaas: 'IaaS',
106-
network: 'Network',
107+
'network devices': 'Network Devices',
107108
containers: 'Containers',
108-
'identity provider': 'Identity Provider'
109+
'esxi': 'ESXi'
109110
},
110111
PLATFORMS_ICS: ['None'],
111112
PLATFORM_CONVERSION_ICS: {'none': 'None'},

0 commit comments

Comments
 (0)