1
0
mirror of https://github.com/GNS3/gns3-server synced 2024-11-28 19:28:07 +00:00
gns3-server/gns3server/controller
grossmj 802959f9ab Merge branch 'master' into 3.0
# Conflicts:
#	dev-requirements.txt
#	gns3server/controller/__init__.py
#	gns3server/controller/appliance_manager.py
#	gns3server/controller/compute.py
#	gns3server/controller/topology.py
#	gns3server/handlers/api/compute/ethernet_switch_handler.py
#	gns3server/handlers/api/controller/link_handler.py
#	gns3server/handlers/api/controller/symbol_handler.py
#	gns3server/version.py
#	requirements.txt
#	tests/controller/test_export_project.py
#	tests/handlers/api/compute/test_qemu.py
#	tests/web/test_response.py
#	win-requirements.txt
2021-04-10 12:46:40 +09:30
..
gns3vm Merge branch '2.2' into 3.0 2020-11-05 17:15:25 +10:30
ports Migration to FastAPI 2020-10-02 16:07:50 +09:30
__init__.py Fix packet capture with HTTPS remote server. Fixes #1882 2021-04-07 12:40:15 +09:30
appliance_manager.py Merge branch 'master' into 3.0 2021-04-10 12:46:40 +09:30
appliance.py Support controller reloading for templates, appliances and projects. Ref #1743 2020-04-30 15:30:50 +09:30
compute.py Set PyQt5 version to 5.15.2 on Windows 2021-04-06 22:12:34 +09:30
controller_error.py Use aiosqlite and add service for templates 2021-03-28 21:17:29 +10:30
drawing.py Prevent locked drawings to be deleted. Fixes https://github.com/GNS3/gns3-gui/issues/2948 2020-03-16 16:30:08 +10:30
export_project.py Merge branch 'master' into 3.0 2021-04-10 12:46:40 +09:30
import_project.py Migration to FastAPI 2020-10-02 16:07:50 +09:30
link.py Move to version 3 of the REST API. 2020-11-02 12:05:32 +10:30
node.py Refactor template management to use database. 2021-03-28 11:15:08 +10:30
notification.py Move endpoints to routes & preparations to use a database. 2020-11-19 15:21:03 +10:30
project.py Refactor template management to use database. 2021-03-28 11:15:08 +10:30
snapshot.py Migration to FastAPI 2020-10-02 16:07:50 +09:30
symbol_themes.py Early support for symbol themes. 2019-03-12 18:13:33 +07:00
symbols.py Merge branch '2.2' into 3.0 2020-10-12 18:04:49 +10:30
topology.py Fix packet capture with HTTPS remote server. Fixes #1882 2021-04-07 12:40:15 +09:30
udp_link.py Migration to FastAPI 2020-10-02 16:07:50 +09:30