ExternalVendorCode/gns3-server
1
0
Fork 0
mirror of https://github.com/GNS3/gns3-server.git synced 2024-12-22 06:07:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
3,946 Commits 5 Branches 205 Tags 76 MiB
7fe8f7e716
Commit Graph

3946 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
pyup-bot
b1123acb8a Update pytest from 4.0.2 to 4.1.0 2019-01-06 23:05:37 +01:00
grossmj
c736051dda Fix tests. 2018-12-30 21:50:47 +07:00
grossmj
9ed181151f New node information dialog to display general, usage and command line information. 
Ref https://github.com/GNS3/gns3-gui/issues/2662 https://github.com/GNS3/gns3-gui/issues/2656
 2018-12-30 19:35:24 +07:00
Jeremy Grossmann
40f8a33331
Merge pull request #1489 from GNS3/pyup-update-sphinx-1.8.2-to-1.8.3 
Update sphinx to 1.8.3
 2018-12-27 00:50:23 +07:00
pyup-bot
2a1822fe12 Update sphinx from 1.8.2 to 1.8.3 2018-12-25 22:19:11 +01:00
Jeremy Grossmann
b66e42e650
Merge pull request #1488 from GNS3/pyup-update-aiohttp-3.5.0-to-3.5.1 
Update aiohttp to 3.5.1
 2018-12-25 19:21:15 +07:00
pyup-bot
485b8a3db4 Update aiohttp from 3.5.0 to 3.5.1 2018-12-25 08:44:09 +01:00
Jeremy Grossmann
eacc20cf07
Merge pull request #1487 from GNS3/pyup-update-aiohttp-3.4.4-to-3.5.0 
Update aiohttp to 3.5.0
 2018-12-24 17:48:10 +07:00
pyup-bot
e1c250a8dd Update aiohttp from 3.4.4 to 3.5.0 2018-12-23 10:14:05 +01:00
grossmj
eae9774d69 Support "usage" field for Dynamips, IOU, VirtualBox and VMware. Fixes https://github.com/GNS3/gns3-gui/issues/2657 2018-12-21 16:54:13 +08:00
grossmj
468145319d Merge 2.1 into 2.2 branch. 2018-12-21 15:24:34 +08:00
grossmj
ef38ccfefa Automatically create a symbolic link to the IOU image in the IOU working directory. Fixes #1484 2018-12-17 22:42:18 -06:00
grossmj
670b6d689a Merge remote-tracking branch 'origin/2.1' into 2.1 2018-12-14 19:53:51 -06:00
grossmj
fc75a6b8d3 Fix link pause/filters only work for the first interface of Docker containers. Fixes #1482 2018-12-14 19:53:43 -06:00
Jeremy Grossmann
ed7b91ae3a
Merge pull request #1481 from GNS3/pyup-update-pytest-4.0.1-to-4.0.2 
Update pytest to 4.0.2
 2018-12-14 11:49:43 -06:00
pyup-bot
d79f6b578d Update pytest from 4.0.1 to 4.0.2 2018-12-14 18:21:49 +01:00
grossmj
f76b329cba Fix ConnectionResetError issues and switch to aiohttp version 3.4.4. Fixes #1474. 2018-12-03 19:14:22 +08:00
grossmj
030714ae80 Fix server authentication. 2018-12-03 18:46:24 +08:00
grossmj
0fd54536d2 Fix issue when there is no gns3_controller.conf. Fixes https://github.com/GNS3/gns3-gui/issues/2644 2018-11-30 19:09:10 +08:00
grossmj
58b2ee152d Fix Docker console test. 2018-11-30 18:59:02 +08:00
grossmj
bec2270334 Fix non responsive console for Docker VMs. Fixes https://github.com/GNS3/gns3-gui/issues/2645 2018-11-30 17:06:21 +08:00
grossmj
56412b35e0 Merge branch '2.1' into 2.2 
# Conflicts:
#	gns3server/compute/docker/docker_vm.py
#	gns3server/utils/asyncio/telnet_server.py
 2018-11-30 12:38:02 +08:00
