1
0
mirror of https://github.com/GNS3/gns3-server synced 2024-12-01 12:48:14 +00:00
Commit Graph

5863 Commits

Author SHA1 Message Date
grossmj
f8739eb5e1 Merge branch '2.2' into 3.0
# Conflicts:
#	.github/workflows/testing.yml
#	gns3server/crash_report.py
#	gns3server/version.py
#	requirements.txt
2022-12-27 13:28:11 +08:00
grossmj
5bc030688e Sync web-ui v3.0.0a3 2022-12-27 13:17:12 +08:00
grossmj
9f75a49e0a Fix syntax error in .whitesource 2022-12-27 12:27:26 +08:00
grossmj
7f440f43d8 Add more base branches for Mend to scan 2022-12-27 12:25:49 +08:00
grossmj
3e29ae4276 Add config option to change the server name. Ref #2149 2022-12-27 10:05:13 +08:00
Jeremy Grossmann
91b50eb5f2
Merge pull request #2146 from GNS3/fix/2126
Improve image discovery process
2022-12-26 10:23:57 +05:45
grossmj
c6e31d98db Option to disable image discovery and do not scan parent directory 2022-12-26 12:32:40 +08:00
grossmj
9a7b3bed25 Allow raw images by default. Fixes https://github.com/GNS3/gns3-server/issues/2097 2022-12-26 11:28:51 +08:00
grossmj
8ad7b3f613 Fix bug when creating Dynamips router with chassis setting 2022-12-24 18:03:00 +08:00
Jeremy Grossmann
00691390eb
Merge pull request #2145 from GNS3/fix/2144
Stricter checks to create/update an Ethernet switch and add tests
2022-12-24 06:16:18 +05:45
grossmj
17e0b2e259 Stricter checks to create/update an Ethernet switch and add tests 2022-12-24 08:20:51 +08:00
grossmj
5666b43ee0 Fix schema for removing WICs from Cisco routers. Fixes #3392 2022-12-22 20:02:28 +08:00
grossmj
84f256dd88 Downgrade to flake8 v5.0.4 2022-12-22 09:46:11 +08:00
grossmj
1bbecf1ceb Update dependencies 2022-12-22 09:42:14 +08:00
grossmj
72a4d0df4e Update GH actions checkout and setup-python 2022-12-22 09:35:45 +08:00
grossmj
93449c942f Fix tests 2022-12-22 09:24:17 +08:00
grossmj
649173b293 Merge remote-tracking branch 'origin/master' 2022-12-21 17:14:00 +08:00
grossmj
1c183e660f Downgrade Ubuntu to 20.04 to fix missing Python 3.6 2022-12-21 17:12:09 +08:00
Jeremy Grossmann
634e6a3549
Update SECURITY.md 2022-12-20 21:28:46 +08:00
grossmj
a91ed34f43 Downgrade Ubuntu to 20.04 to fix missing Python 3.6 2022-12-18 14:24:50 +08:00
grossmj
5209009df9 Upgrade dependencies 2022-12-18 14:14:56 +08:00
grossmj
5ba526e175 Development on v2.2.36.dev2 2022-11-11 00:36:47 +08:00
grossmj
d17c243b13 Release v2.2.35.1 2022-11-10 22:21:13 +08:00
grossmj
9e4ae6bc24 Sync appliance files 2022-11-10 22:10:21 +08:00
grossmj
4b410cfa42 Merge branch 'master' into 2.2 2022-11-10 22:06:09 +08:00
grossmj
b9e415b6fe Push missing file for Web-Ui v2.2.35 2022-11-10 13:09:10 +08:00
grossmj
d2d327cc76 Re-release Web-Ui v2.2.35 2022-11-10 12:38:33 +08:00
grossmj
7643185fa2 Add missing importlib_resources 2022-11-09 23:14:38 +08:00
grossmj
263febecbc Merge branch '2.2' into 3.0
# Conflicts:
#	.github/workflows/testing.yml
#	CHANGELOG
#	appveyor.yml
#	dev-requirements.txt
#	gns3server/compute/base_node.py
#	gns3server/controller/__init__.py
#	gns3server/controller/appliance_manager.py
#	gns3server/crash_report.py
#	gns3server/static/web-ui/index.html
#	gns3server/utils/get_resource.py
#	gns3server/version.py
#	gns3server/web/route.py
#	requirements.txt
#	tests/handlers/api/compute/test_qemu.py
#	win-requirements.txt
2022-11-09 20:30:28 +08:00
grossmj
0a046e43d7 Development on 2.2.36.dev1 2022-11-09 20:02:20 +08:00
grossmj
a7036d14d5 Merge branch '2.2' 2022-11-09 20:00:48 +08:00
grossmj
1aca7dbe04 Release v2.2.35 2022-11-08 23:40:25 +08:00
grossmj
338128ca3e Upgrade pywin32 to v305 2022-11-08 23:39:10 +08:00
grossmj
e165cc48e3 Use Visual Studio 2022 in appveyor.yml 2022-11-08 23:09:23 +08:00
grossmj
c80a55b18c Install appliances and configs without importlib_resources for Windows only 2022-11-08 23:07:45 +08:00
grossmj
284a4b62fb Fix copying appliances and configs when app is frozen 2022-11-08 22:50:59 +08:00
grossmj
d33fefa183 Merge branch 'master' into 2.2 2022-11-08 19:29:39 +08:00
grossmj
dfb48c884b Release web-ui v2.2.35 2022-11-08 19:29:21 +08:00
grossmj
18ba60d1a3 Downgrade psutil to v5.9.2 2022-11-08 19:18:07 +08:00
grossmj
521132726e Upgrade psutil to v5.9.4 2022-11-08 18:49:31 +08:00
grossmj
f80aca7633 Sync appliance files 2022-11-08 18:40:27 +08:00
grossmj
84914ecfa4 Add debug messages to fix VMnet interface list refresh. Ref https://github.com/GNS3/gns3-gui/issues/3381 2022-11-08 12:54:47 +08:00
grossmj
5696d1ccb7 Fix issues with VMnet interface on macOS >= 11.0. Ref #3381 2022-11-07 23:59:33 +08:00
grossmj
18b0863ba8 Merge remote-tracking branch 'origin/2.2' into 2.2
# Conflicts:
#	requirements.txt
2022-11-07 21:50:59 +08:00
grossmj
ece47dc279 Upgrade dependencies 2022-11-07 21:48:45 +08:00
Jeremy Grossmann
6e1d49d8ca
Merge pull request #2133 from GNS3/use-importlib-resources
Migrate to importlib_resources
2022-11-07 21:24:35 +08:00
grossmj
2e550d839e Fix tests 2022-11-07 20:33:02 +08:00
grossmj
a4b24eaceb Use importlib_resources instead of pkg_resources and install built-in appliances in config dir. 2022-11-07 20:12:03 +08:00
grossmj
f04702d607 Fix console vnc don't use configured ports in some case. Fixes #2111 2022-11-06 19:36:31 +08:00
grossmj
6f11df6189 Add missing VMware settings in gns3_server.conf 2022-11-06 19:30:24 +08:00