Merge branch 'master' into 2.2

.github/workflows/publish_api_documentation.yml

@@ -0,0 +1,43 @@
+name: publish-api-documentation
+
+on:
+  workflow_dispatch:
+  push:
+    tags:
+      - v3.*
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+      with:
+        fetch-depth: 0
+        ref: "gh-pages"
+    - uses: actions/setup-python@v2
+      with:
+        python-version: 3.6
+    - name: Merge changes from 3.0 branch
+      run: |
+        git config user.name github-actions
+        git config user.email github-actions@github.com
+        git merge origin/3.0 -X theirs
+    - name: Install dependencies
+      run: |
+        python -m pip install --upgrade pip
+        if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
+    - name: Install GNS3 server
+      run: |
+        python setup.py install
+    - name: Generate the API documentation
+      run: |
+        cd scripts
+        python3 publish_api_documentation.py
+    - name: Publish the API documentation
+      run: |
+        git add docs
+        git status
+        git commit -m "Publish API documentation"
+        git push

gns3server/static/web-ui/3rdpartylicenses.txt

@@ -418,31 +418,6 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 
 
-angular2-hotkeys
-MIT
-The MIT License (MIT)
-
-Copyright (c) 2016 Nick Richardson
-
-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.
-
-
 angular2-indexeddb
 MIT
 The MIT License (MIT)

gns3server/static/web-ui/index.html

@@ -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.b8ab802a67c1c69cf879.js" defer></script></body>
+  <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>
 </html>

scripts/remote-install.sh

@@ -260,7 +260,7 @@ Conflicts=shutdown.target
 User=gns3
 Group=gns3
 PermissionsStartOnly=true
-Environment="PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
+EnvironmentFile=/etc/environment
 ExecStartPre=/bin/mkdir -p /var/log/gns3 /var/run/gns3
 ExecStartPre=/bin/chown -R gns3:gns3 /var/log/gns3 /var/run/gns3
 ExecStart=/usr/bin/gns3server --log /var/log/gns3/gns3.log