17 Commits

Author	SHA1	Message	Date
Julien Duponchelle	359abb0286	Revert "Merge branch 'unstable'" ... This reverts commit 929c337e8b, reversing changes made to b9bc73fd01.	2015-04-30 16:43:30 +02:00
Jeremy	929c337e8b	Merge branch 'unstable' ... Conflicts: gns3server/modules/virtualbox/__init__.py gns3server/version.py tests/modules/test_manager.py	2015-04-29 16:29:45 -06:00
Jeremy Grossmann	4f021054e0	Merge pull request #158 from GNS3/keep_iou_config ... Do not erase the IOU initial-config if there is one when creating the IOU VM.	2015-04-27 18:37:17 -06:00
Jeremy	b6a935aeb8	Return an explicit error when a NIO type is not supported by a VM.	2015-04-27 14:19:17 -06:00
Julien Duponchelle	324a4f73d0	Do not erase the IOU config	2015-04-27 18:22:54 +02:00
Jeremy	40ce22222e	Merge branch 'unstable' into api_list_images ... Conflicts: gns3server/handlers/api/iou_handler.py	2015-04-23 17:19:37 -06:00
Julien Duponchelle	3926390d30	Fix tests broken by a previous commit	2015-04-18 09:22:37 +02:00
Julien Duponchelle	bca90bc563	API in order to get the list of IOU, Dynamips, Qemu images	2015-04-16 18:32:12 +02:00
grossmj	aeab9780d8	Fixes initial-configs that were not restored when opening a project containing IOU VMs.	2015-04-15 19:49:40 -06:00
grossmj	de5e8f852d	Cleaner and generic way to set Qemu & IOU VM settings.	2015-04-12 15:09:37 -06:00
Jeremy	81ce86a8a7	Fixes use_default_iou_values param was not set.	2015-03-26 16:47:55 -06:00
Julien Duponchelle	4a9f578784	Support IOURC update	2015-03-17 19:00:14 +01:00
Julien Duponchelle	66cdf39ea2	Support uploading iourc	2015-03-17 16:31:45 +01:00
Julien Duponchelle	d657f94c18	Fix crash when you start capture on a non running IOU	2015-03-06 14:48:46 +01:00
Jeremy	6e89f2c7c7	Remove console_host from IOU and Qemu handlers.	2015-03-02 19:17:13 -07:00
Julien Duponchelle	259f6249e2	Fix tests	2015-02-23 16:09:52 +01:00
Julien Duponchelle	f7cd09d5fb	Display an upload form (upload is not yet ready)	2015-02-23 11:28:33 +01:00