ExternalVendorCode/gns3-server
1
0
Fork 0
mirror of https://github.com/GNS3/gns3-server.git synced 2024-12-20 05:17:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
3,507 Commits 5 Branches 204 Tags 76 MiB
53e36d1ed5
Commit Graph

3507 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
pyup-bot
53e36d1ed5 Update pep8 from 1.7.0 to 1.7.1 2018-01-30 08:58:03 +01:00
ziajka
9921db2183 Merge branch '2.1' into 2.2 2018-01-30 08:53:23 +01:00
ziajka
4f2a50894b
Merge pull request #1277 from GNS3/av-pywin32 
Fix AppVeyor crashes with pypiwin32-222 Ref. #1276
 2018-01-30 08:52:35 +01:00
Jeremy Grossmann
62e03148c1
Merge pull request #1275 from GNS3/async-md5-calcs 
Calculate MD5 on thread and before json response, Ref. gui#2239
 2018-01-29 23:28:11 +07:00
ziajka
889aa3ba94 More generic dependency for pypiwin32, Ref. #1276 2018-01-29 15:26:45 +01:00
ziajka
cbb15c7a84 Check if locking version of pypiwin32==220 helps, Ref. #1276 2018-01-29 15:16:38 +01:00
ziajka
8268e76a86 Check if passes tests on 2.1 2018-01-29 15:09:03 +01:00
ziajka
bb26e8acdd Calculate MD5 on thread and before json response, Ref. gui#2239 2018-01-29 14:20:48 +01:00
ziajka
1582ac3195 Merge branch '2.2' into async-md5-calcs 2018-01-29 13:01:45 +01:00
ziajka
7fe6508e73
Merge pull request #1274 from GNS3/asyncio-ensure-future 
Conservative approach to supported versions of Python 3.4 and asyncio…
 2018-01-29 12:21:41 +01:00
ziajka
eeae07e783 Conservative approach to supported versions of Python 3.4 and asyncio.ensure_future, Ref. #1269 2018-01-29 12:13:20 +01:00
ziajka
dc377165f2 Cancellable md5sum calculation on thread, Ref. gui#2239 2018-01-29 10:18:13 +01:00
ziajka
6868e20a70 Compute md5sum on thread and don't block main server, Ref. gui#2239 2018-01-26 12:53:48 +01:00
ziajka
3c5ca9ce0e
Merge pull request #1270 from GNS3/replace-async-with-ensure-future 
Replace asyncio.async with ensure_future because of deprecation, Fixe…
 2018-01-24 11:18:10 +01:00
ziajka
d9a0ec9ff3 Replace asyncio.async with ensure_future because of deprecation, Fixes: #1269 2018-01-24 11:11:53 +01:00
ziajka
838d82a98b Merge branch '2.2' of github.com:GNS3/gns3-server into 2.2 2018-01-24 10:55:08 +01:00
ziajka
05983f2838 Fix test_open_auto_start test 2018-01-24 10:54:56 +01:00
ziajka
c532e6392d
Merge pull request #1257 from GNS3/pyup-update-sphinx-1.6.2-to-1.6.6 
Update sphinx to 1.6.6
 2018-01-24 10:15:07 +01:00
ziajka
e05f93abd3
Merge pull request #1268 from GNS3/pyup-pin-prompt-toolkit-1.0.15 
Pin prompt-toolkit to latest version 1.0.15
 2018-01-24 10:14:57 +01:00
pyup-bot
647c1dbb05 Pin prompt-toolkit to latest version 1.0.15 2018-01-23 06:47:36 +01:00
grossmj
28f8216590 Merge branch '2.1' into 2.2 
# Conflicts:
#	gns3server/version.py
#	requirements.txt
 2018-01-23 12:47:13 +07:00
grossmj
e54ccc26b0 Bump to version 2.2.0dev1 & refresh resources/ui files. 2018-01-23 11:36:57 +07:00
ziajka
f7d82059d5 Development on v2.1.4dev1 2018-01-19 07:18:00 +01:00
ziajka
d2faaee099 Release v2.1.3 2018-01-19 07:15:39 +01:00
grossmj
6fee543ce7 Fix more client/server version tests. 2018-01-18 16:14:09 +08:00
grossmj
2e40fb8608 Fix client/server version test. 2018-01-18 16:04:31 +08:00
grossmj
d4f1084391 Bump version number to 2.1.3dev1 2018-01-18 15:32:06 +08:00
grossmj
cf4477ce34 Merge remote-tracking branch 'origin/unlock-yarl' into 2.1 2018-01-18 12:10:19 +08:00
grossmj
f525bd2ce1 Update appliance files. 2018-01-18 11:57:48 +08:00
grossmj
bd8816d14c Suspend for Docker nodes. 2018-01-18 11:43:04 +08:00
ziajka
34acb1f185 Unlock yarl version and multidict 2018-01-17 10:26:22 +01:00
grossmj
7ded71142f Fix same MAC address for duplicated Qemu nodes. 2018-01-17 14:13:06 +08:00
grossmj
c281f55fb2 Fix same base MAC for duplicated IOS routers. Fixes #1264. 2018-01-17 14:01:44 +08:00
grossmj
e5e2b7a8ac Fix "Creating multiple IOU nodes at once assigns the same application id". Fixes #1239. 2018-01-15 18:09:05 +07:00
grossmj
30e8949985 Fix "Transport selection via DSN is deprecated" message. Sync is configured with HTTPTransport. 2018-01-15 16:56:15 +07:00
grossmj
393ac85bca Merge remote-tracking branch 'origin/2.1' into 2.1 2018-01-15 14:42:25 +07:00
grossmj
9d9dc037d8 Refresh CPU/RAM info every 1 second. Ref #2262. 2018-01-15 14:42:01 +07:00
Jeremy Grossmann
32f56feca2
Merge pull request #1263 from ddragic/eth_switch_cmd 
Rename ethernet switch shell command arp to mac
 2018-01-15 08:20:39 +01:00
Dušan Dragić
5d86f06390 Rename ethernet switch arp command to mac, also rename in test 2018-01-14 17:50:21 +01:00
Dušan Dragić
6789989cb9 Rename ethernet switch arp command to mac 2018-01-14 17:10:26 +01:00
grossmj
ffc7024b64 Fix error while getting appliance list. Fixes #1258. 2018-01-14 20:29:17 +07:00
grossmj
ed275e4ec5 Fix UnboundLocalError: local variable 'node' referenced before assignment. Fixes #1256. 2018-01-14 19:06:35 +07:00
grossmj
4143ee8178 first commit 2018-01-14 10:52:59 +07:00
grossmj
88989cc274 Default symbol must be computer.svg 2018-01-12 21:46:48 +07:00
grossmj
ab6fe6da1d Compatibility for old node templates (those with default_symbol and hover_symbol properties). 2018-01-12 17:34:37 +07:00
grossmj
8b1c68a0b7 Fix problem when searching for VBoxManage. Fixes #1261. 2018-01-12 13:17:16 +07:00
grossmj
97cfb892a6 Improve the search for VBoxManage. 2018-01-11 16:33:15 +07:00
grossmj
f9c7c15f95 Fixing race condition when starting the GNS3 VM. 2018-01-10 16:22:55 +07:00
grossmj
5f14f8eb46 Default VPCS name format is now PC-{0}. 2018-01-09 23:40:35 +07:00
ziajka
7c91e46812 Development on v2.1.3dev1 2018-01-08 14:21:04 +01:00