ExternalVendorCode/gns3-server
1
0
Fork 0
mirror of https://github.com/GNS3/gns3-server.git synced 2024-12-26 16:01:08 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
5,173 Commits 5 Branches 205 Tags 76 MiB
3014bd0216
Commit Graph

5173 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jeremy Grossmann
3014bd0216
Merge pull request #2108 from GNS3/project-lock-unlock 
Global project lock and unlock
 2022-08-30 22:54:47 +02:00
grossmj
ca3bf592d6 Global project lock and unlock 2022-08-30 22:49:47 +02:00
grossmj
43e60c31c7 Remove empty files after merge 2022-08-30 12:21:05 +02:00
grossmj
426c16e296 Merge branch '2.2' into 3.0 
# Conflicts:
#	.github/workflows/testing.yml
#	CHANGELOG
#	appveyor.yml
#	dev-requirements.txt
#	gns3server/controller/compute.py
#	gns3server/crash_report.py
#	gns3server/version.py
#	gns3server/web/route.py
#	pytest.ini
#	requirements.txt
#	tests/compute/dynamips/test_dynamips_router.py
#	tests/compute/test_base_node.py
#	tests/compute/vmware/test_vmware_manager.py
#	tests/compute/vmware/test_vmware_vm.py
#	tests/controller/gns3vm/test_virtualbox_gns3_vm.py
 2022-08-30 11:53:12 +02:00
grossmj
0d0a06799d Development on 2.2.35dev1 2022-08-29 11:14:44 +02:00
grossmj
8d4df08150 Release v2.2.34 2022-08-28 23:28:12 +02:00
grossmj
fd1d8d9d86 Update appliance files 2022-08-28 22:51:26 +02:00
grossmj
4ddce880ea Merge remote-tracking branch 'origin/2.2' into 2.2 2022-08-28 22:32:49 +02:00
grossmj
e0209a0491 Downgrade Jinja2 to v3.0.3 2022-08-28 22:32:42 +02:00
grossmj
829eb42c7f Revert "Downgrade Jinja2 to v3.0.3" 
This reverts commit ad3d73a7f1.
 2022-08-28 22:31:28 +02:00
grossmj
ad3d73a7f1 Downgrade Jinja2 to v3.0.3 2022-08-28 22:30:47 +02:00
Jeremy Grossmann
e96d8ae497
Merge pull request #2089 from SpikefishSolutions/spikefishjohn-patch-3 
Update compute.py
 2022-08-28 22:09:44 +02:00
grossmj
d996a87246 Require name for custom adapters. Fixes #2098 2022-08-28 17:33:33 +02:00
grossmj
b58a54ae7c Allow empty adapter slots for Dynamips templates. Ref https://github.com/GNS3/gns3-gui/issues/3373 2022-08-28 17:05:28 +02:00
grossmj
129f0a631c Use original $PATH in init.sh for Docker containers. Ref #2069 2022-08-28 12:06:56 +02:00
grossmj
ad1f1cdb96 Merge remote-tracking branch 'origin/2.2' into 2.2 2022-08-28 00:03:03 +02:00
grossmj
ab6c6535c6 Upgrade Sentry dependency 2022-08-28 00:02:54 +02:00
Jeremy Grossmann
3444615253
Merge pull request #2101 from GNS3/upgrade-dev-dependencies 
Upgrade dev dependencies
 2022-08-28 00:01:53 +02:00
grossmj
028f977823 Revert "Don't install nmap" 
This reverts commit b6cf3aabca.
 2022-08-28 00:01:26 +02:00
grossmj
b6cf3aabca Don't install nmap 2022-08-27 23:55:42 +02:00
grossmj
6546407e5d Upgrade to Python 3.7 for Windows tests 2022-08-27 23:52:59 +02:00
grossmj
46b022f726 Restore missing loop 2022-08-27 23:45:30 +02:00
grossmj
8f296e54f4 Add back loop 2022-08-27 23:41:52 +02:00
grossmj
fc7d5be736 Use pytest-asyncio auto mode 2022-08-27 21:10:17 +02:00
grossmj
600c18f04b Remove pytest.ini from tests dir 2022-08-27 21:00:31 +02:00
grossmj
852de03d43 Install latest dev dependencies for Python >= 3.7 2022-08-27 20:40:35 +02:00
grossmj
470e6cb901 Add pytest-asyncio 0.19.0 2022-08-27 19:41:46 +02:00
grossmj
e8273fb19e Downgrade to pytest-aiohttp v0.3.0 2022-08-27 19:39:02 +02:00
grossmj
4b3d6572d4 Downgrade to pytest v7.0.1 (last version to support 2022-08-27 19:35:36 +02:00
grossmj
fad3df453d Run tests on 2.2 branch 2022-08-27 19:31:24 +02:00
grossmj
d1c8f33fc5 Upgrade dev dependencies and fix issues after upgrading to pytest-aiohttp v1.0.4 2022-08-27 19:16:02 +02:00
grossmj
94c617ef1c Upgrade dependencies 2022-08-26 21:41:49 +02:00
Jeremy Grossmann
c4b10ac4da
Merge pull request #2099 from GNS3/strict-pytest-asyncio 
Support for pytest-asyncio strict mode
 2022-08-24 21:11:55 +02:00
grossmj
86c44cd6e7 Upgrade dev dependencies and fix tests to support pytest-asyncio strict mode 2022-08-24 21:03:16 +02:00
grossmj
2e91eac1eb Upgrade dependencies 2022-08-23 22:12:01 +02:00
grossmj
6fa3f85b83 Custom adapters should not be in node (compute) properties returned to clients. Fixes https://github.com/GNS3/gns3-gui/issues/3366 2022-08-06 12:37:05 +02:00
grossmj
3948637a46 Fix typo in requirements.txt 2022-08-06 12:21:27 +02:00
grossmj
93b71f806e Development on v3.0.0dev4 2022-08-04 12:29:49 +02:00
grossmj
3ddbd0de64 Release v3.0.0a1 2022-08-04 11:38:17 +02:00
grossmj
541e9702bf Bundle gns3-web-ui v3.0.0a1 2022-08-04 11:12:42 +02:00
grossmj
f4b44e072d Merge remote-tracking branch 'origin/3.0' into 3.0 2022-08-04 11:08:13 +02:00
grossmj
64c6000470 Update appliance files 2022-08-04 11:08:00 +02:00
grossmj
33087a6c21 Do not use build-optimizer when bundling web-ui. Ref https://github.com/GNS3/gns3-web-ui/issues/1366 2022-08-04 11:04:33 +02:00
grossmj
8670377e3b Do not use build-optimizer when bundling web-ui. Ref https://github.com/GNS3/gns3-web-ui/issues/1366 2022-07-31 12:39:42 +02:00
grossmj
31ae70894e Fix enum use in schemas 2022-07-26 23:17:39 +02:00
Jeremy Grossmann
bd9af3fe90
Merge pull request #2091 from GNS3/use-themed-symbols 
Let the controller allocate symbols
 2022-07-25 20:45:04 +02:00
grossmj
6d0c375323 Use default symbol theme if none is provided when loading appliances 2022-07-25 20:39:03 +02:00
grossmj
72eb13d941 Allow default symbol theme to be configured 2022-07-25 20:22:12 +02:00
grossmj
bfbac2e93a Use generic symbol names 2022-07-25 12:33:40 +02:00
grossmj
b7f4a4cbda Fix VMware VM addition 2022-07-25 11:10:01 +02:00