1
0
mirror of https://github.com/GNS3/gns3-server synced 2024-11-28 11:18:11 +00:00
Commit Graph

4433 Commits

Author SHA1 Message Date
grossmj
3214f52e9e
Merge branch '2.2' into 3.0
# Conflicts:
#	gns3server/compute/docker/docker_vm.py
#	gns3server/handlers/api/compute/docker_handler.py
#	gns3server/schemas/docker.py
#	gns3server/schemas/docker_template.py
#	tests/compute/docker/test_docker_vm.py
2024-09-18 17:29:06 +07:00
grossmj
3792901dc7
Support for configuring MAC address in Docker containers 2024-09-18 16:30:22 +07:00
grossmj
9bcf26b943
Release v3.0.0rc1 2024-08-11 11:35:19 -06:00
grossmj
b80e1f3a22
Downgrade aiohttp to v3.9.5 2024-08-11 11:22:20 -06:00
grossmj
ba13b0b078
Bundle web-ui v3.0.0rc1 2024-08-11 11:09:27 -06:00
grossmj
90c69d95ad
Merge branch '2.2' into 3.0
# Conflicts:
#	gns3server/crash_report.py
#	gns3server/static/web-ui/index.html
#	gns3server/static/web-ui/main.99a70a8d013fc974361c.js
#	gns3server/version.py
#	requirements.txt
2024-08-10 18:58:43 -06:00
grossmj
21a5c5d3f2
Development on 2.2.50.dev1 2024-08-06 20:33:54 +02:00
grossmj
b1209155f5
Release v2.2.49 2024-08-06 12:55:15 +02:00
grossmj
7cebb9472a
Bundle web-ui v2.2.49 2024-08-06 12:41:06 +02:00
grossmj
b1c1c0520c
Sync appliances 2024-08-06 12:34:07 +02:00
grossmj
2bb26075f0
Forbid -nic and -nicdev in Qemu additional options. Fixes https://github.com/GNS3/gns3-server/issues/2397 2024-08-05 17:51:46 +02:00
grossmj
24cace8122
Merge remote-tracking branch 'origin/2.2' into 3.0
# Conflicts:
#	dev-requirements.txt
#	requirements.txt
#	setup.py
2024-08-03 12:58:19 +02:00
grossmj
95a4c284bc
Update IOU base configs to use "no ip domain lookup". Fixes #2404 2024-07-22 19:07:17 +02:00
grossmj
2416069a6e
Update _convert_2.2.0() with correct comments 2024-07-20 17:55:38 +02:00
grossmj
999f41b03e
Convert topologies < 3.0 to have valid node hostnames 2024-07-20 17:22:24 +02:00
grossmj
6951137a25
Development on 2.2.49.dev1 2024-07-13 16:32:13 +02:00
grossmj
8659439829
Release v2.2.48.1 2024-07-12 18:26:16 +02:00
grossmj
677bc389a5
Bundle web-ui v2.2.48.1 2024-07-11 23:44:24 +02:00
grossmj
3f7f5a3cda
Fix to access resources_path and install_builtin_appliances settings 2024-07-09 12:28:39 +02:00
grossmj
59ad5c55ec
Merge branch '2.2' into 3.0
# Conflicts:
#	CHANGELOG
#	gns3server/config_samples/gns3_server.conf
#	gns3server/controller/__init__.py
#	gns3server/crash_report.py
#	gns3server/static/web-ui/index.html
#	gns3server/static/web-ui/main.b65e52314df938ebe652.js
#	gns3server/version.py
2024-07-09 12:14:44 +02:00
grossmj
4a58ede550
Development on 2.2.49.dev1 2024-07-09 00:32:44 +02:00
grossmj
6e8e0764c1
Release v2.2.48 2024-07-08 18:44:09 +02:00
grossmj
eaa18ad624
Bundle web-ui v2.2.48 2024-07-08 18:24:02 +02:00
grossmj
0a32be276e
Sync appliances 2024-07-08 18:18:25 +02:00
grossmj
ca1d99b112
Add 'install_builtin_appliances' and 'resources_path' settings in the server config 2024-07-08 18:06:33 +02:00
grossmj
6b14abc06f
Add allow_unsafe_options for Qemu settings 2024-07-07 19:08:12 +02:00
grossmj
6ed18c561f
Merge branch '2.2' into 3.0
# Conflicts:
#	gns3server/compute/qemu/qemu_vm.py
#	gns3server/config_samples/gns3_server.conf
#	gns3server/controller/export_project.py
#	gns3server/controller/project.py
#	gns3server/controller/snapshot.py
#	gns3server/handlers/api/controller/project_handler.py
#	tests/controller/test_export_project.py
#	tests/controller/test_import_project.py
#	tests/controller/test_snapshot.py
2024-07-07 19:04:50 +02:00
Jeremy Grossmann
90dce03da2
Merge pull request #2392 from GNS3/bugfix/2385
Forbid unsafe Qemu additional options
2024-07-06 17:18:59 +02:00
grossmj
d54c9db8c3
Option to keep the compute IDs unchanged when exporting a project 2024-07-06 17:08:16 +02:00
grossmj
b194e48649
Forbid unsafe Qemu additional options 2024-07-06 12:24:22 +02:00
grossmj
08154e43aa
Fix error when snapshot exists with an underscore in the name 2024-07-05 12:04:53 +02:00
grossmj
3a4ffb8786
Merge branch '2.2' into 3.0
# Conflicts:
#	gns3server/compute/qemu/qemu_vm.py
#	gns3server/utils/__init__.py
#	requirements.txt
2024-07-03 19:00:44 +02:00
grossmj
39057bd781
Fix check for IPv6 enabled on host 2024-06-17 16:41:40 +02:00
grossmj
0f3b96f134
Development on 2.2.48.dev1 2024-05-23 12:19:15 +07:00
grossmj
df210386dd
Development on 3.0.0.dev14 2024-05-19 20:57:11 +07:00
grossmj
3e512e650a
Release v3.0.0b3 2024-05-19 17:23:16 +07:00
grossmj
e50e2c90bd
Bundle web-ui v3.0.0b3 2024-05-19 17:16:52 +07:00
grossmj
c1f9f1111d
Sync appliances 2024-05-19 17:13:07 +07:00
grossmj
8c1dbf0084
Fix to allow duplicating IOS routers 2024-05-19 00:33:55 +07:00
grossmj
6f2b12c218
Fix to allow changing the auxiliary console for IOS router nodes. 2024-05-18 23:43:50 +07:00
grossmj
4b1068e02f
Replace deprecated method datetime.utcnow() 2024-05-18 23:33:26 +07:00
grossmj
d477eb8366
Fix reset console for non running IOU devices 2024-05-18 23:30:58 +07:00
grossmj
990dabb7e4
Do not allow to create a builtin template using the API. 2024-05-17 00:05:25 +07:00
grossmj
3ab74b8094
Development on 3.0.0.dev13 2024-05-16 19:18:53 +07:00
grossmj
5cd540d94d
Remove old files 2024-05-16 17:57:51 +07:00
grossmj
d3860ba84b
Merge branch '2.2' into 3.0
# Conflicts:
#	CHANGELOG
#	dev-requirements.txt
#	gns3server/compute/qemu/__init__.py
#	gns3server/compute/vmware/__init__.py
#	gns3server/controller/snapshot.py
#	gns3server/crash_report.py
#	gns3server/handlers/api/compute/atm_switch_handler.py
#	gns3server/run.py
#	gns3server/static/web-ui/26.77d4bfd104f37c42e028.js
#	gns3server/static/web-ui/index.html
#	gns3server/static/web-ui/runtime.415291667f70565cd8ef.js
#	gns3server/utils/__init__.py
#	gns3server/utils/images.py
#	gns3server/utils/interfaces.py
#	gns3server/version.py
#	gns3server/web/web_server.py
#	pytest.ini
#	requirements.txt
#	scripts/update-bundled-web-ui.sh
#	setup.py
#	tests/api/routes/compute/test_dynamips_nodes.py
#	tests/compute/builtin/nodes/test_cloud.py
#	tests/compute/docker/test_docker.py
#	tests/compute/docker/test_docker_vm.py
#	tests/compute/dynamips/test_dynamips_manager.py
#	tests/compute/dynamips/test_dynamips_router.py
#	tests/compute/iou/test_iou_vm.py
#	tests/compute/qemu/test_qcow2.py
#	tests/compute/qemu/test_qemu_manager.py
#	tests/compute/qemu/test_qemu_vm.py
#	tests/compute/test_base_node.py
#	tests/compute/test_manager.py
#	tests/compute/test_project.py
#	tests/compute/traceng/test_traceng_vm.py
#	tests/compute/virtualbox/test_virtualbox_manager.py
#	tests/compute/virtualbox/test_virtualbox_vm.py
#	tests/compute/vmware/test_vmware_manager.py
#	tests/compute/vmware/test_vmware_vm.py
#	tests/compute/vpcs/test_vpcs_vm.py
#	tests/conftest.py
#	tests/controller/gns3vm/test_remote_gns3_vm.py
#	tests/controller/gns3vm/test_virtualbox_gns3_vm.py
#	tests/controller/gns3vm/test_vmware_gns3_vm.py
#	tests/controller/test_export_project.py
#	tests/controller/test_gns3vm.py
#	tests/controller/test_import_project.py
#	tests/test_config.py
#	tests/utils/test_asyncio.py
#	tests/utils/test_images.py
#	tests/web/test_response.py
2024-05-16 17:53:39 +07:00
grossmj
3e133eda44
Bundle web-ui v3.0.0b3 2024-05-16 17:30:12 +07:00
grossmj
e01256980c
Sync appliances 2024-05-16 17:27:38 +07:00
grossmj
0561aba927
Release v2.2.47 2024-05-15 12:14:48 +07:00
grossmj
86a78f53cb
Fix update-bundled-web-ui.sh script 2024-05-15 12:05:43 +07:00