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
1,939 Commits 5 Branches 229 Tags
885a870ae8c1a10397d6431e79f837dc7ce632e6
Commit Graph
1939 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Julien Duponchelle 885a870ae8 Rebuild documentation 2016-05-12 08:44:38 +02:00
Julien Duponchelle e457df1777 Test are OK 2016-05-12 08:42:11 +02:00
grossmj 801b94a964 Fixes VirtualBox VMs list images. 2016-05-11 16:45:17 -06:00
grossmj ef7b4ef020 Fixes tests and some PEP8. 2016-05-11 15:19:00 -06: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 a0344576ba Show version for debug 2016-05-11 16:31:16 +02:00
Julien Duponchelle 95d2bd0065 Merge branch '1.5' into 2.0 2016-05-11 16:16:29 +02:00
Julien Duponchelle fa140e991c Merge branch 'master' into 1.5 2016-05-11 16:16:11 +02:00
Julien Duponchelle f4b79af45f Move tools for creating self signed certificate to clean repo 2016-05-11 16:13:32 +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 390401000f A client could not erase the local compute node config in the controller 
Fix #499
 2016-05-11 15:02:35 +02:00
Julien Duponchelle 4342b4346e Fix tests 2016-05-11 11:22:59 +02:00
Julien Duponchelle cd836f146e Create the project on compute only when needed 2016-05-11 10:56:43 +02:00
Julien Duponchelle ed0bae8689 Merge branch '1.5' into 2.0 2016-05-11 10:07:30 +02:00
Julien Duponchelle a1bf9cdfd3 Keep the version.py untouched when merging 2016-05-11 10:06:21 +02:00
Julien Duponchelle f414ce459a 1.5.0dev3 2016-05-11 10:03:03 +02:00
Julien Duponchelle c3c7356ce3 Merge branch '1.5' into 2.0 2016-05-11 10:02:30 +02:00
Julien Duponchelle 366e9620dc Prepare 1.5.0 alpha 2 v1.5.0a2 2016-05-10 19:14:50 +02:00
grossmj ab13f628f7 Minor changes on CHANGELOG v1.5.0a1 2016-05-10 10:10:56 -06:00
Julien Duponchelle e108a9e136 Prepare alpha 1 2016-05-10 17:58:11 +02:00
Julien Duponchelle 9dca7dfe4a Merge branch '1.5' into 2.0 2016-05-10 17:51:40 +02:00
Julien Duponchelle 9e2043bfa8 Ensure that the connection to docker is closed when leaving server 
Fix https://github.com/GNS3/gns3-gui/issues/1227
 2016-05-10 12:14:48 +02:00
Julien Duponchelle 28f7c2a1cd Ensure in all cases the docker console is closed before restart 
Fix https://github.com/GNS3/gns3-gui/issues/1226
 2016-05-10 11:39:59 +02:00
Jeremy Grossmann c7d58eb3b3 Merge pull request #518 from GNS3/detect_eth 
Wait for all interfaces available in container
 2016-05-09 10:54:37 -06:00
Jeremy Grossmann 41f02dad54 Merge pull request #516 from GNS3/improve_parse_version 
Improve parse_version
 2016-05-07 11:02:58 -06:00
grossmj 76cc1d2750 Fixes call to export project. 2016-05-07 10:39:32 -06:00
Julien Duponchelle 2cdfd6c0d7 Wait for all interfaces available in container 
Fix #511
 2016-05-06 19:07:18 +02:00
Julien Duponchelle 57cf57b408 Improve parse_version 
Ref #515
 2016-05-06 17:09:03 +02:00
grossmj 16b5bb8810 Workaround for exception when using gns3server.utils.parse_version. Fixes #513. 2016-05-05 10:15:51 -06:00
Julien Duponchelle 56c153af79 Make HTTP support more reliable with home made HTTP server 2016-05-04 16:32:45 +02:00
Julien Duponchelle 9beca700a5 PEP8 2016-05-04 16:32:37 +02:00
Julien Duponchelle 8e429ee4c1 Ban port dissalowed by chrome and firefox 2016-05-03 21:07:01 +02:00
Julien Duponchelle f3095d94c1 Replace port in HTTP flow for docker 2016-05-03 18:01:23 +02:00
Julien Duponchelle 5fd385159c HTTP support for docker 
Fix #509
 2016-05-03 16:49:33 +02:00
Julien Duponchelle dcbaa62df8 Better aux console for docker 
Fix #472
 2016-05-03 11:33:43 +02:00
Julien Duponchelle e9fb7f4981 Make sure an image is not partially uploaded 
Fix #505
 2016-05-02 17:25:46 +02:00
Julien Duponchelle d952718f30 Fix RuntimeWarning: You have iterated over the result of 
pkg_resources.parse_version. This is a legacy behavior

Fix #504
 2016-05-02 17:14:15 +02:00
Julien Duponchelle a3b243c501 Merge branch '1.5' into 2.0 2016-05-02 17:08:15 +02:00
Julien Duponchelle 978ec1b5be Fix test 2016-05-02 17:06:51 +02:00
Julien Duponchelle 98b32cd9e2 Merge branch '1.5' into 2.0 2016-05-02 16:59:56 +02:00
Julien Duponchelle d5a7561bc4 Merge branch 'master' into 1.5 2016-05-02 16:57:06 +02:00
Julien Duponchelle c17e00204f Auto reconnect to docker if connection was closed 
Fix #507
 2016-05-02 16:55:05 +02:00
Julien Duponchelle 936faaba5a gns3z => gns3project 2016-05-02 10:33:04 +02:00
grossmj 5c1522f24a Bump version to 1.5.0dev2 2016-04-28 23:47:17 -06:00
grossmj b92e64e507 pywin32 is not updated on pypi. 2016-04-28 16:21:14 -06:00
Julien Duponchelle 848120c354 1.4.7dev1 2016-04-28 18:38:11 +02:00
Julien Duponchelle 8a19afd618 1.4.6 v1.4.6 2016-04-28 18:27:33 +02:00
Julien Duponchelle 815ef6066d Merge branch 'master' into 1.5 2016-04-28 16:52:29 +02:00