arno/gns3-server
1
0
Fork 0
mirror of https://github.com/GNS3/gns3-server synced 2024-12-03 05:38:09 +00:00
Code Issues Releases Wiki Activity
5,239 Commits 5 Branches 204 Tags 152 MiB
5666b43ee0
Commit Graph

5239 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
grossmj
a8aeb63c91 No need to find the mountpoint first for disk usage. 2021-09-09 16:58:02 +09:30
grossmj
986010446a Remove empty files after merge 2021-09-09 16:55:00 +09:30
grossmj
43ca53a089 Fix tests 2021-09-09 16:54:16 +09:30
grossmj
a324459152 Merge branch '2.2' into 3.0 
# Conflicts:
#	gns3server/compute/qemu/qemu_vm.py
#	gns3server/handlers/api/compute/server_handler.py
#	gns3server/utils/path.py
#	gns3server/version.py
#	requirements.txt
#	tests/compute/qemu/test_qemu_vm.py
#	tests/compute/test_manager.py
 2021-09-09 16:36:17 +09:30
Rolf Sommerhalder
6805a61729
Remove duplicate configuration lines 2021-09-09 08:17:58 +02:00
grossmj
6f1feed265 Fix issue preventing to use custom nested symbols. Fixes #1969 2021-09-08 15:13:51 +09:30
Jeremy Grossmann
e026c1e91f
Merge pull request #1967 from GNS3/affinity-symbols 
Update affinity symbols
 2021-09-07 19:30:53 -07:00
grossmj
40e565d968 Add comment for svgo 2021-09-08 11:33:04 +09:30
grossmj
5162ef2e22 Updated affinity symbols 2021-09-08 01:08:01 +09:30
grossmj
1923c37092 Shell script to update affinity symbols 2021-09-08 01:05:56 +09:30
grossmj
611570a863 Fix qemu-img rebase code to support Qemu 6.1. Ref https://github.com/GNS3/gns3-server/pull/1962 2021-09-05 22:18:46 +09:30
grossmj
99d7d0c769 Merge branch 'master' into 2.2 
# Conflicts:
#	gns3server/compute/qemu/qemu_vm.py
 2021-09-05 21:53:36 +09:30
Jeremy Grossmann
e42b8cb97c
Merge pull request #1963 from GNS3/run-with-qemu-6.1 
Qemu 6.1 support
 2021-09-05 05:15:23 -07:00
grossmj
ed336da304 Qemu 6.1 support 
Handle the deprecated use of backing file without explicit backing format issue.
 2021-09-05 18:34:37 +09:30
Jeremy Grossmann
bcf34d0ec8
Merge pull request #1962 from candlerb/candlerb/1955 
Reinstate qemu-img rebase
 2021-09-04 22:28:52 -07:00
Brian Candler
21e9f38437 Reinstate qemu-img rebase 
This allows importing portable projects with images and/or snapshots,
regression introduced by #1927.

Fixes #1955
 2021-09-04 12:34:22 +01:00
grossmj
f1ecb02160 Small db tables adjustments 2021-09-04 15:23:25 +09:30
grossmj
fdc3774fff Add index for "name" field in role table 2021-09-03 15:21:41 +09:30
grossmj
a55c9a5c6a Return disk usage for partition that contains the default project directory. Fixes #1947 2021-09-03 12:04:10 +09:30
Jeremy Grossmann
041d2bd2d6
Merge pull request #1953 from GNS3/revert-1951-disk-usage-all-partitions 
Revert "List disk usage for all mount points"
 2021-09-02 05:29:53 -07:00
Jeremy Grossmann
51c6f3fa31
Revert "List disk usage for all mount points" 2021-09-02 21:59:09 +09:30
Jeremy Grossmann
83cbcac01b
Merge pull request #1951 from GNS3/disk-usage-all-partitions 
List disk usage for all mount points
 2021-09-01 23:21:19 -07:00
