NgTech-LTD/gns3-server
2
0 Fork 0
mirror of https://github.com/GNS3/gns3-server.git synced 2026-11-03 05:51:15 +02:00
Code Issues Packages Projects Releases Wiki Activity
8,000 Commits 5 Branches 229 Tags
6bb44d0efcbd95835ac37ea5ce0bf4b0936e642c
Commit Graph
8000 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
grossmj 229a04e2fa Fix link style merge 2021-06-12 15:26:35 +09:30
Jeremy Grossmann e78b5fa6d6 Fix typo 2021-06-12 15:20:55 +09:30
grossmj 6ec028ea4e Merge branch '2.2' into 3.0 
# Conflicts:
#	gns3server/compute/builtin/nodes/cloud.py
#	gns3server/compute/vmware/vmware_vm.py
#	gns3server/controller/link.py
#	gns3server/controller/snapshot.py
#	gns3server/handlers/api/compute/dynamips_vm_handler.py
#	gns3server/handlers/api/compute/iou_handler.py
#	gns3server/handlers/api/compute/qemu_handler.py
#	gns3server/handlers/api/controller/link_handler.py
#	gns3server/schemas/link.py
#	gns3server/utils/path.py
#	gns3server/version.py
#	requirements.txt
 2021-06-12 14:36:32 +09:30
grossmj 3524e22761 Development on 2.2.23dev1 2021-06-10 16:20:09 +09:30
grossmj 10daab21a3 Release v2.2.22 v2.2.22 2021-06-10 15:41:58 +09:30
grossmj 22eb6f7d8c Sync appliance files. 2021-06-10 12:42:43 +09:30
grossmj d556c08def Revert "Skip test" 
This reverts commit 8acb2fe3
 2021-06-08 12:27:20 +09:30
grossmj 8acb2fe37e Skip test 2021-06-08 12:18:27 +09:30
Jeremy Grossmann 94acf60aef Merge pull request #1913 from GNS3/vmware-bigsur 
Fix VMware VM support on macOS BigSur
 2021-06-07 19:38:19 -07:00
grossmj c892cf371b Fix VMware support on macOS BigSur 2021-06-08 11:56:33 +09:30
grossmj bfd30f3547 Sync appliance files. 2021-06-07 15:01:45 +09:30
grossmj 095a022033 Fix tests. Ref https://github.com/GNS3/gns3-gui/issues/2461 2021-06-07 14:23:52 +09:30
grossmj 4e34ab8e4f Link style support. Fixes https://github.com/GNS3/gns3-gui/issues/2461 2021-06-07 14:08:21 +09:30
grossmj 8825831106 Upgrade dependencies 2021-06-07 13:46:06 +09:30
grossmj 5da5cbd6d8 Merge branch 'master' into 2.2 2021-06-07 13:34:25 +09:30
grossmj 515bd50261 Start refactoring for images management 2021-06-06 16:52:47 +09:30
piotrpekala7 08f540f417 Release web UI 2.2.22 2021-06-05 10:32:12 +02:00
Jeremy Grossmann 1db1a892b4 Merge pull request #1910 from fabaff/patch-1 
Set py-cpuinfo to 8.0.0
 2021-06-04 04:49:26 -07:00
Fabian Affolter 7ff72879dd Set py-cpuinfo to 8.0.0 2021-06-04 13:36:21 +02:00
Jeremy Grossmann 48d0c6b183 Merge pull request #1905 from candlerb/candlerb/1904 
Preserve auto_start/auto_open/auto_close when restoring snapshot
 2021-06-04 02:06:38 -07:00
