Commit Graph

4389 Commits

Author SHA1 Message Date
grossmj
5cd540d94d
Remove old files 2024-05-16 17:57:51 +07:00
grossmj
d3860ba84b
Merge branch '2.2' into 3.0
# Conflicts:
#	CHANGELOG
#	dev-requirements.txt
#	gns3server/compute/qemu/__init__.py
#	gns3server/compute/vmware/__init__.py
#	gns3server/controller/snapshot.py
#	gns3server/crash_report.py
#	gns3server/handlers/api/compute/atm_switch_handler.py
#	gns3server/run.py
#	gns3server/static/web-ui/26.77d4bfd104f37c42e028.js
#	gns3server/static/web-ui/index.html
#	gns3server/static/web-ui/runtime.415291667f70565cd8ef.js
#	gns3server/utils/__init__.py
#	gns3server/utils/images.py
#	gns3server/utils/interfaces.py
#	gns3server/version.py
#	gns3server/web/web_server.py
#	pytest.ini
#	requirements.txt
#	scripts/update-bundled-web-ui.sh
#	setup.py
#	tests/api/routes/compute/test_dynamips_nodes.py
#	tests/compute/builtin/nodes/test_cloud.py
#	tests/compute/docker/test_docker.py
#	tests/compute/docker/test_docker_vm.py
#	tests/compute/dynamips/test_dynamips_manager.py
#	tests/compute/dynamips/test_dynamips_router.py
#	tests/compute/iou/test_iou_vm.py
#	tests/compute/qemu/test_qcow2.py
#	tests/compute/qemu/test_qemu_manager.py
#	tests/compute/qemu/test_qemu_vm.py
#	tests/compute/test_base_node.py
#	tests/compute/test_manager.py
#	tests/compute/test_project.py
#	tests/compute/traceng/test_traceng_vm.py
#	tests/compute/virtualbox/test_virtualbox_manager.py
#	tests/compute/virtualbox/test_virtualbox_vm.py
#	tests/compute/vmware/test_vmware_manager.py
#	tests/compute/vmware/test_vmware_vm.py
#	tests/compute/vpcs/test_vpcs_vm.py
#	tests/conftest.py
#	tests/controller/gns3vm/test_remote_gns3_vm.py
#	tests/controller/gns3vm/test_virtualbox_gns3_vm.py
#	tests/controller/gns3vm/test_vmware_gns3_vm.py
#	tests/controller/test_export_project.py
#	tests/controller/test_gns3vm.py
#	tests/controller/test_import_project.py
#	tests/test_config.py
#	tests/utils/test_asyncio.py
#	tests/utils/test_images.py
#	tests/web/test_response.py
2024-05-16 17:53:39 +07:00
grossmj
3e133eda44
Bundle web-ui v3.0.0b3 2024-05-16 17:30:12 +07:00
grossmj
e01256980c
Sync appliances 2024-05-16 17:27:38 +07:00
grossmj
0561aba927
Release v2.2.47 2024-05-15 12:14:48 +07:00
grossmj
86a78f53cb
Fix update-bundled-web-ui.sh script 2024-05-15 12:05:43 +07:00
grossmj
f0bc74ff6e
Bundle web-ui v2.2.47 2024-05-15 12:04:34 +07:00
grossmj
f81128f717
Bundle web-ui v2.2.47 2024-05-15 11:55:47 +07:00
grossmj
9ce505cad3
Sync appliances 2024-05-15 11:43:04 +07:00
grossmj
ccb5de6df1
Drop Python 3.7 2024-05-09 18:23:58 +07:00
grossmj
259d3a0155
Fix cannot import UTC 2024-05-09 17:23:32 +07:00
grossmj
33499be425
Fix warnings in tests 2024-05-09 17:11:12 +07:00
grossmj
3fd44f5260
Do not wait for the server to close when shutting down. 2024-05-09 16:37:45 +07:00
grossmj
3df7af12e1
Allow listing x86_64 IOU images. Fixes #2376 2024-05-09 15:21:05 +07:00
grossmj
38df4bea2e
Do not return an error if an image has already been uploaded 2024-04-26 19:02:50 +07:00
grossmj
35b75f0f7f
Fix link capture for ATM switch. Fixes https://github.com/GNS3/gns3-gui/issues/3570 2024-04-23 18:35:36 +07:00
grossmj
448b94f701
Add more details to error message when busybox is not installed. Fixes https://github.com/GNS3/gns3-gui/issues/3569 2024-04-23 17:54:06 +07:00
grossmj
18002a7580
Fix invalid escape sequences 2024-04-23 16:52:28 +07:00
grossmj
644e659729
Use NAT symbol for builtin NAT template 2024-04-22 19:11:58 +07:00
grossmj
1c37e8bd32
Merge branch '2.2' into 3.0
# Conflicts:
#	gns3server/controller/symbol_themes.py
#	gns3server/controller/template_manager.py
2024-04-22 19:08:45 +07:00
grossmj
b6e68ba1a8
Add NAT symbols 2024-04-22 18:51:29 +07:00
grossmj
84f7337cb1
Release v3.0.0b2 2024-04-07 18:52:24 +07:00
grossmj
e11621467b
Remove old files 2024-04-07 18:28:00 +07:00
grossmj
123123d767
Bundle web-ui v3.0.0b2 2024-04-07 18:23:59 +07:00
grossmj
b3bdeb611e
Merge branch '2.2' into 3.0
# Conflicts:
#	gns3server/version.py
2024-04-07 12:44:01 +07:00
grossmj
7a229e33f9
Sync appliances 2024-04-07 12:43:15 +07:00
grossmj
5b1ba5a57c
Fix cannot stop Docker VM while console connection is still active. 2024-04-04 22:57:33 +07:00
grossmj
bc1a8c99d1
Fix cannot stop Docker VM while console connection is still active. 2024-04-04 22:17:21 +07:00
grossmj
123b5d0800
Support for custom Qemu path in templates and nodes 2024-04-03 21:16:40 +07:00
grossmj
998898a471
Fix CPU fractional values for Docker VMs. 2024-04-03 17:15:10 +07:00
grossmj
9b66d939d2
Support for cooperative signal handling of uvicorn v0.29.0 2024-04-03 15:58:10 +07:00
grossmj
31c7fe88f1
Remove websocket.close() 2024-03-16 16:00:27 +01:00
grossmj
fa41d9ba75
Use bcrypt directly instead of passlib 2024-03-07 18:17:17 +01:00
grossmj
a80aed5420
Development on 2.2.47.dev1 2024-03-05 01:07:16 +08:00
grossmj
e9827653ae
Merge branch '2.2' into 3.0
# Conflicts:
#	gns3server/crash_report.py
#	gns3server/static/web-ui/index.html
#	gns3server/version.py
#	tests/compute/docker/test_docker_vm.py
2024-03-05 01:05:46 +08:00
grossmj
e8a7e80456
Release v2.2.46 2024-02-26 16:55:12 +08:00
grossmj
ab05784c33
Sync appliances 2024-02-26 16:45:37 +08:00
grossmj
6983e686ca
Bundle web-ui v2.2.46 2024-02-26 16:42:46 +08:00
grossmj
3631202ce5
Merge remote-tracking branch 'origin/2.2' into 2.2 2024-02-26 16:36:21 +08:00
grossmj
8d8a3247c4
Bundle web-ui v2.2.46 2024-02-26 16:35:47 +08:00
Jeremy Grossmann
52638a9a8d
Merge branch '2.2' into bugfix/3555 2024-02-26 16:22:15 +08:00
grossmj
9a5af82a28
Save empty directories when exporting a project 2024-02-24 19:02:16 +08:00
grossmj
84db3b9996
Fix not all Docker resources are copied to a writable location 2024-02-22 12:59:44 +08:00
grossmj
800920e3df
Merge branch '2.2' into 3.0
# Conflicts:
#	.github/workflows/testing.yml
#	gns3server/compute/docker/__init__.py
#	gns3server/compute/docker/docker_vm.py
#	gns3server/run.py
#	requirements.txt
#	setup.py
#	tests/compute/docker/test_docker_vm.py
2024-02-21 12:24:30 +08:00
grossmj
1a53c9aabf
Backport from v3: install Docker resources in a writable location at runtime. 2024-02-14 16:13:45 +08:00
grossmj
1f5085608c
Use Docker API v1.24 to get version. 2024-02-14 15:40:19 +08:00
Jeremy Grossmann
16f72b4d3d
Merge pull request #2347 from SpikefishSolutions/DeadTelnetConsoleFix
Address the telnet console death bug.
2024-02-09 20:33:16 +11:00
grossmj
f050fc7e00
Change runtime checks for Python version 2024-02-09 16:49:58 +11:00
John Fleming
763ef24108 Address the telnet console bug. Add wait_for for drain() call. If we're stuck on drain then the buffer isn't getting emptied. 5 seconds after drain() blocks, exception will be thrown and client will be removed from connection table and will no longer be a problem. 2024-02-02 22:09:31 -05:00
grossmj
0037f31553
Merge branch '2.2' into 3.0
# Conflicts:
#	CHANGELOG
#	docs/api/notifications/link.updated.json
#	docs/api/notifications/log.warning.json
#	docs/api/v2/compute/ethernet_switch/projectsprojectidethernetswitchnodes.rst
#	docs/api/v2/compute/ethernet_switch/projectsprojectidethernetswitchnodesnodeid.rst
#	docs/api/v2/compute/iou/projectsprojectidiounodes.rst
#	docs/api/v2/compute/project/projects.rst
#	docs/api/v2/compute/qemu/projectsprojectidqemunodes.rst
#	docs/api/v2/compute/qemu/projectsprojectidqemunodesnodeid.rst
#	docs/api/v2/compute/qemu/projectsprojectidqemunodesnodeidstart.rst
#	docs/api/v2/controller/link/projectsprojectidlinks.rst
#	docs/api/v2/controller/link/projectsprojectidlinkslinkid.rst
#	docs/api/v2/controller/link/projectsprojectidlinkslinkidstartcapture.rst
#	docs/api/v2/controller/project/projects.rst
#	docs/api/v2/controller/project/projectsprojectidduplicate.rst
#	docs/controller_notifications.rst
#	docs/curl.rst
#	docs/gns3_file.json
#	docs/project_notifications.rst
#	gns3server/compute/qemu/qemu_vm.py
#	gns3server/controller/project.py
#	gns3server/crash_report.py
#	gns3server/schemas/ethernet_hub.py
#	gns3server/schemas/ethernet_switch.py
#	gns3server/static/web-ui/3rdpartylicenses.txt
#	gns3server/static/web-ui/index.html
#	gns3server/utils/asyncio/telnet_server.py
#	gns3server/version.py
#	gns3server/web/web_server.py
#	requirements.txt
#	tests/controller/test_project.py
#	tests/controller/test_topology.py
#	tests/handlers/api/controller/test_project.py
2024-01-28 12:30:43 +11:00