5946 Commits (a7b56739a949589e7ba4229afab8c5c1f0364754)

 

All Branches   

Search

Author	SHA1	Message	Date
grossmj	a7b56739a9	Fixes after merging	11 hours ago
grossmj	8ce0cbf7f7	Merge branch '2.2' into 3.0 ... # Conflicts: # gns3server/compute/base_node.py # gns3server/compute/docker/docker_vm.py # gns3server/compute/dynamips/nodes/c1700.py # gns3server/compute/dynamips/nodes/c2600.py # gns3server/compute/dynamips/nodes/c2691.py # gns3server/compute/dynamips/nodes/c3600.py # gns3server/compute/dynamips/nodes/c3725.py # gns3server/compute/dynamips/nodes/c3745.py # gns3server/compute/dynamips/nodes/c7200.py # gns3server/compute/dynamips/nodes/router.py # gns3server/compute/qemu/qemu_vm.py # gns3server/controller/node.py # gns3server/controller/topology.py # gns3server/handlers/api/compute/docker_handler.py # gns3server/handlers/api/compute/dynamips_vm_handler.py # gns3server/handlers/api/compute/qemu_handler.py # gns3server/schemas/docker.py # gns3server/schemas/docker_template.py # gns3server/schemas/dynamips_template.py # gns3server/schemas/dynamips_vm.py # gns3server/schemas/node.py # gns3server/schemas/qemu.py # gns3server/schemas/qemu_template.py	12 hours ago
grossmj	7b5d123ad8	Improve error message when a project cannot be parsed.	12 hours ago
Jeremy Grossmann	d1a7474ef6	Merge pull request #2418 from GNS3/revert-2417-backport-aux-console-support ... Revert "Backport auxiliary console support for Qemu, Docker and Dynamips nodes"	12 hours ago
Jeremy Grossmann	af6f34b2ca	Revert "Backport auxiliary console support for Qemu, Docker and Dynamips nodes"	12 hours ago
grossmj	d3138daa23	Fix Docker tests	1 day ago
grossmj	967c7d066d	Delete old code after merging	1 day ago
grossmj	7619080a50	Merge branch '2.2' into 3.0 ... # Conflicts: # gns3server/compute/base_node.py # gns3server/compute/docker/docker_vm.py # gns3server/compute/dynamips/nodes/c1700.py # gns3server/compute/dynamips/nodes/c2600.py # gns3server/compute/dynamips/nodes/c2691.py # gns3server/compute/dynamips/nodes/c3600.py # gns3server/compute/dynamips/nodes/c3725.py # gns3server/compute/dynamips/nodes/c3745.py # gns3server/compute/dynamips/nodes/c7200.py # gns3server/compute/dynamips/nodes/router.py # gns3server/compute/qemu/qemu_vm.py # gns3server/controller/node.py # gns3server/handlers/api/compute/docker_handler.py # gns3server/handlers/api/compute/dynamips_vm_handler.py # gns3server/handlers/api/compute/qemu_handler.py # gns3server/schemas/docker.py # gns3server/schemas/docker_template.py # gns3server/schemas/dynamips_template.py # gns3server/schemas/dynamips_vm.py # gns3server/schemas/node.py # gns3server/schemas/qemu.py # gns3server/schemas/qemu_template.py	1 day ago
Jeremy Grossmann	f1294cf267	Merge pull request #2417 from GNS3/backport-aux-console-support ... Backport auxiliary console support for Qemu, Docker and Dynamips nodes	1 day ago
grossmj	74782d413f	Change method to allocate AUX console for existing Dynamips nodes	1 day ago
grossmj	c41c11eb34	Backport auxiliary console support for Qemu, Docker and Dynamips nodes	1 day ago
Jeremy Grossmann	1f09a3e6bc	Merge pull request #2416 from GNS3/bugfix/2414 ... Run Docker containers with user namespaces enabled	5 days ago
grossmj	22f022cc22	Fix for running Docker containers with user namespaces enabled	5 days ago
grossmj	8429494280	Test base MAC address for Docker VMs	5 days ago
grossmj	a1666dd247	Fix MAC address support for Docker containers	5 days ago
grossmj	3214f52e9e	Merge branch '2.2' into 3.0 ... # Conflicts: # gns3server/compute/docker/docker_vm.py # gns3server/handlers/api/compute/docker_handler.py # gns3server/schemas/docker.py # gns3server/schemas/docker_template.py # tests/compute/docker/test_docker_vm.py	5 days ago
grossmj	ddd6235acd	Merge branch 'master' into 2.2	5 days ago
Jeremy Grossmann	bcc148bbd2	Merge pull request #2415 from GNS3/docker-mac-address ... Support for custom MAC addresses in Docker containers	5 days ago
grossmj	3792901dc7	Support for configuring MAC address in Docker containers	5 days ago
grossmj	9bcf26b943	Release v3.0.0rc1	1 month ago
grossmj	b80e1f3a22	Downgrade aiohttp to v3.9.5	1 month ago
grossmj	ba13b0b078	Bundle web-ui v3.0.0rc1	1 month ago
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	1 month ago
grossmj	69a5b16bad	Upgrade aiohttp to v3.10.3	1 month ago
grossmj	21a5c5d3f2	Development on 2.2.50.dev1	2 months ago
Jeremy Grossmann	225779bc11	Merge pull request #2409 from GNS3/2.2 ... Release v2.2.49	2 months ago
grossmj	b1209155f5	Release v2.2.49	2 months ago
grossmj	7cebb9472a	Bundle web-ui v2.2.49	2 months ago
grossmj	00c3b1abc1	Merge remote-tracking branch 'origin/master' into 2.2	2 months ago
grossmj	b1c1c0520c	Sync appliances	2 months ago
grossmj	2bb26075f0	Forbid -nic and -nicdev in Qemu additional options. Fixes https://github.com/GNS3/gns3-server/issues/2397	2 months ago
grossmj	54e436394f	Upgrade packages in requirements.txt	2 months ago
grossmj	9046c60811	Fix tests by downgrading pytest-asyncio	2 months ago
grossmj	24cace8122	Merge remote-tracking branch 'origin/2.2' into 3.0 ... # Conflicts: # dev-requirements.txt # requirements.txt # setup.py	2 months ago
grossmj	6746ef39be	Upgrade development packages	2 months ago
grossmj	8889eaa439	Upgrade jsonschema and sentry-sdk packages	2 months ago
grossmj	95a4c284bc	Update IOU base configs to use "no ip domain lookup". Fixes #2404	2 months ago
Jeremy Grossmann	9a3bd2ee0c	Merge pull request #2406 from GNS3/feature/convert-invalid-node-names ... Convert node hostnames for topologies	2 months ago
grossmj	2416069a6e	Update _convert_2.2.0() with correct comments	2 months ago
grossmj	eefb3d87b2	Fix tests and add conversion test	2 months ago
grossmj	999f41b03e	Convert topologies < 3.0 to have valid node hostnames	2 months ago
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	2 months ago
grossmj	6951137a25	Development on 2.2.49.dev1	2 months ago
Jeremy Grossmann	cccbca3d5e	Merge pull request #2401 from GNS3/release/v2.2.48.1 ... Release v2.2.48.1	2 months ago
grossmj	8659439829	Release v2.2.48.1	2 months ago
grossmj	677bc389a5	Bundle web-ui v2.2.48.1	2 months ago
grossmj	3f7f5a3cda	Fix to access resources_path and install_builtin_appliances settings	3 months ago
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	3 months ago
grossmj	4a58ede550	Development on 2.2.49.dev1	3 months ago
Jeremy Grossmann	3f5b0bb514	Merge pull request #2395 from GNS3/2.2 ... Release v2.2.48	3 months ago