grossmj
b1224ce9f6 Update schema description for disk_usage_percent. 2021-09-02 15:48:13 +09:30
grossmj
a2367d3c04 List disk usage for all mount points. 2021-09-02 15:43:38 +09:30
grossmj
45e0cbeca2 Merge branch 'master' into 2.2 2021-09-02 14:44:39 +09:30
grossmj
1eaabd6b25 Merge remote-tracking branch 'origin/master' 2021-09-01 19:31:46 +09:30
grossmj
4eb8491cfa Fix tests. Fixes #1950 2021-09-01 19:31:37 +09:30
grossmj
d606553e20 Allow images to be stored in subdirs and used by templates. 2021-08-30 16:53:41 +09:30
Jeremy Grossmann
b843f94068
Merge pull request #1880 from hrnciar/setuptools 
Explicitly require setuptools, utils/get_resource.py imports pkg_resources
 2021-08-29 22:06:35 -07:00
Jeremy Grossmann
f71e7aac9f
Merge branch 'master' into setuptools 2021-08-29 22:01:30 -07:00
grossmj
75bb06563a Fix tests 2021-08-30 13:04:24 +09:30
grossmj
afdda427d2 Merge branch 'master' into 3.0 
# Conflicts:
#	.github/workflows/testing.yml
#	gns3server/compute/builtin/nodes/nat.py
#	gns3server/compute/qemu/__init__.py
#	gns3server/controller/link.py
#	gns3server/utils/asyncio/embed_shell.py
#	gns3server/utils/asyncio/raw_command_server.py
#	gns3server/utils/asyncio/telnet_server.py
#	gns3server/version.py
#	gns3server/web/web_server.py
 2021-08-29 19:23:51 +09:30
grossmj
945e3e3e8e Development on 2.2.25dev1 2021-08-25 21:23:19 +09:30
grossmj
59a89c5f88 Release v2.2.24 2021-08-25 20:31:25 +09:30
grossmj
78c2ded2aa Merge branch 'master' into 2.2 2021-08-25 20:08:26 +09:30
piotrpekala7
6ba40bd5fb Release web UI 2.2.24 2021-08-25 11:57:52 +02:00
grossmj
6005e89181 Fix issue when searching for image with relative path. Fixes #1925 2021-08-25 17:23:21 +09:30
grossmj
27bcb60580 Sync appliance files. 2021-08-24 21:21:18 +09:30
grossmj
93711fe060 Update dependencies 2021-08-24 21:12:27 +09:30
grossmj
363fdb7d10 Fix wrong error when NAT interface is not allowed. Fixes #1943 2021-08-24 20:40:06 +09:30
grossmj
92150fba71 Fix incorrect Qemu binary selected when importing template. Fixes https://github.com/GNS3/gns3-gui/issues/3216 2021-08-24 17:26:06 +09:30
grossmj
c4c71cc838 Fix error when updating a link style. Fixes https://github.com/GNS3/gns3-gui/issues/2461 2021-08-24 11:35:33 +09:30
grossmj
332fa47b50 Option to prune images when deleting template. 2021-08-23 10:27:10 +09:30
grossmj
bf9a3aee20 Associate images when creating or updating a template. 2021-08-22 15:16:02 +09:30
grossmj
4d9e4e1059 Add prune images endpoint. 
Use many-to-many relationship between images and templates.
 2021-08-20 15:58:41 +09:30
grossmj
8f30b466e0 Merge remote-tracking branch 'origin/3.0' into 3.0 2021-08-19 14:48:29 +09:30
grossmj
07d4892faf Check if user has the right to add a permission 2021-08-19 14:47:48 +09:30
Jeremy Grossmann
1a5fb1abcc
Only use the necessary HTTP methods for default permissions 2021-08-17 23:47:32 +09:30
grossmj
4c6135fe88 Add /permissions/prune to delete orphaned permissions 2021-08-17 21:55:59 +09:30
grossmj
9df586d5d5 Check a permission matches an existing route before it is allowed to be created. 2021-08-17 16:14:15 +09:30