github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity
9,705 Commits
96 Branches
262 Tags
144 MiB
Commit Graph

9705 Commits (13d895b22e95b5ec6e5a32b5d9461ec9f8b6b939)

Author SHA1 Message Date
Eric 13d895b22e fix: 修复远程应用会话无法监控的问题 2023-06-21 12:05:19 +08:00
Bai d5c51a4f0e fix: 修复迁移文件时触发信号记录操作日志导致迁移失败的问题 2023-06-21 11:02:14 +08:00
Eric 7c965706d4 perf: 修复 terminal 显示问题 2023-06-20 16:33:43 +08:00
feng f59499f77e fix: 修改 push_account_params 数据迁移逻辑，不在导入公共方法生成数据 2023-06-19 18:23:23 +08:00
ibuler 98536cbc24 fix: 修改原来 platform 为 device 时，导致的 asset 类型不对 2023-06-19 17:54:17 +08:00
老广 7c29e60a82
Merge pull request #10757 from jumpserver/pr@v3.4@fix_custom_asset_detail_error 
perf: 修复自定义资产详情没有 auto_config 的问题
 2023-06-16 18:48:41 +08:00
ibuler 9e68d7d1a0 perf: 修复自定义资产详情没有 auto_config 的问题 2023-06-16 10:45:00 +00:00
ibuler 77b7134404 perf: 优化自定义 platform field 2023-06-16 17:02:46 +08:00
老广 fb7a839c16
Merge pull request #10755 from jumpserver/pr@v3.4@fix_permed_asset_duplicate 
fix: 修复授权资产根据协议搜索重复的问题
 2023-06-16 16:53:21 +08:00
ibuler e80855068e fix: 修复授权资产根据协议搜索重复的问题 2023-06-16 08:44:53 +00:00
ibuler 5832246e5f perf: 修改 login acls 迁移冲突问题 
perf: 修改 login acls 迁移，避免冲突
 2023-06-16 13:58:51 +08:00
ibuler dbef45e23b perf: 修复 acl 迁移后无法使用 2023-06-15 18:46:33 +08:00
feng dedc42d775 feat: 添加自动化任务rdp ping 2023-06-15 18:46:04 +08:00
老广 f64073f48f
Merge pull request #10739 from jumpserver/pr@v3.4@pr@dev@change_base_image 
perf: 修改基础镜像版本
 2023-06-15 17:36:33 +08:00
ibuler 70754ad748 perf: 修改基础镜像版本 2023-06-15 17:33:04 +08:00
fit2bot 3158980057
perf: 修改翻译 (#10734) 
Co-authored-by: feng <1304903146@qq.com>
 2023-06-15 15:41:25 +08:00
Jiangjie.Bai 0a1b379dcd
Merge pull request #10731 from jumpserver/dev 
v3.4.0
 2023-06-15 14:16:39 +08:00
老广 54926f7c70
Merge pull request #10729 from jumpserver/pr@dev@perf_custom_asset_support_required_field 
perf: 自定义 field 支持 required
 2023-06-15 13:18:06 +08:00
ibuler a48d0046a9 perf: 自定义 field 支持 required 2023-06-15 13:14:02 +08:00
fit2bot 852435c7d5
perf: user 序列化添加is_org_admin 字段 (#10728) 
Co-authored-by: feng <1304903146@qq.com>
 2023-06-15 12:15:04 +08:00
老广 b19d9c8754
Merge pull request #10727 from jumpserver/pr@dev@perf_acl_ordering 
perf: 优化 acl 默认排序
 2023-06-15 10:49:07 +08:00
ibuler e92c82568d perf: 优化 acl 默认排序 2023-06-15 10:45:07 +08:00
老广 c6e19a2989
Merge pull request #10726 from jumpserver/pr@dev@perf_json_field_re_error 
perf: 优化 json field re 报错问题
 2023-06-15 10:32:12 +08:00
ibuler 58edf02179 perf: 优化 json field re 报错问题 2023-06-15 10:27:52 +08:00
老广 3e9bafadec
Merge pull request #10725 from jumpserver/pr@dev@perf_json_attr_m2m_filter 
perf: 优化修改 rule vlaue
 2023-06-15 10:17:36 +08:00
ibuler 70af478f66 perf: 优化修改 rule vlaue 2023-06-15 10:16:18 +08:00
ibuler d7121296f2 perf: 优化使用 bool 2023-06-15 10:14:59 +08:00
老广 a76b243226
Merge pull request #10724 from jumpserver/pr@dev@fix_image 
fix: 修正基础镜像名称
 2023-06-15 10:14:03 +08:00
吴小白 5bd276b9ce fix: 修正基础镜像名称 2023-06-15 10:02:08 +08:00
老广 abd4e87bc2
Merge pull request #10723 from jumpserver/pr@dev@perf_json_attr_m2m_filter 
perf: 优化 json m2m filter
 2023-06-15 09:40:39 +08:00
ibuler 40d8a71bf8 perf: 优化 json m2m filter 2023-06-15 09:37:00 +08:00
老广 aad804f1af
Merge pull request #10722 from jumpserver/pr@dev@perf_json_filter_m2m 
perf: 优化 json m2m filter
 2023-06-14 21:11:41 +08:00
ibuler ee15f2d3d7 perf: 优化 json m2m filter 2023-06-14 21:10:35 +08:00
fit2bot 7c31b4ee30
perf: 修改翻译 (#10721) 
Co-authored-by: feng <1304903146@qq.com>
 2023-06-14 20:42:29 +08:00
ibuler 25e7249957 perf: 优化正则匹配 2023-06-14 20:41:14 +08:00
Aaron3S d10db0aa62 fix: 修复任务被黑名单拦截后没有更新状态的问题 2023-06-14 20:40:40 +08:00
老广 d87ece00bd
Merge pull request #10718 from jumpserver/pr@dev@perf_phone 
perf: 优化 phone
 2023-06-14 20:23:59 +08:00
ibuler fca3936a79 perf: 优化 phone 2023-06-14 20:22:41 +08:00
Aaron3S 2c2334b618 perf: 优化报错内容 2023-06-14 20:16:42 +08:00
Aaron3S 9e31a5064b perf: 优化黑名单命令提示 2023-06-14 20:16:42 +08:00
Bai 954f86f8a9 fix: 修复执行任务中心报错的问题 2023-06-14 19:57:55 +08:00
老广 a3d32c901d
Merge pull request #10715 from jumpserver/pr@dev@perf_filter_q_name 
perf: 优化 filter name
 2023-06-14 19:12:54 +08:00
ibuler ce5ddf7873 perf: 优化 filter name 2023-06-14 19:10:34 +08:00
老广 29ebdb03e7
Merge pull request #10711 from jumpserver/pr@dev@perf_json_field_select 
perf: 优化查询 acls
 2023-06-14 18:19:42 +08:00
ibuler 53c3c90e2d perf: 优化查询 acls 2023-06-14 18:17:20 +08:00
nut 4bcd47df64 Update mixins.py 2023-06-14 17:10:38 +08:00
nut d51323faef Update mixins.py 2023-06-14 17:10:38 +08:00
fangfang.dong e8163167c5 修复: 控制台 - 账号 - 账号列表 - 查看账号详情时的500错误 2023-06-14 17:10:38 +08:00
Eric e762a5d8ae perf: 更新发布机的单用户单会话策略 2023-06-14 16:49:37 +08:00
老广 dd85e2d74f
Merge pull request #10707 from jumpserver/pr@dev@perf_connect_methods 
perf: 优化连接方式
 2023-06-14 15:14:45 +08:00