1
0
mirror of https://github.com/GNS3/gns3-server synced 2024-12-26 16:58:28 +00:00
gns3-server/gns3server/controller
grossmj 1ff23348d3 Merge branch '2.2' into 3.0
# Conflicts:
#	gns3server/compute/base_node.py
#	gns3server/compute/docker/__init__.py
#	gns3server/compute/qemu/qemu_vm.py
#	gns3server/controller/compute.py
#	gns3server/controller/gns3vm/virtualbox_gns3_vm.py
#	gns3server/controller/node.py
#	gns3server/controller/project.py
#	gns3server/crash_report.py
#	gns3server/handlers/api/controller/template_handler.py
#	gns3server/static/web-ui/index.html
#	gns3server/static/web-ui/main.8448c96e4facbe79a613.js
#	gns3server/version.py
#	tests/compute/iou/test_iou_vm.py
#	tests/compute/qemu/test_qemu_vm.py
#	tests/handlers/api/controller/test_template.py
2023-06-20 16:06:53 +09:30
..
gns3vm Merge branch '2.2' into 3.0 2023-06-20 16:06:53 +09:30
ports Rename __json__() to asdict() 2021-04-17 23:34:28 +09:30
__init__.py Merge branch '2.2' into 3.0 2023-05-22 15:11:17 +08:00
appliance_manager.py Merge branch '2.2' into 3.0 2023-05-22 15:11:17 +08:00
appliance_to_template.py Remove Qemu binary requirement 2022-04-19 18:21:39 +07:00
appliance.py Validate appliance files with Pydantic 2021-10-18 21:46:50 +10:30
compute.py Properly catch aiohttp client exception. Ref #2228 2023-05-30 16:17:12 +09:30
controller_error.py Add missing response() method in ComputeConflictError 2022-05-27 16:03:54 +07:00
drawing.py Rename __json__() to asdict() 2021-04-17 23:34:28 +09:30
export_project.py Do not tweak zstd compression params 2022-06-03 11:26:26 +07:00
import_project.py Do not tweak zstd compression params 2022-06-03 11:26:26 +07:00
link.py Merge branch 'master' into 3.0 2021-08-29 19:23:51 +09:30
node.py Fix open IPv6 address for HTTP consoles on controller. Fixes https://github.com/GNS3/gns3-gui/issues/3448 2023-05-22 19:42:01 +08:00
notification.py Rename __json__() to asdict() 2021-04-17 23:34:28 +09:30
project.py Properly catch aiohttp client exception. Ref #2228 2023-05-30 16:17:12 +09:30
snapshot.py Merge branch '2.2' into 3.0 2021-06-12 14:36:32 +09:30
symbol_themes.py Use generic symbol names 2022-07-25 12:33:40 +02:00
symbols.py Use default symbol theme if none is provided when loading appliances 2022-07-25 20:39:03 +02:00
topology.py Merge branch '2.2' into 3.0 2022-04-27 22:23:05 +07:00
udp_link.py Fix packet capture 2021-12-02 18:07:09 +10:30