github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity
7,977 Commits
69 Branches
249 Tags
112 MiB
Commit Graph

4924 Commits (21b1dd076a2446a8a842e8f38907adeb9949a766)

Author SHA1 Message Date
ibuler abfd472a0a perf: 修改 connect token 2022-11-23 16:11:17 +08:00
ibuler 075cadb1ab merge: with remote 2022-11-22 21:56:30 +08:00
ibuler 779161d79a perf: 修改 connection token 2022-11-22 21:54:40 +08:00
fit2bot 1a204618f7
[v3] perf: migrate gateway to asset (#8928) 
* perf: migrate gateway to asset

* perf: asset discriminate gateway

Co-authored-by: feng626 <1304903146@qq.com>
 2022-11-22 17:33:09 +08:00
feng 873b81e639 perf: ticket migrate 2022-11-22 11:36:48 +08:00
Jiangjie.Bai d543c3efe7 fix: 修复 favorite-assets Serializer 缺少 protocols 字段的问题 2022-11-22 11:05:52 +08:00
feng 4b26fb3e6e fix: jms upgrade_db bug 2022-11-21 19:54:00 +08:00
feng f39a3a34e4 perf: change secret ignore secret type 2022-11-21 16:23:32 +08:00
feng 94526e44f1 perf: change secret timedelta 2022-11-21 15:18:09 +08:00
ibuler 6d5be66b5e Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-11-18 19:29:52 +08:00
ibuler fc1b6c9db2 pref: 修改 endpoint api 2022-11-18 19:29:19 +08:00
Aaron3S d0de36358c feat: 支持定时任务 2022-11-18 18:47:48 +08:00
fit2bot 223814f897
perf: migrate (#9098) 
Co-authored-by: feng <1304903146@qq.com>
 2022-11-18 11:30:31 +08:00
ibuler b1bd57cd76 Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-11-17 20:49:31 +08:00
ibuler 04ee7ee0e7 pref: 后端返回 connect types 2022-11-17 20:48:50 +08:00
Aaron3S 24ed11e2a5 feat: 运行job 支持动态参数 2022-11-17 20:10:13 +08:00
feng 49a4ceba85 perf: ticket 2022-11-17 19:20:54 +08:00
feng 543d61442c perf: ticket accounts 2022-11-17 18:04:38 +08:00
fit2bot 71122312cf
perf: ticket optimization (#9094) 
Co-authored-by: feng <1304903146@qq.com>
 2022-11-17 17:34:52 +08:00
Eric 30f37d9ebf perf: deployment task log order by date 2022-11-17 16:39:49 +08:00
Eric ef3654ffa4 perf: update applet delopyment task 2022-11-17 16:03:26 +08:00
fit2bot 3a62abf381
perf: ticket action (#9090) 
Co-authored-by: feng <1304903146@qq.com>
 2022-11-17 15:07:23 +08:00
fit2bot 73c2155864
perf: ticket serializer (#9075) 
Co-authored-by: feng <1304903146@qq.com>
 2022-11-17 13:52:10 +08:00
ibuler 4591b03e17 pref: 修改 terminal methods 2022-11-17 11:46:35 +08:00
Eric 8a1a7d9e13 fix: remove unused serializer_class 2022-11-17 11:04:50 +08:00
Aaron3S 12816d49f6 Merge remote-tracking branch 'origin/v3' into v3 2022-11-17 10:50:50 +08:00
Aaron3S 43fee40c46 feat: 作业支持增加参数和执行路径超时时间等 2022-11-16 21:06:14 +08:00
ibuler e2001d7779 Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-11-16 21:06:08 +08:00
ibuler fb653f93db pref: 修改添加 connect methods 2022-11-16 21:05:15 +08:00
feng ec462e09e0 fix: action 2022-11-16 19:35:16 +08:00
Jiangjie.Bai 21d24ae4bc fix: 修复创建授权规则时不包含actions报错的问题 2022-11-16 16:23:39 +08:00
Jiangjie.Bai 2a8d63e9cd Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-11-16 15:07:46 +08:00
Jiangjie.Bai 896b59b1bd fix: 修复获取用户收藏的资产API失败的问题 2022-11-16 15:07:35 +08:00
Aaron3S e7dde616c0 Merge remote-tracking branch 'origin/v3' into v3 2022-11-16 15:05:38 +08:00
Aaron3S 0959b55b53 perf: 优化字段名称 2022-11-16 15:04:46 +08:00
Jiangjie.Bai 0dec61368c Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-11-16 11:29:10 +08:00
Jiangjie.Bai e118ed655b perf: 优化授权规则获取用户授权的账号API 2022-11-16 11:29:02 +08:00
ibuler e34aa0e084 Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-11-15 19:24:14 +08:00
ibuler fd54cbc777 fix: action choices 2022-11-15 19:23:44 +08:00
Jiangjie.Bai aa9e5d2432 fix: merge v3 2022-11-15 17:50:48 +08:00
Jiangjie.Bai 3e31c9ed7f fix: 修改用户授权的资产账号 2022-11-15 17:49:28 +08:00
Aaron3S b12f83dbea Merge remote-tracking branch 'origin/v3' into v3 2022-11-15 17:22:54 +08:00
Aaron3S c63c000b10 perf: 优化异步认识显示名称 2022-11-15 16:29:40 +08:00
ibuler 7061ce7c97 fix: 修改 user granted asset account 2022-11-15 16:29:31 +08:00
ibuler ed26c7f575 perf: reslove conflict 2022-11-15 16:27:56 +08:00
ibuler 7f0744961d pref: 修改 accounts 2022-11-15 16:26:18 +08:00
ibuler 73290f4ed0 pref: 修改 accounts 2022-11-15 16:24:53 +08:00
Jiangjie.Bai 0d3c5dddf9 Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-11-15 16:08:16 +08:00
Jiangjie.Bai a5fa5fd262 fix: 修改用户授权的资产账号API 2022-11-15 16:07:42 +08:00
Eric ef637e91b9 perf: add host deployment task 2022-11-15 16:01:51 +08:00
ibuler 9d0e2b2872 pref: 修改 accounts list url 2022-11-15 15:47:32 +08:00
ibuler 989c338002 Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-11-15 15:27:02 +08:00
ibuler 8e123304ad pref: 修改 perms accounts 2022-11-15 15:26:31 +08:00
Jiangjie.Bai 582a8e0c52 fix: 修改 BitChoicesField to_representation swagger 调用报错的问题 2022-11-15 14:59:22 +08:00
ibuler 22dd9906c7 Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-11-15 10:43:51 +08:00
ibuler 63b32ae903 pref: 修改授权 api，去掉不用的 2022-11-15 10:43:21 +08:00
Jiangjie.Bai 83ef013708 fix: 修改 actions bit 从1开始 2022-11-14 20:25:54 +08:00
Eric d554e92d02 perf: add applets deployment 2022-11-14 19:01:18 +08:00
ibuler 8e1312e8ce pref: 修改 perm token 2022-11-14 14:44:18 +08:00
ibuler 4f135bc349 pref: 添加 perm token 2022-11-14 14:03:58 +08:00
Aaron3S 0044f11262 feat: 执行adhoc和playbook 2022-11-11 19:20:17 +08:00
fit2bot b100bbf838
perf: change secret (#9048) 
Co-authored-by: feng <1304903146@qq.com>
 2022-11-11 19:15:43 +08:00
Eric 8b351f49e5 perf: update applet host deployment 2022-11-11 18:16:11 +08:00
ibuler 3abf2592d1 Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-11-11 17:29:03 +08:00
ibuler 9c5b3a03c6 pref: 优化 permission actionss 2022-11-11 17:28:13 +08:00
fit2bot cb82b53791
perf: automation celery task (#9046) 
Co-authored-by: feng <1304903146@qq.com>
 2022-11-11 16:13:16 +08:00
ibuler 1cd551e692 merge: with remote 2022-11-11 15:11:10 +08:00
ibuler f6e403fd8b pref: 修改 asset permission 2022-11-11 15:04:31 +08:00
fit2bot cd3c3eeaf2
perf: code (#9044) 
Co-authored-by: feng <1304903146@qq.com>
 2022-11-10 19:11:56 +08:00
Eric 5494d2fd60 perf: update applet host deploy 2022-11-10 18:20:39 +08:00
feng ba3f2099e6 perf: audits 2022-11-10 14:44:23 +08:00
ibuler 644f3f1783 Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-11-09 20:59:28 +08:00
ibuler 1ffcf8f39c pref: 修改授权规则 2022-11-09 20:58:45 +08:00
feng 2f611009dc perf: acl 2022-11-09 20:51:43 +08:00
feng becb10a453 perf: changr secret record api 2022-11-09 18:31:35 +08:00
fit2bot a5cef74356
perf: serializer (#9034) 
Co-authored-by: feng <1304903146@qq.com>
 2022-11-09 18:15:21 +08:00
Eric 1b2eda51e3 perf: get host applet by name 2022-11-09 16:14:25 +08:00
feng cf4744791a fix: automation execution bug 2022-11-09 15:55:48 +08:00
feng 3b4e388ed0 perf: gather account api adjustment 2022-11-09 15:42:21 +08:00
fit2bot 6ef5154d4d
fix: swagger (#9031) 
Co-authored-by: feng <1304903146@qq.com>
 2022-11-09 13:34:29 +08:00
ibuler 2d479d1ffa Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-11-09 11:44:38 +08:00
ibuler 71846241ae pref: 优化授权 api 返回字段 2022-11-09 11:43:55 +08:00
fit2bot 0ff8758ea8
perf: gather account automation api (#9029) 
Co-authored-by: feng <1304903146@qq.com>
 2022-11-08 20:33:55 +08:00
ibuler d040b4cfe0 Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-11-08 19:19:28 +08:00
ibuler 5730265183 pref: 修改 account secret_type 类型 2022-11-08 19:18:04 +08:00
fit2bot ce9ebd94ec
perf: change secret automation api (#9028) 
Co-authored-by: feng <1304903146@qq.com>
 2022-11-08 17:54:51 +08:00
Eric e69bb9f83e perf: applet host accounts should be inactive by default 2022-11-08 17:54:04 +08:00
Jiangjie.Bai 5e52d04df3 Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-11-08 14:30:16 +08:00
Jiangjie.Bai cd93de4c00 perf: 优化 Connection Token API 逻辑处理 2022-11-08 14:30:07 +08:00
ibuler ba38771d1a perf: 修改 applets related 2022-11-08 13:55:06 +08:00
ibuler df14d01859 pref: 修改信号创建 accounts 2022-11-08 10:41:06 +08:00
ibuler 2e784311d3 Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-11-07 20:41:55 +08:00
ibuler afe6c8ebbd pref: 修改 applet host api 2022-11-07 20:41:18 +08:00
Eric 43e1417a25 perf: update tinker playbook 2022-11-07 19:18:12 +08:00
feng a13527c5c8 perf: platform charset 2022-11-07 19:17:02 +08:00
feng b4f511a7ff perf: account backup 2022-11-07 17:01:28 +08:00
fit2bot 1cc983b2eb
perf: automation button (#9023) 
Co-authored-by: feng <1304903146@qq.com>
 2022-11-07 16:10:26 +08:00
ibuler 2705c38ba1 pref: 添加命令启动失败 debug 2022-11-07 10:47:06 +08:00
ibuler 045bc3661a Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-11-04 20:16:29 +08:00
ibuler 0fb96091cc perf: 优化代码速度 2022-11-04 20:15:31 +08:00