github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity
9,010 Commits
71 Branches
249 Tags
114 MiB
Commit Graph

9010 Commits (d07c3e2de5b19937bf16d2a7f7263e6a152b6518)

Author SHA1 Message Date
老广 4ec7a4a118
Merge pull request #9707 from jumpserver/pr@dev@fix_serializer 
perf: 修复 role user serializer 问题
 2023-02-22 22:21:13 +08:00
ibuler c4982dd3b5 perf: 修复 role user serializer 问题 2023-02-22 22:20:11 +08:00
fit2bot 2279219404
perf: 工单备注 markdown (#9706) 
Co-authored-by: feng <1304903146@qq.com>
 2023-02-22 22:12:50 +08:00
老广 58341a9e85
Merge pull request #9689 from jumpserver/pr@dev@fix_operatelog_root_org 
fix: 操作日志、Activity日志显示当前组织和SYSTEM组织下的内容
 2023-02-22 22:09:26 +08:00
老广 ce8be265e7
Merge pull request #9705 from jumpserver/pr@dev@perf_perm_migrate 
perf: 优化迁移
 2023-02-22 21:58:41 +08:00
ibuler b8b25d2da8 perf: 修改 翻译 2023-02-22 21:57:48 +08:00
jiangweidong 07c23c5341 perf: 解决冲突 2023-02-22 21:56:40 +08:00
ibuler 37524106bf perf: 优化迁移 2023-02-22 21:52:37 +08:00
jiangweidong 6b6f844795 fix: 修改org_id位置 2023-02-22 21:48:11 +08:00
Eric_Lee 6a5b2bd29e
Merge pull request #9704 from jumpserver/pr@dev@fix_add_file_unspported_msg 
fix: 增加无法读取的文件提示
 2023-02-22 21:31:57 +08:00
Aaron3S 25bd5c71d1 fix: 增加无法读取的文件提示 2023-02-22 21:27:14 +08:00
Eric_Lee 3aa7d1841b
Merge pull request #9702 from jumpserver/pr@dev@perf_ops_permed_assets_error_msg 
perf: 优化报错代码
 2023-02-22 21:18:40 +08:00
Aaron3S 9b2f422622 perf: 优化报错代码 2023-02-22 21:14:13 +08:00
Bai 49c7a12bb3 fix: 修复资产授权规则过滤 2023-02-22 21:07:49 +08:00
老广 ad0fc0d70a
Merge pull request #9699 from jumpserver/pr@dev@perf_field 
perf: 优化部分 field
 2023-02-22 20:39:51 +08:00
老广 0b1f6e2606
Merge pull request #9693 from jumpserver/pr@dev@perf_accounts_version 
perf: 优化账号历史
 2023-02-22 20:38:52 +08:00
fit2bot b83667bbd5
perf: celery task and add org single (#9698) 
Co-authored-by: feng <1304903146@qq.com>
 2023-02-22 20:31:20 +08:00
ibuler ea31de0b2b perf: 优化部分 field 2023-02-22 20:30:43 +08:00
老广 8db3543e98
Merge pull request #9697 from jumpserver/pr@dev@fix_oracle_ping 
fix: 解决Oracle验证账号任务失败问题
 2023-02-22 20:19:11 +08:00
jiangweidong bcbab0ff49 fix: 解决冲突 2023-02-22 20:17:33 +08:00
jiangweidong 9207ee73ea fix: 解决Oracle验证账号任务失败问题 2023-02-22 20:16:04 +08:00
Eric_Lee 17a96a5b48
Merge pull request #9696 from jumpserver/pr@dev@fix_add_perm_classes 
fix: 添加 api permission_classes
 2023-02-22 20:07:41 +08:00
Aaron3S d14010d4fa fix: 添加 api permission_classes 2023-02-22 20:04:00 +08:00
fit2bot ec4cdc801f
perf: operate log amount (#9695) 
Co-authored-by: feng <1304903146@qq.com>
 2023-02-22 19:42:40 +08:00
fit2bot ddcd09c6a6
fix: 修复最后执行时间不更新的问题 (#9694) 
Co-authored-by: Aaron3S <chenyang@fit2cloud.com>
 2023-02-22 18:53:35 +08:00
Eric_Lee a4e920e410
Merge pull request #9688 from jumpserver/pr@dev@fix_job_center_account_not_in_perm 
fix: 修复作业中心资产和用于没有过滤授权规则的问题
 2023-02-22 18:51:04 +08:00
Aaron3S 34386bd6fb fix: 修改生成 inventory 错误代码，增加运行作业权限校验 2023-02-22 18:06:46 +08:00
ibuler 5d8d0a320b perf: 优化账号历史 2023-02-22 17:58:00 +08:00
fit2bot 042108a9c0
perf: k8s account @input (#9692) 
Co-authored-by: feng <1304903146@qq.com>
 2023-02-22 17:56:20 +08:00
Eric_Lee 5f376077c2
Merge pull request #9691 from jumpserver/pr@dev@perf_label 
perf: 部分字段 label 显示问题
 2023-02-22 16:50:53 +08:00
Eric 8eaf3fa781 perf: 部分字段 label 显示问题 2023-02-22 16:48:49 +08:00
fit2bot 7ceb27301b
perf: automation task name validate (#9690) 
Co-authored-by: feng <1304903146@qq.com>
 2023-02-22 16:23:18 +08:00
jiangweidong 0dba222796 Merge branch 'dev' of http://github.com/jumpserver/jumpserver into pr@dev@fix_operatelog_root_org 2023-02-22 15:57:17 +08:00
jiangweidong b9c0b9084e fix: 操作日志显示全部组织问题 2023-02-22 15:57:10 +08:00
Aaron3S d9a11900a9 fix: 修复作业中心资产和用于没有过滤授权规则的问题 2023-02-22 15:36:25 +08:00
老广 ee3c548b6b
Merge pull request #9687 from jumpserver/pr@dev@perf_change_account_verify 
perf: 修改 探测
 2023-02-22 15:21:15 +08:00
ibuler e5081fd6a9 merge: with dev 2023-02-22 15:17:44 +08:00
fit2bot 89c4635162
perf: change secrett 提示 (#9686) 
Co-authored-by: feng <1304903146@qq.com>
 2023-02-22 15:15:00 +08:00
ibuler 33f6c5b257 perf: 修改 探测 2023-02-22 15:13:51 +08:00
Bai 156ad665c3 fix: rbac perms 2023-02-22 14:54:13 +08:00
Eric_Lee 1e1d88f203
Merge pull request #9683 from jumpserver/pr@dev@fix_deploy_applets 
fix: 修复发布应用失败
 2023-02-22 14:24:25 +08:00
Eric 312fe69015 fix: 修复发布应用失败 2023-02-22 14:10:13 +08:00
老广 4b8e2d464f
Merge pull request #9682 from jumpserver/pr@dev@change_platform_migration 
perf: 修复用户平台内置的问题
 2023-02-22 13:17:14 +08:00
ibuler 6f765ebef5 perf: 修复用户平台内置的问题 2023-02-22 13:08:32 +08:00
Eric_Lee bbd274b92f
Merge pull request #9681 from jumpserver/pr@dev@fix_host_select 
fix: 过滤离线的发布机
 2023-02-22 12:29:31 +08:00
Eric f407bfd7b2 fix: 过滤离线的发布机 2023-02-22 12:27:30 +08:00
老广 8a97245b1a
Merge pull request #9671 from jumpserver/pr@dev@fix_db_with_domain_task 
feat: 支持数据库在连接网域的情况下执行Task
 2023-02-22 11:46:36 +08:00
jiangweidong fd146055f3 fix: 删除空行 2023-02-22 11:46:28 +08:00
jiangweidong cde59f7ae8 perf: 解决冲突 2023-02-22 11:44:46 +08:00
老广 5d61d843f3
Merge pull request #9680 from jumpserver/pr@dev@perf_account_chagne_secret 
perf: 修改 acount
 2023-02-22 11:29:18 +08:00