1
0
mirror of https://github.com/GNS3/gns3-server synced 2024-12-13 02:28:08 +00:00
Commit Graph

6009 Commits

Author SHA1 Message Date
grossmj
f09594ae4c Merge branch '2.2' into 3.0
# Conflicts:
#	README.md
#	README.rst
#	tests/handlers/api/compute/test_nat.py
2023-01-10 11:52:58 +08:00
grossmj
5a3b502024 Fix NIO update UDP test 2023-01-10 11:39:18 +08:00
grossmj
997e0ad6ee Fix more tests 2023-01-10 11:22:12 +08:00
grossmj
eb3fc1bb3a Fix more tests 2023-01-10 11:09:27 +08:00
grossmj
e9c95ff299 Fix tests 2023-01-10 10:07:26 +08:00
grossmj
78c301653f Convert README to Markdown 2023-01-10 08:23:06 +08:00
grossmj
2a392ef991 Merge branch '2.2' into 3.0 2023-01-06 20:09:41 +08:00
grossmj
535f89e29e Give udhcpc executable right. Fixes #2159 2023-01-06 20:09:17 +08:00
grossmj
72e3d8f0c1 Fix tests after merge 2023-01-05 12:57:00 +08:00
grossmj
27d9063e56 Merge 2.2 2023-01-05 12:38:00 +08:00
grossmj
f8f5d7ec07 Development on 2.2.37.dev1 2023-01-05 09:13:30 +08:00
grossmj
d0141c351b Merge branch '2.2' 2023-01-05 09:12:11 +08:00
grossmj
8e2992fbc7 Release v2.2.36 2023-01-04 19:46:30 +08:00
grossmj
8986f10506 Install web-ui v2.2.36 2023-01-04 19:05:24 +08:00
grossmj
10f3adcb60 Sync appliance files 2023-01-04 18:28:14 +08:00
grossmj
5459543eb5 Fix issue when detecting Dynamips version (version is not set until after Dynamips has started) 2023-01-04 18:21:17 +08:00
grossmj
e15c36f05c Merge remote-tracking branch 'origin/2.2' into 2.2 2023-01-04 15:12:26 +08:00
grossmj
da7c7d16e4 Fix starting Dynamips on Windows 2023-01-04 15:12:09 +08:00
Jeremy Grossmann
8d69f7f792
Merge pull request #2157 from GNS3/qemu-tpm-support
Trusted Platform Module (TPM) support for Qemu VMs
2023-01-04 10:55:52 +05:45
grossmj
297ada529c Prevent TPM to run on Windows 2023-01-04 12:57:48 +08:00
grossmj
ae200d9add Add Trusted Platform Module (TPM) support for Qemu VMs 2023-01-04 12:13:19 +08:00
Jeremy Grossmann
eb1b70456f
Merge pull request #2155 from GNS3/fix/2143
Binding address for console
2023-01-04 07:00:33 +05:45
grossmj
9132002b80 Fix typos 2023-01-04 09:08:40 +08:00
grossmj
771a9a5ddb Require Dynamips 0.2.23 and bind Dynamips hypervisor on 127.0.0.1 2023-01-02 15:26:59 +08:00
Jeremy Grossmann
04ba3b6549
Merge pull request #2154 from GNS3/fix/2069
Use a stock BusyBox for the Docker integration
2023-01-01 16:18:37 +05:45
grossmj
8f9800f444 Update README.rst about static busybox 2023-01-01 18:24:42 +08:00
Jeremy Grossmann
90c971ed74
Merge pull request #2152 from GNS3/fix/2151
Install built-in appliance files at the first start of a newer version of the server
2023-01-01 15:40:48 +05:45
grossmj
d2ad9dc5e2 Delete the built-in appliance directory before installing updated files 2023-01-01 17:49:00 +08:00
grossmj
e5c8ae4bde Use a stock BusyBox for the Docker integration 2023-01-01 17:04:48 +08:00
grossmj
5bccf4841d Overwrite built-in appliance files when starting a more recent version of the server 2023-01-01 15:57:41 +08:00
grossmj
b3a6b9173b Fix reset console. Fixes #1619 2022-12-31 09:43:17 +08:00
grossmj
2d6b260188 Revert "Install importlib-resources==1.3 with Python < 3.9"
This reverts commit 343022c63b.
2022-12-30 21:13:59 +08:00
grossmj
c814245426 Revert "Change importlib-resources dependency to v1.4.0"
This reverts commit d787f38c21.
2022-12-30 21:13:49 +08:00
grossmj
d787f38c21 Change importlib-resources dependency to v1.4.0 2022-12-30 21:09:54 +08:00
grossmj
343022c63b Install importlib-resources==1.3 with Python < 3.9 2022-12-30 21:05:18 +08:00
grossmj
1148dbc48e Fix issue when calling reset_console with running VPCS and Qemu nodes. Ref #1619 2022-12-30 20:54:37 +08:00
grossmj
85679aaa94 Try importlib-resources for Python 3.9 2022-12-30 11:44:29 +08:00
grossmj
5bcc247881 Make gns3server.appliances a package 2022-12-30 11:37:34 +08:00
grossmj
b8d595928b Try to fix tests 2022-12-30 10:35:29 +08:00
grossmj
3804249d89 Fix tests 2022-12-30 10:01:43 +08:00
grossmj
c56a8ef8f7 Only use importlib_resources for Python < 3.9. Fixes #2147 2022-12-30 09:15:40 +08:00
grossmj
076e85ddb3 Update sentry-sdk dependency 2022-12-28 15:13:26 +08:00
grossmj
2550fb3495 Support when the user field defined in Docker container is an ID. Fixes #2134 2022-12-28 11:05:22 +08:00
grossmj
f837912ebc Development on 3.0.0.dev7 2022-12-28 08:29:26 +08:00
grossmj
830cc108d0 Release v3.0.0a3 2022-12-27 15:22:16 +08:00
grossmj
36ffe2bb59 Sync appliances 2022-12-27 13:40:07 +08:00
grossmj
f8739eb5e1 Merge branch '2.2' into 3.0
# Conflicts:
#	.github/workflows/testing.yml
#	gns3server/crash_report.py
#	gns3server/version.py
#	requirements.txt
2022-12-27 13:28:11 +08:00
grossmj
5bc030688e Sync web-ui v3.0.0a3 2022-12-27 13:17:12 +08:00
grossmj
9f75a49e0a Fix syntax error in .whitesource 2022-12-27 12:27:26 +08:00
grossmj
7f440f43d8 Add more base branches for Mend to scan 2022-12-27 12:25:49 +08:00