Commit Graph

16 Commits

Author SHA1 Message Date
grossmj
33e8710495 Merge branch '2.1' into 2.2
# Conflicts:
#	gns3server/compute/docker/docker_vm.py
#	gns3server/controller/compute.py
#	gns3server/controller/gns3vm/__init__.py
#	gns3server/controller/link.py
#	gns3server/controller/project.py
#	gns3server/handlers/api/controller/project_handler.py
#	gns3server/handlers/api/controller/server_handler.py
#	gns3server/utils/asyncio/__init__.py
#	gns3server/utils/asyncio/telnet_server.py
#	gns3server/version.py
#	gns3server/web/web_server.py
#	tests/compute/qemu/test_qemu_vm.py
2018-08-29 15:57:54 +07:00
grossmj
59ce105a50 Fix exception with short names for Dynamips interfaces. Fixes #1386. 2018-08-21 19:46:14 +07:00
grossmj
dac3ba19b7 Merge branch '2.1' into 2.2
# Conflicts:
#	gns3server/controller/ports/port_factory.py
2018-08-13 22:06:44 +07:00
grossmj
23e83b730b Fix some more problems with interface short names. Fixes https://github.com/GNS3/gns3-gui/issues/2562 2018-08-13 15:45:24 +07:00
grossmj
e5d38811ca Fix incorrect short port names in topology summary. Fixes https://github.com/GNS3/gns3-gui/issues/2562 2018-08-13 15:10:21 +07:00
grossmj
ee5317948b Fix tests. 2018-04-06 14:32:06 +07:00
grossmj
7622c10cc9 Returns the ports' adapter types and mac addresses when available. 2018-04-06 13:19:17 +07:00
grossmj
90ce6093d8 Some spring cleaning. 2018-03-15 14:17:39 +07:00
Julien Duponchelle
19a6157f64
Fix wic numbering
Fix #1011
2017-05-12 09:48:05 +02:00
Julien Duponchelle
5409d9c3f8
Fix some port short name display issues
Fix https://github.com/GNS3/gns3-gui/issues/1940
2017-03-20 18:10:00 +01:00
Julien Duponchelle
58287b3638
Fix wrong short label for ethernet switch, hub & VPCS
Fix https://github.com/GNS3/gns3-gui/issues/1764
2017-01-09 16:48:42 +01:00
Julien Duponchelle
955a466be5
Ensure we can't connect to occupy port
Ref https://github.com/GNS3/gns3-gui/issues/1759
2017-01-06 10:29:56 +01:00
Julien Duponchelle
c06d2e3118
Fix short label diplay instead of custom interface labels
Fix https://github.com/GNS3/gns3-gui/issues/1742, https://github.com/GNS3/gns3-gui/issues/1752
2017-01-05 16:55:31 +01:00
Julien Duponchelle
cf3ed5a329
Fix port naming for FrameRelay switch
Fix #735
2016-10-26 11:59:16 +02:00
Julien Duponchelle
da5e3d0e54
Dissallow serial to ethernet connection
Fix #678
2016-09-15 14:51:40 +02:00
Julien Duponchelle
2f0e2260ab
Move the generation of the list of ports to the server
Ref #676
2016-09-14 15:21:37 +02:00