1
0
mirror of https://github.com/GNS3/gns3-server synced 2024-12-11 09:38:08 +00:00
Commit Graph

4616 Commits

Author SHA1 Message Date
grossmj
cc52a6a6b5 Change default z value for nodes to 1 2018-08-08 14:33:10 +07:00
grossmj
033f005bde Merge branch '2.1' into 2.2
# Conflicts:
#	gns3server/compute/docker/docker_vm.py
#	gns3server/version.py
2018-08-07 21:06:42 +07:00
grossmj
12e71a2917 Set lower process priority when computing idle-pc value on Windows. Ref #2522. 2018-08-07 19:31:33 +07:00
grossmj
17e51fdac6 Merge remote-tracking branch 'origin/2.1' into 2.1 2018-07-26 13:35:57 -05:00
grossmj
d0ed6931d8 Catch exception: ZIP does not support timestamps before 1980. Ref #1360. 2018-07-26 13:34:23 -05:00
ziajka
c274be1135 Sync appliances 2018-07-13 12:42:43 +02:00
Jeremy Grossmann
a494f8257b
Merge pull request #1368 from sbraz/typing
Require typing only for Python < 3.5
2018-07-13 11:34:30 +08:00
Louis Sautier
2a1b9e7232
Require typing only for Python < 3.5 2018-07-12 23:43:27 +02:00
ziajka
1cc1ccd511 Re-enable static directory 2018-07-02 09:25:39 +02:00
ziajka
ec8cfcd0f9 Disable static/ dir, Ref: #2532 2018-06-29 14:31:19 +02:00
ziajka
dd845eb096 Fix tests on Windows 2018-06-28 09:16:51 +02:00
ziajka
41026c74c1 Use mocked dir for web-ui redirection test 2018-06-26 13:13:19 +02:00
ziajka
7d75b6248d Use mocked dir of web-ui for tests 2018-06-26 12:53:39 +02:00
ziajka
21780fa2ed Gitkeep for web-ui directory 2018-06-26 12:26:04 +02:00
ziajka
aed1989cdf
Merge pull request #1364 from GNS3/bundled-web-ui
Serve WebUI handlers and update-bundled-web-ui script
2018-06-26 12:10:11 +02:00
ziajka
0e1f2e26d0 Serve WebUI handlers and update-bundled-web-ui script, Ref: #1362 2018-06-26 12:09:08 +02:00
ziajka
6dc2ae8641 Clear script 2018-06-22 15:30:24 +02:00
ziajka
867e997b74 Support /static/ files serving, Ref: #1362 2018-06-22 15:29:47 +02:00
ziajka
e20e885d44 Release v2.1.8 2018-06-14 15:17:08 +02:00
grossmj
893e9c4749 'caplog.text()' syntax is deprecated, use 'caplog.text' property instead. 2018-06-14 17:15:24 +08:00
grossmj
b68041e4e3 Remove problematic pytest-capturelog dev dependency. 2018-06-14 17:09:15 +08:00
grossmj
84865ac3d6 Fix dev requirement. 2018-06-14 16:55:48 +08:00
grossmj
0f496907a0 Fix API status code for start/stop/suspend/reload a node. Fixes #1353.
Fix issues with test.
Update documentation.
2018-06-14 16:39:32 +08:00
ziajka
f3b4cc0160 Fix tests 2018-06-13 19:16:43 +02:00
ziajka
ac73c72727 Don't send variables to computes where are empty, Ref: #1340 2018-06-13 18:55:47 +02:00
ziajka
2e586f56ca Development on v2.1.8dev1 2018-06-12 11:15:06 +02:00
ziajka
0b742fc43d Release v2.1.7 2018-06-12 11:12:59 +02:00
Jeremy Grossmann
72cc3961dd
Merge pull request #1351 from acaudwell/udp-ports-fix
Don't release NIO UDP ports when updating docker container.
2018-06-11 22:36:17 +07:00
Andrew Caudwell
b2e0a1b291 Don't release NIO UDP ports when updating docker container.
When a docker container was updated, the NIO UDP ports were being released
from port_manager, but they were still stored in self._ethernet_adapters.
When the container was restarted, the same NIO ports would be used. However,
if a new connection was then added, it could assign a port that was already
in use. The end result was that traffic would be bridged across the wrong
interface connection.
2018-06-11 15:17:13 +12:00
grossmj
96d5e351f7 Merge branch '2.1' into 2.2
# Conflicts:
#	gns3server/version.py
#	requirements.txt
2018-06-10 21:19:55 +07:00
grossmj
45edc40948 Timeout for stream file. 2018-06-10 21:18:16 +07:00
grossmj
1550c7bee7 Fix cloud tests. 2018-06-10 17:56:56 +07:00
grossmj
1f017a0d1d Console support for clouds (to connect to external devices or services). 2018-06-10 17:43:29 +07:00
grossmj
34fcbd68f3 Fix switching console type from telnet to VNC throws error. 2018-06-09 22:08:30 +07:00
grossmj
40151cd1fe Fix switching console type from telnet to VNC throws error. Fixes #2489. 2018-06-09 21:47:36 +07:00
grossmj
1905a99ce7 Fix saved VM state was not deleted correctly. 2018-06-09 17:28:26 +07:00
grossmj
6caf38206c Fix tests. 2018-06-07 22:37:29 +07:00
grossmj
8851a55199 Fix timeout error with "save as" for large projects. 2018-06-07 22:26:23 +07:00
ziajka
c18d855a10 Merge branch '2.1' of github.com:GNS3/gns3-server into 2.1 2018-06-07 11:58:30 +02:00
Jeremy Grossmann
ae0c362427
Merge pull request #1348 from ehlers/api-docs
Update API documentation
2018-06-07 15:57:11 +07:00
Bernhard Ehlers
60a3ab87dc Update API documentation 2018-06-07 10:26:06 +02:00
grossmj
62f87de23a Add API endpoint to return all links attached to a node. 2018-06-06 20:46:44 +07:00
Jeremy Grossmann
70cbc0260b
Merge pull request #1347 from AlyssonOliveira/fix_requirements.txt_to_hold_prompt-toolkit_1.0.15
Hold prompt-toolkit==1.0.15 to fix https://github.com/GNS3/gns3-serve
2018-06-06 18:57:02 +07:00
Alysson Oliveira
c3c298cd63 Hold prompt-toolkit==1.0.15 to fix https://github.com/GNS3/gns3-server/issues/1346 2018-06-06 08:37:50 -03:00
grossmj
fd5df0052a Fix issue with some SVG symbols that could not be used in GNS3.
This was due to the height and width values being percentages.
2018-06-06 16:32:51 +07:00
grossmj
19c5ff8521 Show correct free disk space value. 2018-06-06 14:59:44 +07:00
grossmj
31a268e756 Force prompt-toolkit to version 1.0.15 2018-06-06 01:36:43 +07:00
Jeremy Grossmann
7f27cb7015
Update requirements.txt 2018-06-06 01:34:05 +07:00
grossmj
fbfa75830e Bump version to 2.1.7dev1 2018-06-05 16:46:11 +07:00
grossmj
f8bf749577 Remove unwanted trailing characters and other white spaces when reading .md5sum files. 2018-06-05 00:01:20 +07:00