312 Commits

Author	SHA1	Message	Date
Julien Duponchelle	e5bc7c7a66	Merge branch '2.1' into embed_shell	2017-06-19 11:10:24 +02:00
Julien Duponchelle	bb8097a052	Merge remote-tracking branch 'origin/master' into 2.1	2017-06-19 10:44:52 +02:00
ziajka	5c0d955156	Fix: #1066 - Catching parsing errors at linked vbox file	2017-06-09 10:41:34 +02:00
ziajka	7235a312ab	Escaping VPCS name in regex #1067	2017-06-09 09:14:25 +02:00
Julien Duponchelle	ae328e5c50	Merge branch '2.1' into embed_shell	2017-06-07 18:21:41 +02:00
ziajka	eb6068c3d3	Fix Qemu disk creation with unicode characters not supported by local filesystem #1058 (#1063)	2017-06-07 12:35:41 +02:00
Julien Duponchelle	6a0345897d	Connector is no longer supported in ws_connect by aiohttp 2.0	2017-06-02 10:42:40 +02:00
Julien Duponchelle	7dfb634376	Fix for websocket usage with aiohttp 2.0 ... Fix #1050	2017-06-01 18:39:55 +02:00
Julien Duponchelle	93adef91d8	Merge branch '2.0' into 2.1	2017-05-31 16:58:31 +02:00
Julien Duponchelle	5616ab0e9a	Fake console for simple Ethernet switch ... Fix #454	2017-05-31 15:13:29 +02:00
Julien Duponchelle	b8ee8d69c8	Fix unexpected keyword argument 'conn_timeout' ... Fix #1047	2017-05-26 15:42:46 +02:00
Julien Duponchelle	5bb6c51698	Fix an error when logging Docker container fail to start	2017-05-23 13:31:04 +02:00
Julien Duponchelle	2a8911d19e	Keep DOCKER_MINIMUM_API_VERSION and DOCKER_MINIMUM_VERSION consistent	2017-05-23 11:00:15 +02:00
Bernhard Ehlers	8b7209ea78	Use docker version in error message of outdated docker installation	2017-05-23 10:41:42 +02:00
Bernhard Ehlers	7d48eba01b	Use versioned docker API ... Since docker v1.13 the unversioned docker API is deprecated. Backport of gns3-server 2.0, commit effbe59	2017-05-23 10:37:47 +02:00
Bernhard Ehlers	2191c487b6	Support images created by "docker commit". Fixes #1039	2017-05-23 10:23:11 +02:00
Jeremy Grossmann	82f1ab2be2	Merge pull request #1036 from GNS3/aiohttp_2.0 ... Aiohttp 2.0	2017-05-22 22:41:01 +02:00
Julien Duponchelle	a4245fcf44	Aiohttp 2.0 ... Ref #1000	2017-05-17 18:42:17 +02:00
grossmj	f338158654	Use 127.0.0.1 for local UDP tunnels to uBridge for Qemu. Ref #664.	2017-05-16 20:51:14 +02:00
Julien Duponchelle	cd17ef6b12	Merge branch '2.0' into 2.1	2017-05-15 15:46:50 +02:00
grossmj	bf38a8515e	Fix typo.	2017-05-12 18:54:54 +08:00
grossmj	942cc09eda	Fixes issue with connections when loading an ATM switch.	2017-05-12 18:00:58 +08:00
grossmj	18cfcaa081	Fixes ATM mapping.	2017-05-12 13:09:26 +08:00
grossmj	87d42f4eb9	Fixes Frame-relay VC mapping.	2017-05-12 12:39:01 +08:00
Julien Duponchelle	f31e46e8ed	Fix a race condition in logging when ubridge exit fast ... Fix #1025	2017-05-11 17:26:18 +02:00
Jeremy Grossmann	633cdef0bc	Merge pull request #987 from GNS3/nat_vmware ... NAT node can use the VMware NAT	2017-05-11 14:03:34 +08:00
grossmj	48dae085aa	Catch missing function listxattr on some Linux host.	2017-05-08 21:02:23 +07:00
Julien Duponchelle	3070a68273	Fix unicode error when reading ios configuration ... Fix #1013	2017-05-05 19:27:04 +02:00
Julien Duponchelle	bda36081a9	Fix AttributeError: 'NoneType' object has no attribute 'send' ... Fix #1014	2017-05-05 17:16:07 +02:00
Julien Duponchelle	04220846b3	Fix an error with ethernetswitch when ethertype is null ... Fix #1007	2017-05-04 10:33:02 +02:00
Julien Duponchelle	694a4e8068	Raise an error if we can't create the dynamips configuration directory ... Fix #992	2017-05-03 17:55:13 +02:00
Julien Duponchelle	31d1696215	Catch a race condition in VirtualBox when editing and linking ... Fix #993	2017-05-03 16:14:42 +02:00
Julien Duponchelle	078a6d8d34	Fix a race condition when editing a qemu vm and connecting it ... Fix #997	2017-05-03 16:01:51 +02:00
Bernhard Ehlers	ecba758c58	Docker aux console is a VT100 terminal ... Without that program like nano can't work. Signed-off-by: Julien Duponchelle <julien@gns3.net>	2017-05-03 10:30:43 +02:00
Bernhard Ehlers	56d91b648c	Fix connection to websocket with last docker release ... Fix https://github.com/GNS3/gns3-gui/issues/1994 Signed-off-by: Julien Duponchelle <julien@gns3.net>	2017-04-28 16:06:43 +02:00
Bernhard Ehlers	1b0f5c63b8	Fix connection to websocket with last docker release ... Fix https://github.com/GNS3/gns3-gui/issues/1994 Signed-off-by: Julien Duponchelle <julien@gns3.net>	2017-04-28 16:03:26 +02:00
Julien Duponchelle	b0f45035a9	NAT node can use the VMware NAT ... On Windows and Mac OS this allow the NAT node to use the VMware nat (it's always vmnet8). On Linux we still use the libvirt NAT	2017-04-27 15:26:58 +02:00
Julien Duponchelle	273a711459	Merge branch '2.0' into 2.1	2017-04-26 17:22:14 +02:00
Julien Duponchelle	1a90305baa	Docker minimum api is 1.25	2017-04-24 18:43:12 +02:00
Julien Duponchelle	effbe59414	Lock docker API to 1.27 ... Fix https://github.com/GNS3/gns3-gui/issues/1994	2017-04-24 17:51:55 +02:00
Julien Duponchelle	8b9f22c30c	Handling server disconnect error when docker daemon die ... Fix #985	2017-04-24 17:37:41 +02:00
Julien Duponchelle	7302f65ffe	Catch timeout error on docker ... Fix #981	2017-04-18 11:44:20 +02:00
Julien Duponchelle	62cd5e4aa3	Fix ghost vmware vms ... Fix #975	2017-04-11 15:05:31 +02:00
Julien Duponchelle	fdd1084714	Fix bridge 'bridge0' already exist when we have trouble with a container ... Fix #973	2017-04-10 16:58:00 +02:00
grossmj	5edb631b00	Fixes Qemu sata option. Ref #875.	2017-04-07 17:25:14 +08:00
Julien Duponchelle	4f1b738ef5	Merge branch '2.0' into 2.1	2017-03-30 10:16:16 +02:00
Julien Duponchelle	935ca17d7a	Allow to change some properties of an already connected ethernet switch ... Fix https://github.com/GNS3/gns3-gui/issues/1970	2017-03-29 13:22:24 +02:00
Julien Duponchelle	644616b69c	Ensure we start only one ubridge ... Fix https://github.com/GNS3/gns3-gui/issues/1964	2017-03-28 16:27:09 +02:00
Julien Duponchelle	84da9b4c23	Remove unused module import	2017-03-28 14:51:55 +02:00
Julien Duponchelle	2564740665	Fix limit of 20 docker containers ... Fix #963	2017-03-28 11:54:16 +02:00