Merge branch 'master' into 2.2

3 years ago · 18c878429f
parent 6c3a070733 a157ef5a8a
commit 18c878429f
13 changed files with 35 additions and 18 deletions
--- a/gns3server/static/web-ui/3rdpartylicenses.txt
+++ b/gns3server/static/web-ui/3rdpartylicenses.txt
@ -2526,6 +2526,23 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.


+spark-md5
+WTFPL
+            DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
+                    Version 2, December 2004
+
+ Copyright (C) 2015 André Cruz <amdfcruz@gmail.com>
+
+ Everyone is permitted to copy and distribute verbatim or modified
+ copies of this license document, and changing it is allowed as long
+ as the name is changed.
+
+            DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. You just DO WHAT THE FUCK YOU WANT TO.
+
+
 svg-crowbar
 MIT
 Copyright (c) 2013 The New York Times
--- a/gns3server/static/web-ui/index.html
+++ b/gns3server/static/web-ui/index.html
@ -1,10 +1,10 @@
 <!DOCTYPE html>
 <html lang="en">
  <head>
-    <meta charset="utf-8" />
+    <meta charset="utf-8"/>
    <title>GNS3 Web UI</title>
    <!-- It's important to have base here because of the script below //-->
-    <base href="/static/web-ui/">
+    <base href="/static/web-ui/"/>

    <script>
      var userAgent = navigator.userAgent.toLowerCase();
@ -20,8 +20,8 @@
      }
    </script>

-    <meta name="viewport" content="width=device-width, initial-scale=1" />
-    <link rel="icon" type="image/x-icon" href="assets/favicon.ico" />
+    <meta name="viewport" content="width=device-width, initial-scale=1"/>
+    <link rel="icon" type="image/x-icon" href="assets/favicon.ico"/>

    <script type="application/javascript">
      // Github Pages redirection
@ -33,12 +33,12 @@
        }
      })();
    </script>
-  <link rel="stylesheet" href="styles.93c3010ec8fa34732040.css"></head>
+  <link rel="stylesheet" href="styles.2c581a0a91b7aa4f301d.css"><link rel="stylesheet" href="theme-default-dark.0c2d0b433828ffcae19b.css"><link rel="stylesheet" href="theme-default.3b76617748d593b91f1e.css"></head>
  <!-- <body class="mat-app-background" oncontextmenu="return false;"> -->
  <body class="mat-app-background" oncontextmenu="return false;">
    <app-root></app-root>
    <!-- Global site tag (gtag.js) - Google Analytics -->
-    <script async src="https://www.googletagmanager.com/gtag/js?id=G-5D6FZL9923"></script>
+    <script async="" src="https://www.googletagmanager.com/gtag/js?id=G-5D6FZL9923"></script>
    <script>
      window.dataLayer = window.dataLayer || [];
      function gtag()
@ -48,5 +48,5 @@

      gtag('config', 'G-5D6FZL9923');
    </script>
-  <script src="runtime.acf0dec4155e77772545.js" defer></script><script src="polyfills-es5.81e70f503de320d59b44.js" nomodule defer></script><script src="polyfills.7ae454d57e44d75e5d10.js" defer></script><script src="main.8367ffc0bf45ea7cf3c7.js" defer></script></body>
+  <script src="runtime.b3b0f3122d9d931b48a7.js" defer></script><script src="polyfills-es5.0e607f2e1ad7b467b484.js" nomodule defer></script><script src="polyfills.d6c8f09f3c92e4ec2a1f.js" defer></script><script src="main.653d70aeac9ae0ee8541.js" defer></script></body>
 </html>
--- a/gns3server/static/web-ui/main.653d70aeac9ae0ee8541.js
+++ b/gns3server/static/web-ui/main.653d70aeac9ae0ee8541.js
--- a/gns3server/static/web-ui/main.8367ffc0bf45ea7cf3c7.js
+++ b/gns3server/static/web-ui/main.8367ffc0bf45ea7cf3c7.js
--- a/gns3server/static/web-ui/polyfills-es5.0e607f2e1ad7b467b484.js
+++ b/gns3server/static/web-ui/polyfills-es5.0e607f2e1ad7b467b484.js
--- a/gns3server/static/web-ui/polyfills-es5.81e70f503de320d59b44.js
+++ b/gns3server/static/web-ui/polyfills-es5.81e70f503de320d59b44.js
--- a/gns3server/static/web-ui/polyfills.7ae454d57e44d75e5d10.js
+++ b/gns3server/static/web-ui/polyfills.7ae454d57e44d75e5d10.js
--- a/gns3server/static/web-ui/polyfills.d6c8f09f3c92e4ec2a1f.js
+++ b/gns3server/static/web-ui/polyfills.d6c8f09f3c92e4ec2a1f.js
--- a/gns3server/static/web-ui/runtime.b3b0f3122d9d931b48a7.js
+++ b/gns3server/static/web-ui/runtime.b3b0f3122d9d931b48a7.js
--- a/gns3server/static/web-ui/styles.2c581a0a91b7aa4f301d.css
+++ b/gns3server/static/web-ui/styles.2c581a0a91b7aa4f301d.css
--- a/gns3server/static/web-ui/styles.93c3010ec8fa34732040.css
+++ b/gns3server/static/web-ui/styles.93c3010ec8fa34732040.css
--- a/gns3server/static/web-ui/theme-default-dark.0c2d0b433828ffcae19b.css
+++ b/gns3server/static/web-ui/theme-default-dark.0c2d0b433828ffcae19b.css
--- a/gns3server/static/web-ui/theme-default.3b76617748d593b91f1e.css
+++ b/gns3server/static/web-ui/theme-default.3b76617748d593b91f1e.css