22 Commits

Author	SHA1	Message	Date
Julien Duponchelle	88ffd43c97	Strip the old / import export project code controller will do everything	2016-07-21 18:23:31 +02:00
Julien Duponchelle	08c35f5558	Export non remote server work	2016-07-20 14:50:15 +02:00
Julien Duponchelle	73d5066392	Merge branch 'master' into 2.0	2016-07-19 16:41:12 +02:00
Julien Duponchelle	c0b09ae76a	Merge branch '1.5' into 2.0	2016-06-27 14:24:48 +02:00
grossmj	00da15e4af	Use uBridge for VPCS connections. Ref #267.	2016-06-22 19:40:46 -06:00
Julien Duponchelle	3255be0ae2	Drop the commit system ... Ref https://github.com/GNS3/gns3-gui/issues/1243	2016-06-14 10:16:33 +02:00
grossmj	cd07a99118	Some cleaning + move "/version" endpoint to "/server/version".	2016-06-01 17:50:31 -06:00
grossmj	c1aad550fa	Merge branch '1.5' into 2.0 ... Conflicts: gns3server/version.py	2016-05-29 19:52:15 -06:00
Julien Duponchelle	a797038aeb	Drop code for temporary projects ... Fix https://github.com/GNS3/gns3-gui/issues/982	2016-05-24 17:57:04 +02:00
Julien Duponchelle	d5895c3a47	Merge branch '1.5' into 2.0	2016-05-18 11:25:41 +02:00
grossmj	6cea6c9162	Some more (spring) cleaning.	2016-05-13 18:48:10 -06:00
Julien Duponchelle	5280644327	Return command_line and node_directory via the controller	2016-05-12 10:39:50 +02:00
grossmj	483431438a	Merge remote-tracking branch 'origin/2.0' into 2.0 ... Conflicts: gns3server/controller/project.py tests/compute/test_project.py tests/controller/test_project.py	2016-05-11 11:41:45 -06:00
grossmj	5a76f81271	Refactoring to use a common node class for all VMs and other (future) objects.	2016-05-11 11:35:36 -06:00
Julien Duponchelle	9ccb55206d	Cleanup code for getting the default project directory	2016-05-11 18:42:55 +02:00
Julien Duponchelle	c2da568543	Protect controller and compute about path outside project directory ... Fix #503	2016-05-11 15:59:32 +02:00
Julien Duponchelle	9dca7dfe4a	Merge branch '1.5' into 2.0	2016-05-10 17:51:40 +02:00
Julien Duponchelle	9a1eeb57e9	Controll of the project directory in the controller	2016-04-26 14:34:49 +02:00
Julien Duponchelle	1ce576c020	Stream pcap from compute to controller to client	2016-04-22 16:22:03 +02:00
Julien Duponchelle	48e71617d6	Store capture in a temporary directory on compute node	2016-04-21 17:27:49 +02:00
Julien Duponchelle	30f05c6190	Merge branch '1.5' into 2.0	2016-04-21 17:02:28 +02:00
Julien Duponchelle	58d4a529d4	Rename hypervisor to compute ... Fix #487	2016-04-15 17:59:59 +02:00