Merge branch 'master' into 2.2

4 years ago · 4bc1e5e02e
parent d5b6fda270 720f52655e
commit 4bc1e5e02e
18 changed files with 35 additions and 37 deletions
--- a/gns3server/static/web-ui/.gitkeep
+++ b/gns3server/static/web-ui/.gitkeep
--- a/gns3server/static/web-ui/3rdpartylicenses.txt
+++ b/gns3server/static/web-ui/3rdpartylicenses.txt
@ -93,6 +93,8 @@ THE SOFTWARE.

@angular/material/checkbox

+@angular/material/chips
+
@angular/material/core

@angular/material/dialog
@ -1792,8 +1794,14 @@ the License, but only in their entirety and only with respect to the Combined
 Software.


+ng-circle-progress
+MIT
+
 ng2-file-upload

+ngx-childprocess
+MIT
+
 ngx-device-detector
 MIT
 The MIT License
@ -2674,30 +2682,6 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.


-webpack
-MIT
-Copyright JS Foundation and other contributors
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-'Software'), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-
 zone.js
 MIT
 The MIT License
--- a/gns3server/static/web-ui/index.html
+++ b/gns3server/static/web-ui/index.html
@ -33,9 +33,19 @@
        }
      })();
    </script>
-  <link rel="stylesheet" href="styles.06678052914fe71fbfae.css"></head>
+  <link rel="stylesheet" href="styles.b9b50fa6f0efb42b5d70.css"></head>
  <!-- <body class="mat-app-background" oncontextmenu="return false;"> -->
  <body class="mat-app-background" oncontextmenu="return false;">
    <app-root></app-root>
-  <script src="runtime.3b1df53b846aa25ed7e6.js" defer></script><script src="polyfills-es5.8928d61b0c56a8998c1c.js" nomodule defer></script><script src="polyfills.b9cf08f4f6defdfd6c4f.js" defer></script><script src="main.89a8d561ddbdc1d9fa28.js" defer></script></body>
+    <script async src="https://www.googletagmanager.com/gtag/js?id=G-5D6FZL9923"></script>
+    <script>
+      window.dataLayer = window.dataLayer || [];
+      function gtag()
+
+      {dataLayer.push(arguments);}
+      gtag('js', new Date());
+
+      gtag('config', 'G-5D6FZL9923');
+    </script>
+  <script src="runtime.a8ef3a8272419c2e2c66.js" defer></script><script src="polyfills-es5.adfecedb3e8b94a475d4.js" nomodule defer></script><script src="polyfills.312ad1f991887572d9bc.js" defer></script><script src="main.c31c0c40fa0fcdc2cdcf.js" defer></script></body>
 </html>
--- a/gns3server/static/web-ui/main.89a8d561ddbdc1d9fa28.js
+++ b/gns3server/static/web-ui/main.89a8d561ddbdc1d9fa28.js
--- a/gns3server/static/web-ui/main.c31c0c40fa0fcdc2cdcf.js
+++ b/gns3server/static/web-ui/main.c31c0c40fa0fcdc2cdcf.js
--- a/gns3server/static/web-ui/main.c31c0c40fa0fcdc2cdcf.js.map
+++ b/gns3server/static/web-ui/main.c31c0c40fa0fcdc2cdcf.js.map
--- a/gns3server/static/web-ui/polyfills-es5.8928d61b0c56a8998c1c.js
+++ b/gns3server/static/web-ui/polyfills-es5.8928d61b0c56a8998c1c.js
--- a/gns3server/static/web-ui/polyfills-es5.adfecedb3e8b94a475d4.js
+++ b/gns3server/static/web-ui/polyfills-es5.adfecedb3e8b94a475d4.js
--- a/gns3server/static/web-ui/polyfills-es5.adfecedb3e8b94a475d4.js.map
+++ b/gns3server/static/web-ui/polyfills-es5.adfecedb3e8b94a475d4.js.map
--- a/gns3server/static/web-ui/polyfills.312ad1f991887572d9bc.js
+++ b/gns3server/static/web-ui/polyfills.312ad1f991887572d9bc.js
--- a/gns3server/static/web-ui/polyfills.312ad1f991887572d9bc.js.map
+++ b/gns3server/static/web-ui/polyfills.312ad1f991887572d9bc.js.map
--- a/gns3server/static/web-ui/polyfills.b9cf08f4f6defdfd6c4f.js
+++ b/gns3server/static/web-ui/polyfills.b9cf08f4f6defdfd6c4f.js
--- a/gns3server/static/web-ui/runtime.a8ef3a8272419c2e2c66.js
+++ b/gns3server/static/web-ui/runtime.a8ef3a8272419c2e2c66.js
--- a/gns3server/static/web-ui/runtime.a8ef3a8272419c2e2c66.js.map
+++ b/gns3server/static/web-ui/runtime.a8ef3a8272419c2e2c66.js.map
--- a/gns3server/static/web-ui/styles.06678052914fe71fbfae.css
+++ b/gns3server/static/web-ui/styles.06678052914fe71fbfae.css
--- a/gns3server/static/web-ui/styles.b9b50fa6f0efb42b5d70.css
+++ b/gns3server/static/web-ui/styles.b9b50fa6f0efb42b5d70.css
--- a/gns3server/static/web-ui/theme-default-dark.css
+++ b/gns3server/static/web-ui/theme-default-dark.css
--- a/gns3server/static/web-ui/theme-default.css
+++ b/gns3server/static/web-ui/theme-default.css