1
0
mirror of https://github.com/GNS3/gns3-server synced 2024-11-25 01:38:08 +00:00
gns3-server/gns3server/controller
grossmj 6ed18c561f
Merge branch '2.2' into 3.0
# Conflicts:
#	gns3server/compute/qemu/qemu_vm.py
#	gns3server/config_samples/gns3_server.conf
#	gns3server/controller/export_project.py
#	gns3server/controller/project.py
#	gns3server/controller/snapshot.py
#	gns3server/handlers/api/controller/project_handler.py
#	tests/controller/test_export_project.py
#	tests/controller/test_import_project.py
#	tests/controller/test_snapshot.py
2024-07-07 19:04:50 +02:00
..
gns3vm Merge branch '2.2' into 3.0 2023-09-23 15:54:54 +10:00
ports Remove model validator. Fixes https://github.com/GNS3/gns3-gui/issues/3522 2023-10-15 11:16:05 +10:00
__init__.py Merge branch '2.2' into 3.0 2024-03-05 01:05:46 +08:00
appliance_manager.py Merge branch '2.2' into 3.0 2023-09-06 23:30:00 +07: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 Fix warnings in tests 2024-05-09 17:11:12 +07:00
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 Merge branch '2.2' into 3.0 2024-07-07 19:04:50 +02:00
import_project.py Merge branch '2.2' into 3.0 2024-07-07 19:04:50 +02:00
link.py Merge branch 'master' into 3.0 2021-08-29 19:23:51 +09:30
node.py Merge branch '2.2' into 3.0 2023-10-18 17:48:09 +10:00
notification.py Rename __json__() to asdict() 2021-04-17 23:34:28 +09:30
project.py Merge branch '2.2' into 3.0 2024-07-07 19:04:50 +02:00
snapshot.py Merge branch '2.2' into 3.0 2024-07-07 19:04:50 +02:00
symbol_themes.py Merge branch '2.2' into 3.0 2024-04-22 19:08:45 +07:00
symbols.py Fix tests 2023-11-15 11:57:14 +10:00
topology.py Pydantic v2 migration 2023-08-04 18:20:06 +10:00
udp_link.py Merge branch '2.2' into 3.0 2024-05-16 17:53:39 +07:00