1
0
mirror of https://github.com/GNS3/gns3-server synced 2024-11-28 11:18:11 +00:00
gns3-server/gns3server/controller
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
..
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 Install Docker resources in writable location 2023-11-13 11:23:26 +10: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 Upgrade SQLAlchemy to v2.0.18 and fix async_timeout warning 2023-08-11 22:52:29 +10: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 Do not tweak zstd compression params 2022-06-03 11:26:26 +07:00
import_project.py Make images executable after importing a project 2023-11-23 11:30:46 +10: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-01-28 12:30:43 +11:00
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 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 Fix packet capture 2021-12-02 18:07:09 +10:30