1
0
mirror of https://github.com/GNS3/gns3-server synced 2024-12-26 00:38:10 +00:00
gns3-server/gns3server
grossmj 263febecbc Merge branch '2.2' into 3.0
# Conflicts:
#	.github/workflows/testing.yml
#	CHANGELOG
#	appveyor.yml
#	dev-requirements.txt
#	gns3server/compute/base_node.py
#	gns3server/controller/__init__.py
#	gns3server/controller/appliance_manager.py
#	gns3server/crash_report.py
#	gns3server/static/web-ui/index.html
#	gns3server/utils/get_resource.py
#	gns3server/version.py
#	gns3server/web/route.py
#	requirements.txt
#	tests/handlers/api/compute/test_qemu.py
#	win-requirements.txt
2022-11-09 20:30:28 +08:00
..
api Upgrade to FastAPI 0.85.0 and check embedded web-ui index.html can be found. 2022-09-29 15:11:15 +02:00
appliances Sync appliance files 2022-11-08 18:40:27 +08:00
compute Merge branch '2.2' into 3.0 2022-11-09 20:30:28 +08:00
configs New VPCS base config. Fixes #786. 2017-06-28 17:40:54 +08:00
controller Merge branch '2.2' into 3.0 2022-11-09 20:30:28 +08:00
core Fix merge error 2022-04-18 17:18:30 +07:00
db Optionally allow Qemu raw images 2022-07-22 12:39:52 +02:00
schemas Require name for custom adapters. Fixes #2098 2022-08-28 17:33:33 +02:00
services Use generic symbol names 2022-07-25 12:33:40 +02:00
static Add web-ui v3.0.0a2 2022-09-07 00:57:08 +02:00
symbols Update affinity symbols. Fixes https://github.com/GNS3/gns3-gui/issues/3232 2021-09-20 17:46:19 +09:30
templates Move to version 3 of the REST API. 2020-11-02 12:05:32 +10:30
utils Merge branch '2.2' into 3.0 2022-11-09 20:30:28 +08:00
__init__.py Use pyupgrade with --py36-plus param. 2021-04-13 18:37:58 +09:30
__main__.py Allow to start server with python -m gns3server 2015-08-25 22:31:45 +02:00
config.py Drop Windows support 2022-01-19 22:28:36 +10:30
crash_report.py Merge branch '2.2' into 3.0 2022-11-09 20:30:28 +08:00
logger.py Drop Windows support 2022-01-19 22:28:36 +10:30
main.py Drop Windows support 2022-01-19 22:28:36 +10:30
server.py Backward compatibility for --log argument 2022-04-27 14:15:29 +07:00
version.py Merge branch '2.2' into 3.0 2022-11-09 20:30:28 +08:00