1
0
mirror of https://github.com/GNS3/gns3-server synced 2024-12-29 10:18:10 +00:00
Commit Graph

5596 Commits

Author SHA1 Message Date
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
grossmj
9cf2e4f5a6 Make version PEP 440 compliant 2022-11-06 17:51:31 +08:00
Jeremy Grossmann
9316876f97
Merge pull request #2123 from blueneekone/patch-1
Update gns3.service.systemd
2022-11-04 23:01:57 +08:00
grossmj
f3b8f43689 Fix creating asyncio task in Python 3.6 2022-10-30 22:21:28 +08:00
grossmj
2d74d1ad94 Fix tests for Python 3.11 2022-10-30 22:07:44 +08:00
grossmj
ec50cc7c0d Support for Python 3.11 2022-10-30 19:04:54 +08:00
grossmj
f8ee3b3d50 Upgrade pywin32 to v304 2022-10-19 18:31:17 +08:00
grossmj
bbf9c04d20 Upgrade pywin32 to v304 2022-10-19 18:30:28 +08:00
Jeremy Grossmann
67e42f9353
Merge pull request #2128 from GNS3/fix/3393
Update requirements.txt
2022-10-18 22:31:56 +08:00
Jeremy Grossmann
31a490211b
Merge branch '2.2' into fix/3393 2022-10-18 22:31:04 +08:00
grossmj
c7df8331ed Upgrade to Visual Studio 2022 in appveyor.yml 2022-10-18 21:47:10 +08:00
grossmj
de1654a50f Upgrade pip and setuptools in appveyor.yml 2022-10-18 21:40:08 +08:00
grossmj
a6959de1f8 Upgrade pytest. Fixes #2130 2022-10-18 21:14:53 +08:00
grossmj
8cfedce468 Use jsonschema v3.2.0 for Python 3.6 2022-10-12 22:13:34 +08:00
grossmj
77dd772314 Allow for more dependency versions at patch level 2022-10-12 22:07:37 +08:00
grossmj
9ff302592c Upgrade to aiohttp 3.8.3 2022-10-12 21:40:23 +08:00
grossmj
6b3d4feab8 Replace deprecated distro.linux_distribution() call 2022-10-11 23:28:11 +08:00
grossmj
78b2b93540 Update dev-requirements.txt 2022-10-11 23:23:15 +08:00