Commit Graph

7899 Commits (3a62abf381cc512694913d63153c4f89ccac00a4)

Author SHA1 Message Date
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
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
吴小白 e8fb6d5380 perf: 配置 apt 镜像 2022-11-16 08:58:16 +08:00
吴小白 e220b8174d perf: 配置下载路径 2022-11-15 22:18:15 +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
吴小白 ae0ede5f73 Merge branch 'v3' of https://github.com/jumpserver/jumpserver into v3 2022-11-15 17:26:44 +08:00
吴小白 7bfa21260c perf: 优化 Dockerfile 2022-11-15 17:24:56 +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