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

# Conflicts:
#	gns3server/controller/__init__.py
#	gns3server/controller/appliance_manager.py
#	gns3server/crash_report.py
#	gns3server/run.py
#	gns3server/static/web-ui/index.html
#	gns3server/utils/images.py
#	gns3server/version.py
#	requirements.txt
#	scripts/update-bundled-web-ui.sh

2023-08-10 15:00:22 +10:00

..

gns3vm

Merge branch '2.2' into 3.0

2023-08-10 15:00:22 +10:00

ports

Rename __json__() to asdict()

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

__init__.py

Add log message for comparing controller version with config version. Ref https://github.com/GNS3/gns3-gui/issues/3486

2023-08-05 20:24:11 +10:00

appliance_manager.py

Revert "Use truststore in appliance_manager.py instead"

2023-08-07 20:44:37 +10: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

Allow computes to be dynamically or manually allocated

2023-06-21 22:28:09 +09:30

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

Do not tweak zstd compression params

2022-06-03 11:26:26 +07:00

link.py

Merge branch 'master' into 3.0

2021-08-29 19:23:51 +09:30

node.py

Fix open IPv6 address for HTTP consoles on controller. Fixes https://github.com/GNS3/gns3-gui/issues/3448

2023-05-22 19:42:01 +08:00

notification.py

Rename __json__() to asdict()

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

project.py

Allow computes to be dynamically or manually allocated

2023-06-21 22:28:09 +09:30

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

Use default symbol theme if none is provided when loading appliances

2022-07-25 20:39:03 +02: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