grossmj b3dfb87622 Merge branch '2.2' into 3.0 ...

# Conflicts:
#	gns3server/controller/__init__.py
#	gns3server/crash_report.py
#	gns3server/static/web-ui/index.html
#	gns3server/static/web-ui/main.96be36058f5df0ca7e7f.js
#	gns3server/utils/images.py
#	gns3server/version.py
#	requirements.txt
#	tests/compute/docker/test_docker_vm.py
#	tests/controller/test_controller.py

2023-05-22 15:11:17 +08:00

..

adapters

Use pyupgrade with --py36-plus param.

2021-04-13 18:37:58 +09:30

builtin

Drop Windows support

2022-01-19 22:28:36 +10:30

docker

Merge branch '2.2' into 3.0

2023-05-22 15:11:17 +08:00

dynamips

Merge branch '2.2' into 3.0

2023-03-17 17:44:32 +10:00

iou

Merge branch '3.0' into iou-user-loader-libraries

2022-07-20 16:44:48 +02:00

nios

Rename __json__() to asdict()

2021-04-17 23:34:28 +09:30

qemu

Merge branch '2.2' into 3.0

2023-03-17 17:44:32 +10:00

ubridge

Drop Windows support

2022-01-19 22:28:36 +10:30

virtualbox

Support to reset all console connections. Ref https://github.com/GNS3/gns3-server/issues/1619

2022-06-15 15:30:44 +02:00

vmware

Merge branch '2.2' into 3.0

2022-11-09 20:30:28 +08:00

vpcs

Merge 2.2

2023-01-05 12:38:00 +08:00

__init__.py

Drop Windows support

2022-01-19 22:28:36 +10:30

base_manager.py

Detect new images added to the default image directory.

2022-04-17 16:58:20 +07:00

base_node.py

Merge branch '2.2' into 3.0

2023-03-17 17:44:32 +10:00

compute_error.py

Use black with -l 120 param.

2021-04-13 18:46:50 +09:30

error.py

Use black with -l 120 param.

2021-04-13 18:46:50 +09:30

notification_manager.py

Use black with -l 120 param.

2021-04-13 18:46:50 +09:30

port_manager.py

Merge 2.2

2023-01-05 12:38:00 +08:00

project_manager.py

Move schemas between compute and controller subpackages

2021-04-15 18:12:08 +09:30

project.py

"Local" command line parameter is only for stopping

2022-03-30 18:38:34 +08:00