grossmj
|
bd813b0a53
|
Merge branch '2.2' into 3.0
# Conflicts:
# requirements.txt
# setup.py
|
2024-11-18 11:46:42 +10:00 |
|
grossmj
|
e83e12b51a
|
Add a duplicated project in the same resource pools as the original project if it is in any
|
2024-11-17 14:03:47 +10:00 |
|
grossmj
|
a7da814b85
|
Upgrade FastAPI to v0.115.5
|
2024-11-13 12:10:04 +10:00 |
|
Jeremy Grossmann
|
11c9802268
|
Merge pull request #2443 from GNS3/feature/upgrade-resource-files
Overwrite user resources when the originals have changed
|
2024-11-10 18:30:13 +10:00 |
|
grossmj
|
a60e0d424d
|
Overwrite user resources when the originals have changed.
Excepting configs and disks which can be customized.
|
2024-11-09 12:17:06 +10:00 |
|
grossmj
|
db1fb29c63
|
Relax setuptools requirement to allow for easier Debian packaging on Ubuntu Focal & Jammy
|
2024-11-08 12:46:55 +10:00 |
|
grossmj
|
ec9dbd20b8
|
Merge branch '2.2' into 3.0
# Conflicts:
# gns3server/compute/base_node.py
# gns3server/compute/docker/docker_vm.py
# gns3server/compute/qemu/qemu_vm.py
# gns3server/crash_report.py
# gns3server/version.py
|
2024-11-07 23:18:42 +10:00 |
|
grossmj
|
a5f0dba5cf
|
Development on 2.2.52.dev1
|
2024-11-07 23:13:31 +10:00 |
|
grossmj
|
754680d8e9
|
Release v2.2.51
|
2024-11-07 15:08:27 +10:00 |
|
grossmj
|
05773ce189
|
Sync appliances
|
2024-11-07 15:06:06 +10:00 |
|
grossmj
|
aeae9deb01
|
Merge remote-tracking branch 'origin/2.2' into 2.2
|
2024-11-07 14:53:23 +10:00 |
|
grossmj
|
f3749e83ec
|
Catch error when cannot resize Docker container TTY.
|
2024-11-07 14:52:59 +10:00 |
|
Jeremy Grossmann
|
c2db4e8542
|
Merge pull request #2439 from GNS3/bugfix/2438
Fix disk interface is being overriden when set to none
|
2024-11-07 14:52:08 +10:00 |
|
grossmj
|
52a7696618
|
Fix tests
|
2024-11-07 14:48:57 +10:00 |
|
grossmj
|
7bf17392dd
|
Do not use "ide" if there is a disk image and no interface type has been explicitly configured.
|
2024-11-07 14:37:26 +10:00 |
|
grossmj
|
2718224dde
|
Increase SQLite timeout. Ref #2422
|
2024-10-31 21:31:03 +10:00 |
|
Jeremy Grossmann
|
0122070b29
|
Merge pull request #2435 from GNS3/upgrade-dependencies
Upgrade dependencies
|
2024-10-31 20:56:30 +10:00 |
|
grossmj
|
345ecb7630
|
Upgrade dev dependencies
|
2024-10-31 20:49:12 +10:00 |
|
grossmj
|
ae538dd11d
|
Fix test user with wrong creds
|
2024-10-31 19:31:17 +10:00 |
|
grossmj
|
ce4dd17409
|
Upgrade fastapi and fix tests
|
2024-10-31 19:23:28 +10:00 |
|
grossmj
|
8c7c17b889
|
Upgrade dependencies and fix Pydantic warnings
|
2024-10-31 17:09:52 +10:00 |
|
grossmj
|
1530bdfc2b
|
Disable Python 3.13 testing
|
2024-10-31 13:53:25 +10:00 |
|
grossmj
|
74d07173c1
|
Upgrade aiohttp to v3.10.10. Fixes #2411
|
2024-10-31 13:48:22 +10:00 |
|
grossmj
|
ec300d19d4
|
Replace aiohttp.web.HTTPConflict()
|
2024-10-31 13:11:01 +10:00 |
|
grossmj
|
fb06eb3c0c
|
Remove old debug message
|
2024-10-31 13:07:09 +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
|
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 |
|