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
|
753135a80d
|
Merge branch 'master' into 2.2
|
2024-10-28 17:32:34 +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
|
dbe2b8a5fb
|
Python 3.13 support
|
2024-10-26 18:38:07 +10:00 |
|
grossmj
|
80487eb62d
|
Upgrade dependencies
|
2024-10-26 18:22:40 +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 |
|
Jeremy Grossmann
|
97e5a5edc3
|
Merge pull request #2430 from GNS3/2.2
Release v2.2.50
|
2024-10-21 13:21:24 +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
|
4357410b10
|
Do not run tests on Windows (temporarily)
|
2024-10-19 17:13:13 +10:00 |
|
grossmj
|
734365b216
|
Fix win10pcap installation in tests
|
2024-10-19 17:04:10 +10:00 |
|
grossmj
|
abb7cc2075
|
Install win10pcap in tests
|
2024-10-19 17:00:32 +10:00 |
|
grossmj
|
c273a78560
|
Upgrade pytest to v8.3.3
|
2024-10-19 16:33:54 +10:00 |
|
grossmj
|
718269e5b3
|
Fix syntax error in testing.yml
|
2024-10-19 16:23:46 +10:00 |
|
grossmj
|
19fd7d2193
|
Install Windows dependencies in GH Actions
|
2024-10-19 16:22:29 +10:00 |
|
grossmj
|
e62ffb1b87
|
Fix testing on Windows with GH Actions
|
2024-10-19 16:12:06 +10:00 |
|
grossmj
|
42808161bf
|
Replace AppVeyor testing with GH Actions
|
2024-10-19 16:07:53 +10:00 |
|
Jeremy Grossmann
|
45ee662c56
|
Merge pull request #2428 from GNS3/bugfix/2427
Symbolic links support for project export/import
|
2024-10-19 15:54:41 +10:00 |
|
grossmj
|
24bfc205db
|
Symbolic links support for project export/import
|
2024-10-19 15:49:23 +10:00 |
|
grossmj
|
cb46c0fbcc
|
Merge remote-tracking branch 'origin/2.2' into 2.2
|
2024-10-14 17:48:42 +10:00 |
|
grossmj
|
35256901b5
|
Add comment to indicate sentry-sdk is optional. Ref https://github.com/GNS3/gns3-server/issues/2423
|
2024-10-14 17:46:53 +10:00 |
|
Jeremy Grossmann
|
6933c3d938
|
Merge pull request #2420 from GNS3/bugfix/2419
Fix issues with recent busybox versions
|
2024-10-01 17:37:44 +07: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 |
|
Jeremy Grossmann
|
a1922ef067
|
Merge pull request #2413 from z5241248/master
Duplicate faster
|
2024-09-29 19:44:49 +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 |
|
Jeremy Grossmann
|
1332e940fd
|
Merge branch '2.2' into master
|
2024-09-26 16:26:56 +07:00 |
|
grossmj
|
19bd953d31
|
Update README.md to change the minimum required Python version.
|
2024-09-26 16:25:26 +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
|
a7b56739a9
|
Fixes after merging
|
2024-09-23 14:08:24 +07: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
|
d1a7474ef6
|
Merge pull request #2418 from GNS3/revert-2417-backport-aux-console-support
Revert "Backport auxiliary console support for Qemu, Docker and Dynamips nodes"
|
2024-09-23 13:15:34 +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
|
d3138daa23
|
Fix Docker tests
|
2024-09-22 22:12:40 +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 |
|
Jeremy Grossmann
|
f1294cf267
|
Merge pull request #2417 from GNS3/backport-aux-console-support
Backport auxiliary console support for Qemu, Docker and Dynamips nodes
|
2024-09-22 21:44:31 +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 |
|
Jeremy Grossmann
|
1f09a3e6bc
|
Merge pull request #2416 from GNS3/bugfix/2414
Run Docker containers with user namespaces enabled
|
2024-09-19 11:01:11 +07:00 |
|