Commit Graph

6029 Commits

Author SHA1 Message Date
cbaa563996 Merge branch '2.2' into 3.0
# Conflicts:
#	CHANGELOG
#	gns3server/crash_report.py
#	gns3server/static/web-ui/index.html
#	gns3server/static/web-ui/main.9297104511b6616fc55c.js
#	gns3server/utils/images.py
#	gns3server/version.py
#	tests/api/routes/compute/test_dynamips_nodes.py
#	tests/handlers/api/compute/test_qemu.py
#	tests/utils/test_images.py
2024-12-02 12:16:34 +10:00
6c521b5f7a Development on 2.2.53.dev1 2024-12-02 11:33:59 +10:00
a8014da10b Release v2.2.52 v2.2.52 2024-12-02 11:14:23 +10:00
f6080013e3 Bundle web-ui v2.2.52 2024-12-02 11:09:30 +10:00
fc54c6e496 Sync appliances 2024-12-02 11:02:47 +10:00
04cd107651 Merge pull request #2448 from GNS3/bugfix/3664
Fix listing images
2024-11-28 12:45:37 +10:00
19cabdfde6 Use log.debug for some messages in images.py 2024-11-28 12:42:50 +10:00
af7fbe6bb4 Fix tests 2024-11-27 15:18:49 +10:00
3d58b437b4 Remove restrictions based on file extension when listing images and fix ELF header checks 2024-11-27 14:51:34 +10:00
83921a45df Fix use project name instead of ID for fast duplication when running local server. Fixes #2446 2024-11-26 12:07:06 +10:00
b2db8896ea Release v3.0.0rc2 v3.0.0rc2 2024-11-20 14:00:49 +10:00
a22f7ac3d2 Bundle web-ui v3.0.0rc2 2024-11-20 13:51:15 +10:00
e19af851c1 Sync appliances 2024-11-20 12:39:39 +10:00
a00f53fbaa Fix error 500 on PUT for cloud, nat, vmware and vpcs nodes. Fixes #2426 2024-11-19 12:21:35 +10:00
8db81de153 Merge pull request #2445 from GNS3/bugfix/2426
Fix issue with asyncio.Queue
2024-11-18 14:00:20 +10:00
fa0d7d7529 Use call_soon_threadsafe() in notification manager 2024-11-18 12:13:41 +10:00
bd813b0a53 Merge branch '2.2' into 3.0
# Conflicts:
#	requirements.txt
#	setup.py
2024-11-18 11:46:42 +10:00
b37db57bb9 Fix tests 2024-11-17 15:00:13 +10:00
31a2cb998d Fix issue with asyncio.Queue which is not thread safe. 2024-11-17 14:39:22 +10:00
e83e12b51a Add a duplicated project in the same resource pools as the original project if it is in any 2024-11-17 14:03:47 +10:00
a7da814b85 Upgrade FastAPI to v0.115.5 2024-11-13 12:10:04 +10:00
11c9802268 Merge pull request #2443 from GNS3/feature/upgrade-resource-files
Overwrite user resources when the originals have changed
2024-11-10 18:30:13 +10:00
a60e0d424d Overwrite user resources when the originals have changed.
Excepting configs and disks which can be customized.
2024-11-09 12:17:06 +10:00
db1fb29c63 Relax setuptools requirement to allow for easier Debian packaging on Ubuntu Focal & Jammy 2024-11-08 12:46:55 +10:00
ec9dbd20b8 Merge branch '2.2' into 3.0
# Conflicts:
#	gns3server/compute/base_node.py
#	gns3server/compute/docker/docker_vm.py
#	gns3server/compute/qemu/qemu_vm.py
#	gns3server/crash_report.py
#	gns3server/version.py
2024-11-07 23:18:42 +10:00
a5f0dba5cf Development on 2.2.52.dev1 2024-11-07 23:13:31 +10:00
754680d8e9 Release v2.2.51 v2.2.51 2024-11-07 15:08:27 +10:00
05773ce189 Sync appliances 2024-11-07 15:06:06 +10:00
aeae9deb01 Merge remote-tracking branch 'origin/2.2' into 2.2 2024-11-07 14:53:23 +10:00
f3749e83ec Catch error when cannot resize Docker container TTY. 2024-11-07 14:52:59 +10:00
c2db4e8542 Merge pull request #2439 from GNS3/bugfix/2438
Fix disk interface is being overriden when set to none
2024-11-07 14:52:08 +10:00
52a7696618 Fix tests 2024-11-07 14:48:57 +10:00
7bf17392dd Do not use "ide" if there is a disk image and no interface type has been explicitly configured. 2024-11-07 14:37:26 +10:00
2718224dde Increase SQLite timeout. Ref #2422 2024-10-31 21:31:03 +10:00
0122070b29 Merge pull request #2435 from GNS3/upgrade-dependencies
Upgrade dependencies
2024-10-31 20:56:30 +10:00
345ecb7630 Upgrade dev dependencies 2024-10-31 20:49:12 +10:00
ae538dd11d Fix test user with wrong creds 2024-10-31 19:31:17 +10:00
ce4dd17409 Upgrade fastapi and fix tests 2024-10-31 19:23:28 +10:00
8c7c17b889 Upgrade dependencies and fix Pydantic warnings 2024-10-31 17:09:52 +10:00
1530bdfc2b Disable Python 3.13 testing 2024-10-31 13:53:25 +10:00
74d07173c1 Upgrade aiohttp to v3.10.10. Fixes #2411 2024-10-31 13:48:22 +10:00
ec300d19d4 Replace aiohttp.web.HTTPConflict() 2024-10-31 13:11:01 +10:00
fb06eb3c0c Remove old debug message 2024-10-31 13:07:09 +10:00
7e902726bf Fix issues after merge 2024-10-31 13:06:17 +10:00
c4fcb43e78 Merge branch '2.2' into 3.0
# Conflicts:
#	.github/workflows/testing.yml
#	CHANGELOG
#	README.md
#	dev-requirements.txt
#	gns3server/compute/docker/docker_vm.py
#	gns3server/controller/export_project.py
#	gns3server/controller/import_project.py
#	gns3server/controller/project.py
#	gns3server/crash_report.py
#	gns3server/static/web-ui/index.html
#	gns3server/static/web-ui/main.df8c319a3da6fb0e3629.js
#	gns3server/version.py
#	requirements.txt
#	setup.py
#	tests/compute/docker/test_docker_vm.py
#	tests/controller/test_import_project.py
2024-10-31 12:54:35 +10:00
753135a80d Merge branch 'master' into 2.2 2024-10-28 17:32:34 +10:00
c05e1cb8e7 Use @locking when sending uBridge commands. Ref https://github.com/GNS3/gns3-gui/issues/3651 2024-10-28 13:02:04 +10:00
48b7e6ca50 Fix run Docker containers with user namespaces enabled. Fixes #2414 2024-10-26 19:03:05 +10:00
dbe2b8a5fb Python 3.13 support 2024-10-26 18:38:07 +10:00
80487eb62d Upgrade dependencies 2024-10-26 18:22:40 +10:00