grossmj
|
ec300d19d4
|
Replace aiohttp.web.HTTPConflict()
|
2024-10-31 13:11:01 +10:00 |
|
grossmj
|
7e902726bf
|
Fix issues after merge
|
2024-10-31 13:06:17 +10:00 |
|
grossmj
|
c4fcb43e78
|
Merge branch '2.2' into 3.0
# Conflicts:
# .github/workflows/testing.yml
# CHANGELOG
# README.md
# dev-requirements.txt
# gns3server/compute/docker/docker_vm.py
# gns3server/controller/export_project.py
# gns3server/controller/import_project.py
# gns3server/controller/project.py
# gns3server/crash_report.py
# gns3server/static/web-ui/index.html
# gns3server/static/web-ui/main.df8c319a3da6fb0e3629.js
# gns3server/version.py
# requirements.txt
# setup.py
# tests/compute/docker/test_docker_vm.py
# tests/controller/test_import_project.py
|
2024-10-31 12:54:35 +10:00 |
|
grossmj
|
c05e1cb8e7
|
Use @locking when sending uBridge commands. Ref https://github.com/GNS3/gns3-gui/issues/3651
|
2024-10-28 13:02:04 +10:00 |
|
grossmj
|
48b7e6ca50
|
Fix run Docker containers with user namespaces enabled. Fixes #2414
|
2024-10-26 19:03:05 +10:00 |
|
grossmj
|
6e66b26b88
|
Fix errors in init.sh. Fixes #2431
|
2024-10-22 12:18:28 +10:00 |
|
grossmj
|
9990666076
|
Development on 2.2.51.dev1
|
2024-10-21 13:24:14 +10:00 |
|
grossmj
|
2b5c6ce8fb
|
Release v2.2.50
|
2024-10-21 12:14:18 +10:00 |
|
grossmj
|
0aac62d03a
|
Bundle web-ui v2.2.50
|
2024-10-21 12:08:42 +10:00 |
|
grossmj
|
4058abf16e
|
Sync appliances
|
2024-10-21 11:54:02 +10:00 |
|
grossmj
|
24bfc205db
|
Symbolic links support for project export/import
|
2024-10-19 15:49:23 +10:00 |
|
grossmj
|
8af71ee291
|
Formatting
|
2024-10-01 17:35:11 +07:00 |
|
grossmj
|
c0be6875c2
|
Fix issues with recent busybox versions
* `busybox --install` does not exist
* `sleep` does not take float values (e.g. 0.5).
|
2024-10-01 17:31:29 +07:00 |
|
grossmj
|
cafdb2522b
|
Add / update docstrings
|
2024-09-29 19:42:06 +07:00 |
|
grossmj
|
f7996d5e98
|
Fix tests
|
2024-09-27 20:05:06 +07:00 |
|
grossmj
|
996dad2f5c
|
Support to reset MAC addresses for Docker nodes and some adjustments for fast duplication.
|
2024-09-26 18:41:23 +07:00 |
|
赵昕彧
|
3a896b6964
|
Duplicate faster - 2
|
2024-09-26 08:26:08 +08:00 |
|
grossmj
|
441f0fb1b5
|
Merge remote-tracking branch 'z5241248/master' into fork/z5241248/master
|
2024-09-25 19:45:44 +07:00 |
|
grossmj
|
a02b57698a
|
Add missing imports
|
2024-09-25 19:45:14 +07:00 |
|
Jeremy Grossmann
|
7582107ae5
|
Merge branch '2.2' into master
|
2024-09-25 19:41:40 +07:00 |
|
赵昕彧
|
2dbde5df22
|
Copying project files directly, rather than copying them in an import-export fashion, can make copying projects many times faster
|
2024-09-25 20:27:46 +08:00 |
|
grossmj
|
8ce0cbf7f7
|
Merge branch '2.2' into 3.0
# Conflicts:
# gns3server/compute/base_node.py
# gns3server/compute/docker/docker_vm.py
# gns3server/compute/dynamips/nodes/c1700.py
# gns3server/compute/dynamips/nodes/c2600.py
# gns3server/compute/dynamips/nodes/c2691.py
# gns3server/compute/dynamips/nodes/c3600.py
# gns3server/compute/dynamips/nodes/c3725.py
# gns3server/compute/dynamips/nodes/c3745.py
# gns3server/compute/dynamips/nodes/c7200.py
# gns3server/compute/dynamips/nodes/router.py
# gns3server/compute/qemu/qemu_vm.py
# gns3server/controller/node.py
# gns3server/controller/topology.py
# gns3server/handlers/api/compute/docker_handler.py
# gns3server/handlers/api/compute/dynamips_vm_handler.py
# gns3server/handlers/api/compute/qemu_handler.py
# gns3server/schemas/docker.py
# gns3server/schemas/docker_template.py
# gns3server/schemas/dynamips_template.py
# gns3server/schemas/dynamips_vm.py
# gns3server/schemas/node.py
# gns3server/schemas/qemu.py
# gns3server/schemas/qemu_template.py
|
2024-09-23 13:28:56 +07:00 |
|
grossmj
|
7b5d123ad8
|
Improve error message when a project cannot be parsed.
|
2024-09-23 13:23:03 +07:00 |
|
Jeremy Grossmann
|
af6f34b2ca
|
Revert "Backport auxiliary console support for Qemu, Docker and Dynamips nodes"
|
2024-09-23 13:10:58 +07:00 |
|
grossmj
|
967c7d066d
|
Delete old code after merging
|
2024-09-22 22:02:14 +07:00 |
|
grossmj
|
7619080a50
|
Merge branch '2.2' into 3.0
# Conflicts:
# gns3server/compute/base_node.py
# gns3server/compute/docker/docker_vm.py
# gns3server/compute/dynamips/nodes/c1700.py
# gns3server/compute/dynamips/nodes/c2600.py
# gns3server/compute/dynamips/nodes/c2691.py
# gns3server/compute/dynamips/nodes/c3600.py
# gns3server/compute/dynamips/nodes/c3725.py
# gns3server/compute/dynamips/nodes/c3745.py
# gns3server/compute/dynamips/nodes/c7200.py
# gns3server/compute/dynamips/nodes/router.py
# gns3server/compute/qemu/qemu_vm.py
# gns3server/controller/node.py
# gns3server/handlers/api/compute/docker_handler.py
# gns3server/handlers/api/compute/dynamips_vm_handler.py
# gns3server/handlers/api/compute/qemu_handler.py
# gns3server/schemas/docker.py
# gns3server/schemas/docker_template.py
# gns3server/schemas/dynamips_template.py
# gns3server/schemas/dynamips_vm.py
# gns3server/schemas/node.py
# gns3server/schemas/qemu.py
# gns3server/schemas/qemu_template.py
|
2024-09-22 22:01:06 +07:00 |
|
grossmj
|
74782d413f
|
Change method to allocate AUX console for existing Dynamips nodes
|
2024-09-22 21:41:10 +07:00 |
|
grossmj
|
c41c11eb34
|
Backport auxiliary console support for Qemu, Docker and Dynamips nodes
|
2024-09-22 18:29:04 +07:00 |
|
grossmj
|
22f022cc22
|
Fix for running Docker containers with user namespaces enabled
|
2024-09-19 10:40:22 +07:00 |
|
grossmj
|
a1666dd247
|
Fix MAC address support for Docker containers
|
2024-09-18 18:02:35 +07:00 |
|
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 |
|
赵昕彧
|
5ffe5fd9b3
|
Copying project files directly, rather than copying them in an import-export fashion, can make copying projects many times faster
|
2024-08-23 14:31:21 +08: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 |
|