Commit Graph

5470 Commits

Author SHA1 Message Date
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
grossmj
0303e21059 Update requirements.txt 2022-10-11 23:01:24 +08:00
grossmj
e20d1adb0e Downgrade aiohttp to v3.8.1 2022-10-10 16:30:28 +08:00
grossmj
e5bee8ff52 Downgrade Jinja2 to support Python 3.6 2022-10-10 15:52:36 +08:00
grossmj
58471ea7f4 Downgrade aiofiles to support Python 3.6 2022-10-10 15:50:35 +08:00
grossmj
9fb0ba5a71 Upgrade dependencies 2022-10-10 14:29:04 +08:00
Evan Waechtler
3d738e83f5
Update gns3.service.systemd
In reference to bug #1918, the gns3.service.systemd file references ExecPath /usr/bin/gns3server which needs to be changed to /usr/local/bin/gns3server for the daemon/service to run without failure.

Please see the change I made to the service above.
2022-10-02 23:25:58 -06:00
grossmj
19de2732f2 Upgrade to FastAPI 0.85.0 and check embedded web-ui index.html can be found. 2022-09-29 15:11:15 +02:00
grossmj
40c22e389e Merge branch 'master' into 2.2 2022-09-29 14:56:35 +02:00
Jeremy Grossmann
0419c081fe
Merge pull request #2083 from a60814billy/fix/binding-on-wrong-interface-in-windows
fix: binding to wrong interface in windows
2022-09-28 17:36:31 +02:00
grossmj
dced70a565 Merge branch 'master' into 2.2 2022-09-27 11:55:53 +02:00
grossmj
9a7222b83e Upgrade FastAPI to v0.84.0 2022-09-14 21:09:29 +02:00
grossmj
b0e646b97d Fix some issues with HTTP notification streams 2022-09-13 22:10:01 +02:00
grossmj
e8973b9c44 Development on 3.0.0dev5 2022-09-07 01:16:14 +02:00
grossmj
317e2b164c Release v3.0.0a2 2022-09-07 01:05:41 +02:00
grossmj
8976a751fa Add web-ui v3.0.0a2 2022-09-07 00:57:08 +02:00
grossmj
bcac7874c1 Upgrade FastAPI to v0.82.0 2022-09-04 22:09:48 +02:00
Jeremy Grossmann
0f4c98c7e4
Merge pull request #2110 from GNS3/locked-project
API endpoint to get the locked status of a project
2022-09-03 23:13:06 +02:00
grossmj
2976e220dc Return a boolean directly from API endpoint for project locked status 2022-09-03 23:08:13 +02:00
grossmj
27debfff8d API endpoint to get the locked status of a project 2022-09-03 22:58:44 +02:00
Jeremy Grossmann
3014bd0216
Merge pull request #2108 from GNS3/project-lock-unlock
Global project lock and unlock
2022-08-30 22:54:47 +02:00
grossmj
ca3bf592d6 Global project lock and unlock 2022-08-30 22:49:47 +02:00
grossmj
43e60c31c7 Remove empty files after merge 2022-08-30 12:21:05 +02:00
grossmj
426c16e296 Merge branch '2.2' into 3.0
# Conflicts:
#	.github/workflows/testing.yml
#	CHANGELOG
#	appveyor.yml
#	dev-requirements.txt
#	gns3server/controller/compute.py
#	gns3server/crash_report.py
#	gns3server/version.py
#	gns3server/web/route.py
#	pytest.ini
#	requirements.txt
#	tests/compute/dynamips/test_dynamips_router.py
#	tests/compute/test_base_node.py
#	tests/compute/vmware/test_vmware_manager.py
#	tests/compute/vmware/test_vmware_vm.py
#	tests/controller/gns3vm/test_virtualbox_gns3_vm.py
2022-08-30 11:53:12 +02:00
grossmj
0d0a06799d Development on 2.2.35dev1 2022-08-29 11:14:44 +02:00
grossmj
eeae27ae0d Merge branch '2.2' 2022-08-29 11:11:29 +02:00
grossmj
8d4df08150 Release v2.2.34 2022-08-28 23:28:12 +02:00