Commit Graph

23 Commits

Author SHA1 Message Date
grossmj
d1ccf3bc84 Merge branch '2.1' into 2.2
# Conflicts:
#	gns3server/version.py
#	requirements.txt
2018-06-04 22:46:52 +07:00
ziajka
e267f8a8b8 Project global variables 2018-05-04 14:34:44 +02:00
ziajka
1b3065750d .pytest_cache into .gitignore 2018-02-21 10:27:01 +01:00
ziajka
815dca101f Ignore env files 2017-10-30 11:30:06 +01:00
Julien Duponchelle
08423eff96
Support packet filtering for VPCS
https://github.com/GNS3/gns3-gui/issues/765
2017-07-04 15:12:26 +02:00
ziajka
0dd35e1cbe Ignoring virtualenv directory at gitignore 2017-06-09 09:14:25 +02:00
Julien Duponchelle
553e137a13
Support for serial console for Virtual BOX and VMware using asyncio
Ref #747
2016-11-07 23:43:20 +01:00
Julien Duponchelle
5a695d2651
Missing busybox for docker 2016-10-05 14:57:58 +02:00
Julien Duponchelle
f216422d0f
Debug shell support command history 2016-09-01 13:45:56 +02:00
Julien Duponchelle
c280fd5fb8 Merge branch 'master' into 1.5 2016-01-20 17:10:59 +01:00
Julien Duponchelle
bc3016eec5 Merge branch '1.4' 2016-01-13 11:39:00 +01:00
Julien Duponchelle
33edbefa3b Docker cleanup and improvements 2015-12-18 18:20:56 +01:00
Julien Duponchelle
48678506f7 Ignore py.test .cache directory 2015-12-16 14:48:03 +01:00
Julien Duponchelle
69c38c6414 Use pytest 2.8 so it's work with Python 3.5 without warning 2015-11-02 16:35:12 +01:00
Julien Duponchelle
87a089457f Update script file 2015-01-21 16:43:34 +01:00
Julien Duponchelle
57c3463edc Ignore vpcs.hist 2015-01-20 20:11:39 +01:00
Julien Duponchelle
1431c66c54 Documentation generation 2015-01-14 12:32:56 +01:00
Jerry Seutter
f287f5141a Update .gitignore file 2014-10-14 13:55:17 -06:00
Joe Bowen
76982ddbbb Update file structure 2014-05-06 10:11:14 -06:00
Joe Bowen
c6b4ac04e1 Revert "Test"
This reverts commit a61686a436.
2014-05-06 09:05:05 -06:00
Joe Bowen
a61686a436 Test 2014-05-06 08:50:34 -06:00
grossmj
c6152c9503 Project structure & tools (pytest, tox etc.) 2013-10-08 11:33:51 -06:00
grossmj
d1583e4a04 Initial commit 2013-09-25 19:45:09 -07:00