1
0
mirror of https://github.com/GNS3/gns3-server synced 2024-11-13 20:08:55 +00:00
Commit Graph

5923 Commits

Author SHA1 Message Date
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
69a5b16bad
Upgrade aiohttp to v3.10.3 2024-08-11 01:34:30 +02: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
00c3b1abc1
Merge remote-tracking branch 'origin/master' into 2.2 2024-08-06 12:37:55 +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
54e436394f
Upgrade packages in requirements.txt 2024-08-03 16:35:17 +02:00
grossmj
9046c60811
Fix tests by downgrading pytest-asyncio 2024-08-03 13:15:36 +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
6746ef39be
Upgrade development packages 2024-08-03 12:32:43 +02:00
grossmj
8889eaa439
Upgrade jsonschema and sentry-sdk packages 2024-08-03 12:32:06 +02:00
grossmj
95a4c284bc
Update IOU base configs to use "no ip domain lookup". Fixes #2404 2024-07-22 19:07:17 +02:00
Jeremy Grossmann
9a3bd2ee0c
Merge pull request #2406 from GNS3/feature/convert-invalid-node-names
Convert node hostnames for topologies
2024-07-20 18:01:50 +02:00
grossmj
2416069a6e
Update _convert_2.2.0() with correct comments 2024-07-20 17:55:38 +02:00
grossmj
eefb3d87b2
Fix tests and add conversion test 2024-07-20 17:47:25 +02:00
grossmj
999f41b03e
Convert topologies < 3.0 to have valid node hostnames 2024-07-20 17:22:24 +02:00
grossmj
ea339af1e9
Merge branch '2.2' into 3.0
# Conflicts:
#	gns3server/crash_report.py
#	gns3server/static/web-ui/index.html
#	gns3server/static/web-ui/main.a1204c9aa64b1cc15d28.js
2024-07-13 17:19:03 +02:00
grossmj
6951137a25
Development on 2.2.49.dev1 2024-07-13 16:32:13 +02:00
Jeremy Grossmann
cccbca3d5e
Merge pull request #2401 from GNS3/release/v2.2.48.1
Release v2.2.48.1
2024-07-13 14:43:53 +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
Jeremy Grossmann
3f5b0bb514
Merge pull request #2395 from GNS3/2.2
Release v2.2.48
2024-07-09 00:30:55 +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
Jeremy Grossmann
271c958381
Merge pull request #2394 from GNS3/bugfix/2226
New path settings for the server config
2024-07-08 18:16:27 +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
Jeremy Grossmann
b48bd92da3
Merge pull request #2393 from GNS3/feature/keep-compute-ids
Option to keep the compute IDs unchanged when exporting a project
2024-07-06 17:12:38 +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
Jeremy Grossmann
29f848d833
Merge pull request #2391 from GNS3/bugfix/2388
Fix issues with invalid snapshot filenames
2024-07-05 12:49:59 +02:00
grossmj
08154e43aa
Fix error when snapshot exists with an underscore in the name 2024-07-05 12:04:53 +02:00
grossmj
45a0644371
Upgrade request and sqlalchemy packages 2024-07-03 19:05:05 +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
84efc55d02
Upgrade sentry-sdk, psutil and aiofiles packages 2024-07-03 18:53:14 +02:00
grossmj
fec0220b55
Merge branch '2.2' into 3.0
# Conflicts:
#	gns3server/version.py
2024-07-01 18:53:21 +02:00
Jeremy Grossmann
a58fb320ac
Merge pull request #2387 from GNS3/bugfix/3588
Fix check to test if IPv6 is enabled on host
2024-06-17 16:54:20 +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