grossmj
9fbdb25da8 Back to classic symbol theme. Ref https://github.com/GNS3/gns3-gui/issues/2644 2018-11-29 17:14:21 +08:00
Jeremy Grossmann
647ac87c89
Merge pull request #1476 from ddragic/x11vnc 
Docker: fix x11vnc not starting
 2018-11-29 07:03:58 +07:00
Dušan Dragić
817a053dfc docker_vm: fix x11vnc not starting 2018-11-29 00:37:20 +01:00
Jeremy Grossmann
fb0456fdfa
Merge pull request #1475 from GNS3/naming-consistency 
Review and apply consistent naming
 2018-11-28 16:32:42 +07:00
grossmj
d7c2e16c21 Use "template" to name what we use to create new nodes. 2018-11-28 16:12:58 +07:00
grossmj
21c0a35f77 Use project instead of topology where appropriate. 2018-11-27 18:30:16 +07:00
grossmj
a17fa821bd Make sure nothing is named "compute server". 2018-11-27 18:14:51 +07:00
Jeremy Grossmann
b4a2bc5b47
Merge pull request #1467 from GNS3/symbol-themes 
Support symbol themes. Ref #1466
 2018-11-27 17:19:52 +07:00
grossmj
f39c27ff7b Allow usage property in Docker appliance. 2018-11-27 16:36:52 +07:00
Jeremy Grossmann
db982f5df7
Merge pull request #1473 from GNS3/kazkansouh-2.2-grid-new-project 
Improved grid support
 2018-11-27 16:34:00 +07:00
grossmj
a93606d9ed Use "node" instead of "appliance" for grid support. 2018-11-27 16:13:22 +07:00
grossmj
dd14101eec Merge branch '2.2-grid-new-project' of git://github.com/kazkansouh/gns3-server into kazkansouh-2.2-grid-new-project 2018-11-27 15:50:24 +07:00
grossmj
83161bcdd4 Merge remote-tracking branch 'origin/2.2' into 2.2 2018-11-27 15:47:29 +07:00
Jeremy Grossmann
df4e4bec24
Merge pull request #1472 from GNS3/docker-console-resize 
Telnet console resize support for Docker VM. Fixes #1471
 2018-11-27 15:17:34 +07:00
grossmj
60ac6d2dfe Telnet console resize support for Docker VM. 2018-11-27 15:06:56 +07:00
Jeremy Grossmann
1067f71952
Allow appliances to be loaded from file without the appliance id. 
Fixes https://github.com/GNS3/gns3-gui/issues/2639.
 2018-11-27 14:03:12 +07:00
Karim
8eb20525e8 Update schema to allow for drawing grid size to be part of project. 2018-11-26 15:31:28 +00:00
grossmj
c0a0a13bdd Avoid _fix_permissions() to be called twice when stopping Docker VM. Ref #1428 2018-11-26 15:53:24 +07:00
grossmj
a3044ede77 Fix _fix_permissions() garbles permissions in Docker VM. Ref #1428 2018-11-25 17:11:42 +07:00
grossmj
df3baffd9b Fix "None is not of type 'integer'" when opening project containing a Qemu VM. Fixes #2610. 2018-11-24 19:56:29 +07:00
grossmj
219c346187 Remove useless warning. 2018-11-24 17:04:16 +07:00
Jeremy Grossmann
6a2d1e9b33
Merge pull request #1465 from GNS3/pyup-update-pytest-4.0.0-to-4.0.1 
Update pytest to 4.0.1
 2018-11-24 16:08:58 +07:00
pyup-bot
e2231b1220 Update pytest from 4.0.0 to 4.0.1 2018-11-24 09:21:06 +01:00
grossmj
e0813bfbe8 Normalize symbol ID on Windows. 2018-11-23 18:47:42 +07:00
grossmj
9f7f26700e Debugging for Windows. 2018-11-23 18:33:45 +07:00
grossmj
51787295dd Use POSIX path for symbol ID. 2018-11-23 18:26:04 +07:00
grossmj
17d070dca7 Early support for symbol themes. 2018-11-23 17:27:10 +07:00
grossmj
301b7475f7 Sync appliances 2018-11-21 14:13:14 +07:00