NgTech-LTD/gns3-server
2
0 Fork 0
mirror of https://github.com/GNS3/gns3-server.git synced 2026-11-03 05:51:15 +02:00
Code Issues Packages Projects Releases Wiki Activity
3,873 Commits 5 Branches 229 Tags
56412b35e0afe550424945636156efc69b8b3d32
Commit Graph
3873 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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 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
grossmj f442c6e9e1 Sync appliances 2018-11-21 14:12:38 +07:00
Jeremy Grossmann 2a3825543a Merge pull request #1450 from GNS3/pyup-update-sphinx-1.7.1-to-1.8.2 
Update sphinx to 1.8.2
 2018-11-20 17:13:53 +07:00
Jeremy Grossmann df0f0c5b83 Merge branch '2.2' into pyup-update-sphinx-1.7.1-to-1.8.2 2018-11-20 17:06:42 +07:00
grossmj 2e79da5fe1 Fix broken examples in API documentation. 2018-11-20 16:24:59 +07:00
grossmj 4e2b8bfe7c Add more information about appliances to the API documentation. 2018-11-20 16:21:33 +07:00
grossmj 68ecbffcf1 Use Python3.6 to build the API documentation. 2018-11-20 15:35:46 +07:00
grossmj 1289d20a14 Add missing files for API documentation. 2018-11-20 15:19:44 +07:00
grossmj 53928b884f Bump version to 2.2.0dev5 2018-11-20 14:37:38 +07:00
grossmj bc5eda8259 Restore previously removed test. 2018-11-20 14:36:18 +07:00
grossmj ff5ba3742e Update API documentation for appliance endpoints. Ref https://github.com/GNS3/gns3-gui/issues/2630 2018-11-20 13:04:27 +07:00
grossmj e5950674f8 Merge remote-tracking branch 'origin/2.2' into 2.2 2018-11-20 00:22:35 +07:00
grossmj 5cb0957f35 Require privileged access for uBridge when using VMware VMs and Docker containers. Fixes #1461. 2018-11-20 00:22:16 +07:00
Jeremy Grossmann 7385d67c39 Merge pull request #1457 from GNS3/pyup-update-pytest-timeout-1.2.1-to-1.3.3 
Update pytest-timeout to 1.3.3
 2018-11-19 17:49:46 +07:00
Jeremy Grossmann e8cb8d29d8 Merge pull request #1454 from GNS3/pyup-update-pytest-3.8.1-to-4.0.0 
Update pytest to 4.0.0
 2018-11-19 17:49:10 +07:00
grossmj 3fae6ada95 Only require privileged access for uBridge when connecting a cloud to an Ethernet/TAP interface. Fixes #1461. 2018-11-19 17:33:17 +07:00
Jeremy Grossmann ca6a0708a8 Merge pull request #1462 from GNS3/use-files-as-disk-images 
Allow virtual machines to use files in project directory as disk images.
 2018-11-19 16:41:36 +07:00
grossmj 3727487730 Fix test on Windows. 2018-11-19 16:09:39 +07:00
grossmj 3497deaa31 Allow virtual machines to use files in project directory as disk images. 2018-11-19 15:53:43 +07:00
Jeremy Grossmann 3861d6a274 Merge pull request #1459 from GNS3/duplicate-appliance 
Support to duplicate an appliance via API. Fixes https://github.com/GNS3/gns3-gui/issues/2618
 2018-11-18 17:57:10 +07:00
grossmj bd657c0167 Support to duplicate an appliance. 2018-11-18 17:05:16 +07:00
grossmj 9b83b087cb Fix mac address schema validation for Qemu VM appliance. Fixes https://github.com/GNS3/gns3-gui/issues/2629 2018-11-18 16:20:50 +07:00
grossmj a33b8eac3a Support "L1 keepalives" in IOU appliance schema. 2018-11-18 16:04:08 +07:00
grossmj c7b8c347d7 Remove problematic test when run on Travis. 2018-11-18 00:08:40 +07:00