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
|
ca1d99b112
|
Add 'install_builtin_appliances' and 'resources_path' settings in the server config
|
2024-07-08 18:06:33 +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 |
|
grossmj
|
d54c9db8c3
|
Option to keep the compute IDs unchanged when exporting a project
|
2024-07-06 17:08:16 +02:00 |
|
grossmj
|
08154e43aa
|
Fix error when snapshot exists with an underscore in the name
|
2024-07-05 12:04:53 +02: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
|
259d3a0155
|
Fix cannot import UTC
|
2024-05-09 17:23:32 +07:00 |
|
grossmj
|
33499be425
|
Fix warnings in tests
|
2024-05-09 17:11:12 +07:00 |
|
grossmj
|
35b75f0f7f
|
Fix link capture for ATM switch. Fixes https://github.com/GNS3/gns3-gui/issues/3570
|
2024-04-23 18:35:36 +07:00 |
|
grossmj
|
1c37e8bd32
|
Merge branch '2.2' into 3.0
# Conflicts:
# gns3server/controller/symbol_themes.py
# gns3server/controller/template_manager.py
|
2024-04-22 19:08:45 +07:00 |
|
grossmj
|
b6e68ba1a8
|
Add NAT symbols
|
2024-04-22 18:51:29 +07:00 |
|
grossmj
|
e9827653ae
|
Merge branch '2.2' into 3.0
# Conflicts:
# gns3server/crash_report.py
# gns3server/static/web-ui/index.html
# gns3server/version.py
# tests/compute/docker/test_docker_vm.py
|
2024-03-05 01:05:46 +08:00 |
|
Jeremy Grossmann
|
52638a9a8d
|
Merge branch '2.2' into bugfix/3555
|
2024-02-26 16:22:15 +08:00 |
|
grossmj
|
9a5af82a28
|
Save empty directories when exporting a project
|
2024-02-24 19:02:16 +08:00 |
|
grossmj
|
84db3b9996
|
Fix not all Docker resources are copied to a writable location
|
2024-02-22 12:59:44 +08:00 |
|
grossmj
|
1a53c9aabf
|
Backport from v3: install Docker resources in a writable location at runtime.
|
2024-02-14 16:13:45 +08:00 |
|
grossmj
|
0037f31553
|
Merge branch '2.2' into 3.0
# Conflicts:
# CHANGELOG
# docs/api/notifications/link.updated.json
# docs/api/notifications/log.warning.json
# docs/api/v2/compute/ethernet_switch/projectsprojectidethernetswitchnodes.rst
# docs/api/v2/compute/ethernet_switch/projectsprojectidethernetswitchnodesnodeid.rst
# docs/api/v2/compute/iou/projectsprojectidiounodes.rst
# docs/api/v2/compute/project/projects.rst
# docs/api/v2/compute/qemu/projectsprojectidqemunodes.rst
# docs/api/v2/compute/qemu/projectsprojectidqemunodesnodeid.rst
# docs/api/v2/compute/qemu/projectsprojectidqemunodesnodeidstart.rst
# docs/api/v2/controller/link/projectsprojectidlinks.rst
# docs/api/v2/controller/link/projectsprojectidlinkslinkid.rst
# docs/api/v2/controller/link/projectsprojectidlinkslinkidstartcapture.rst
# docs/api/v2/controller/project/projects.rst
# docs/api/v2/controller/project/projectsprojectidduplicate.rst
# docs/controller_notifications.rst
# docs/curl.rst
# docs/gns3_file.json
# docs/project_notifications.rst
# gns3server/compute/qemu/qemu_vm.py
# gns3server/controller/project.py
# gns3server/crash_report.py
# gns3server/schemas/ethernet_hub.py
# gns3server/schemas/ethernet_switch.py
# gns3server/static/web-ui/3rdpartylicenses.txt
# gns3server/static/web-ui/index.html
# gns3server/utils/asyncio/telnet_server.py
# gns3server/version.py
# gns3server/web/web_server.py
# requirements.txt
# tests/controller/test_project.py
# tests/controller/test_topology.py
# tests/handlers/api/controller/test_project.py
|
2024-01-28 12:30:43 +11:00 |
|
grossmj
|
e3493870b2
|
Add project.created, project.opened and project.deleted controller notification stream.
Move project.updated and project.closed from project notification to controller notification stream.
|
2024-01-28 12:13:09 +11:00 |
|
grossmj
|
9509d3a713
|
Make images executable after importing a project
|
2023-11-23 11:30:46 +10:00 |
|
grossmj
|
67be4259ff
|
Fix tests
|
2023-11-15 11:57:14 +10:00 |
|
grossmj
|
4e9bc190a4
|
Upgrade to aiohttp v3.9.0rc0
|
2023-11-15 11:47:48 +10:00 |
|
grossmj
|
09ff807055
|
Install Docker resources in writable location
|
2023-11-13 11:23:26 +10:00 |
|
grossmj
|
87960f1ff0
|
Merge branch '2.2' into 3.0
# Conflicts:
# README.md
|
2023-10-18 17:48:09 +10:00 |
|
grossmj
|
3b0d89be5a
|
Merge branch 'master' into 2.2
|
2023-10-18 17:46:51 +10:00 |
|
grossmj
|
6ca15cbcff
|
Merge branch '2.2' into 3.0
# Conflicts:
# .github/workflows/testing.yml
# requirements.txt
# setup.py
|
2023-10-18 14:49:49 +10:00 |
|
grossmj
|
722512d851
|
Remove model validator. Fixes https://github.com/GNS3/gns3-gui/issues/3522
Default port name and port segment size are already set in the code when a new node is created.
|
2023-10-15 11:16:05 +10:00 |
|
grossmj
|
999a47f747
|
Fix issue with importlib.resources.files() and Python 3.9
|
2023-09-23 20:44:00 +10:00 |
|
grossmj
|
d9214a3c67
|
Merge branch '2.2' into 3.0
# Conflicts:
# gns3server/compute/virtualbox/__init__.py
# gns3server/controller/gns3vm/virtualbox_gns3_vm.py
# gns3server/crash_report.py
# gns3server/version.py
# requirements.txt
|
2023-09-23 15:54:54 +10:00 |
|
Jeremy Grossmann
|
ffb58a4ed2
|
Merge branch 'master' into Inappropriate_Logic-5node.py11635999804432162276.diff
|
2023-09-20 14:17:58 +07:00 |
|
munahaf
|
4d7b3fb9d6
|
Comment: Updated a test expression to remove a logical short circuit.
|
2023-09-20 06:51:41 +00:00 |
|
grossmj
|
702fea89fb
|
Automatically add vboxnet and DHCP server if not present for VirtualBox GNS3 VM. Ref #2266
|
2023-09-12 16:14:44 +07:00 |
|
grossmj
|
c11b3c3911
|
Fix tests after merge
|
2023-09-06 23:42:50 +07:00 |
|
grossmj
|
1ec056c1a6
|
Merge branch '2.2' into 3.0
# Conflicts:
# gns3server/compute/docker/docker_vm.py
# gns3server/controller/__init__.py
# gns3server/controller/appliance_manager.py
# gns3server/web/route.py
# requirements.txt
# tests/compute/docker/test_docker_vm.py
|
2023-09-06 23:30:00 +07:00 |
|
grossmj
|
709aa46074
|
Fix issue with controller config saved before checking current version with previous one
|
2023-09-06 16:48:24 +07:00 |
|
grossmj
|
0c12849d0d
|
Use controller vars file to store version and appliance etag
|
2023-09-06 16:28:46 +07:00 |
|
grossmj
|
60ce1172e0
|
Use an ACL table to check for privileges
|
2023-08-27 18:20:42 +10:00 |
|
grossmj
|
a69feb3682
|
Use an older version of platformdirs
|
2023-08-12 19:15:29 +10:00 |
|
grossmj
|
090d1c8c84
|
Only use platformdirs with Python >= '3.7'
|
2023-08-12 19:04:14 +10:00 |
|
grossmj
|
df2f96828e
|
Use the user data dir to store built-in appliances
|
2023-08-12 18:48:43 +10:00 |
|
grossmj
|
ca48efa5be
|
Upgrade SQLAlchemy to v2.0.18 and fix async_timeout warning
|
2023-08-11 22:52:29 +10:00 |
|
grossmj
|
1cb433c5bc
|
New packaging relying only pyproject.toml
|
2023-08-10 22:44:37 +10:00 |
|
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 |
|
grossmj
|
77744cc31d
|
Handle API version key in VirtualBox 7. Fixes #2266
|
2023-08-09 20:51:53 +10:00 |
|
grossmj
|
21d9d968c4
|
Revert "Use truststore in appliance_manager.py instead"
This reverts commit a2628042e8.
|
2023-08-07 20:44:37 +10:00 |
|
grossmj
|
945a2c98cd
|
Revert "Use finer-grained control for truststore"
This reverts commit 5e1792ff4d.
|
2023-08-07 20:44:33 +10:00 |
|
grossmj
|
5e1792ff4d
|
Use finer-grained control for truststore
|
2023-08-07 19:15:14 +10:00 |
|
grossmj
|
a2628042e8
|
Use truststore in appliance_manager.py instead
|
2023-08-07 19:04:55 +10:00 |
|
grossmj
|
e616b09028
|
Use truststore
|
2023-08-07 18:40:03 +10:00 |
|
grossmj
|
7f595b089b
|
Use certifi to get SSL root certificates
|
2023-08-06 20:37:10 +10:00 |
|
grossmj
|
533c4544ea
|
Use certifi on Windows and macOS
|
2023-08-06 18:09:56 +10:00 |
|