grossmj f64b5cd9b6 Allow controller to be reloaded using the API. Fixes #1743 2021-06-04 17:01:07 +09:30
grossmj 6a726d0344 Fix formatting issue. 2021-06-03 19:32:00 +09:30
grossmj dc914eb0f9 Fix tests. 2021-06-03 19:11:11 +09:30
grossmj 9b0e3a77ed Use a stock BusyBox for the Docker Integration 2021-06-03 18:38:08 +09:30
grossmj 8be015cd86 Move "/{project_id}/templates/{template_id}" endpoint. 2021-06-03 18:18:34 +09:30
grossmj 6fb6a27859 Add last login info for users. 2021-06-03 16:57:16 +09:30
grossmj 4e33d29af8 Change RBAC field names from builtin to is_builtin 2021-06-03 16:24:38 +09:30
Jeremy Grossmann 4dd3bc6a98 Merge pull request #1906 from GNS3/rbac 
RBAC support
 2021-06-02 23:16:07 -07:00
grossmj d65b49acaa Add user permissions + RBAC tests. 2021-06-03 15:40:12 +09:30
grossmj 36a27c0c19 Force refresh of updated_at value for RBAC db models. 2021-06-01 16:12:06 +09:30
grossmj a6d2f48df1 Merge remote-tracking branch 'origin/3.0' into rbac 2021-06-01 16:11:22 +09:30
grossmj 0113ca6673 Force refresh of updated_at value in db models. 2021-06-01 16:09:29 +09:30
grossmj 74d820fd0a Use synchronize_session="fetch" when updating values. 2021-06-01 15:55:50 +09:30
grossmj e9b9884ee3 Merge remote-tracking branch 'origin/3.0' into rbac 2021-06-01 15:50:14 +09:30
grossmj a6c2a3e47f Use synchronize_session="fetch" when updating values. 2021-06-01 13:02:03 +09:30
grossmj 91b0534182 Upgrade dependencies 2021-06-01 12:56:51 +09:30
grossmj 2e2e31337a Add description for user permission. 2021-06-01 12:55:16 +09:30
grossmj fbc47598d9 Basic functional RBAC support. 2021-05-27 17:28:44 +09:30
grossmj 6d4da98b8e Base API and tables for RBAC support. 2021-05-25 18:34:59 +09:30
Brian Candler c051367d4b Preserve auto_start/auto_open/auto_close when restoring snapshot 
Fixes #1904
 2021-05-24 17:31:04 +01:00
grossmj eb0f8c6174 Save/restore appliances Etag. 2021-05-17 00:37:15 +09:30
grossmj f416d64042 Allow to set the initial super admin username / password in server config file. Ref #1857 2021-05-16 20:01:05 +09:30
grossmj fffbb08a8e Catch SQLAlchemyError exception. 2021-05-16 18:37:17 +09:30
Jeremy Grossmann 150526b1ff Update setup.py 
Fixes #1897
 2021-05-16 17:44:13 +09:30
grossmj d759564e20 Require authentication for get_user_memberships endpoint. 2021-05-16 17:06:23 +09:30
grossmj 971e86d254 Fix uBridge errors for cloud nodes not visible in logs. Fixes #1895 2021-05-16 14:59:02 +09:30
grossmj 6847e19847 Change method to prevent forbidden directory traversal. Fixes #1894 2021-05-16 14:44:38 +09:30
grossmj 2bf16f1e5f Change method to prevent forbidden directory traversal. Ref #1894 2021-05-16 14:29:56 +09:30
grossmj f3d81fa450 Clean files and catch file path escape. Ref #1894 2021-05-15 22:35:44 +09:30
grossmj 09ac7fd7fb Merge branch '2.2' into 3.0 
# Conflicts:
#	gns3server/compute/base_manager.py
#	gns3server/handlers/api/compute/dynamips_vm_handler.py
#	gns3server/handlers/api/compute/iou_handler.py
#	gns3server/handlers/api/compute/project_handler.py
#	gns3server/handlers/api/compute/qemu_handler.py
#	gns3server/handlers/api/controller/node_handler.py
#	gns3server/handlers/api/controller/project_handler.py
#	gns3server/handlers/index_handler.py
#	tests/handlers/api/compute/test_project.py
#	tests/handlers/api/compute/test_qemu.py
#	tests/handlers/api/controller/test_node.py
#	tests/handlers/api/controller/test_project.py
 2021-05-15 20:46:34 +09:30