github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity
10,405 Commits
64 Branches
246 Tags
105 MiB
Commit Graph

10405 Commits (5cd44ebfce6ec6dc5b7a98af15fd0f2c8d837f77)

Author SHA1 Message Date
老广 5cd44ebfce
Merge pull request #11865 from jumpserver/pr@dev@fix_corntab 
fix: 修复crontab语义
 2023-10-18 01:13:15 -05:00
老广 03c27ab5b8
Merge pull request #11875 from jumpserver/pr@dev@perf_update_clients_version 
perf: 更新clients版本
 2023-10-18 01:12:36 -05:00
fit2bot d3a283232f
perf: 优化 xpack license 检查 (#11885) 
Co-authored-by: ibuler <ibuler@qq.com>
 2023-10-18 01:10:24 -05:00
fit2bot f088bbce12
perf: 连接方式，动作去掉: 通知 (#11878) 
Co-authored-by: feng <1304903146@qq.com>
 2023-10-17 19:21:59 +08:00
fit2bot b313598227
fix: 修复账号批量添加模版账号时name没同步过来，资产创建时使用模版账号没有切换自，资产克隆时生成的账号没有切换自 (#11877) 
Co-authored-by: feng <1304903146@qq.com>
 2023-10-17 19:15:46 +08:00
halo 3a118b6753 perf: 更新clients版本 2023-10-17 17:13:30 +08:00
Eric_Lee 578c2af57c
Merge pull request #11870 from jumpserver/pr@dev@perf_acl_ip 
perf: 增加针对 ip 的获取
 2023-10-17 16:25:24 +08:00
Eric b5ef239c6c perf: 增加针对 ip 的获取 2023-10-17 15:57:15 +08:00
fit2bot e88e4438ba
fix: acl 记录操作日志 账号信息为空 (#11869) 
Co-authored-by: feng <1304903146@qq.com>
 2023-10-17 15:01:21 +08:00
fit2bot 73b75df524
perf: 资产acl拒绝后没记录操作日志 (#11868) 
Co-authored-by: feng <1304903146@qq.com>
 2023-10-17 14:28:19 +08:00
Bai 772684d24c fix: 修复crontab语义 2023-10-17 11:19:13 +08:00
fit2bot 741705b85b
perf: 修改定期清理日志默认时间180天 (#11864) 
Co-authored-by: feng <1304903146@qq.com>
 2023-10-17 11:11:55 +08:00
fit2bot f5176bcc6f
perf: 修改迁移文件 (#11863) 
Co-authored-by: feng <1304903146@qq.com>
 2023-10-17 11:04:05 +08:00
fit2bot c917d8f346
fix: 系统设置 安全设置权限为错误 (#11860) 
Co-authored-by: feng <1304903146@qq.com>
 2023-10-16 19:33:13 +08:00
fit2bot 5c0905b3b5
fix: 操作日志全局组织数量不对 (#11859) 
Co-authored-by: feng <1304903146@qq.com>
 2023-10-16 18:51:26 +08:00
fit2bot bda23b3d2a
fix: 调API创建与父节点同名的子节点报错：同级别节点名称不能重复 (#11858) 
Co-authored-by: feng <1304903146@qq.com>
 2023-10-16 18:15:53 +08:00
fit2bot 8b6526211c
perf: 工单动作添加操作日志 (#11857) 
Co-authored-by: feng <1304903146@qq.com>
 2023-10-16 16:40:21 +08:00
fit2bot 86e8f3a80b
fix: 组织管理员不能创建用户 (#11856) 
Co-authored-by: feng <1304903146@qq.com>
 2023-10-16 15:06:47 +08:00
fit2bot 70661242c1
fix: 在线用户 下线权限错误 导致审计员无权限下线用户 (#11853) 
Co-authored-by: feng <1304903146@qq.com>
 2023-10-16 14:22:20 +08:00
fit2bot 7dcae1e05a
perf: 命令过滤中 去掉通知动作 (#11851) 
Co-authored-by: feng <1304903146@qq.com>
 2023-10-16 13:27:37 +08:00
fit2bot 0a28c5650c
perf: 三方用户登录通知 (#11846) 
Co-authored-by: feng <1304903146@qq.com>
 2023-10-16 11:28:53 +08:00
fit2bot f55c84ce3b
fix: 发布机500 (#11841) 
Co-authored-by: feng <1304903146@qq.com>
 2023-10-13 17:19:05 +08:00
fit2bot ac11790192
perf: 替换iphone mfa 二维码图片 (#11839) 
Co-authored-by: feng <1304903146@qq.com>
 2023-10-13 16:51:34 +08:00
老广 f80ff279d0
perf: 用户确认和access key 
Merge branch 'dev' of github.com:jumpserver/jumpserver into dev
 2023-10-13 16:37:45 +08:00
ibuler d7ac08f6d9 perf: 去掉 debug 2023-10-13 16:36:23 +08:00
ibuler b5714f7e14 Merge branch 'pr@dev@perf_user_confirm' into pr@dev@perf_change_access_key_create 2023-10-13 16:34:19 +08:00
ibuler d6b450f32a perf: 修改 ak 2023-10-13 16:33:25 +08:00
ibuler 1daf1acaf3 perf: 修改 access key 2023-10-13 16:31:05 +08:00
fit2bot ea0e852412
fix: rdp 测试可连接性失败 (#11837) 
Co-authored-by: feng <1304903146@qq.com>
 2023-10-13 16:21:20 +08:00
ibuler ce976f215f Merge branch 'dev' of github.com:jumpserver/jumpserver into dev 2023-10-13 16:10:40 +08:00
fit2bot ffc057f844
fix: 账号改密-执行列表-详情-任务记录：模糊搜索500 (#11835) 
Co-authored-by: feng <1304903146@qq.com>
 2023-10-13 15:33:35 +08:00
fit2bot 588723a76c
perf: 优化资产登录通知信息 (#11834) 
Co-authored-by: feng <1304903146@qq.com>
 2023-10-13 15:08:56 +08:00
ibuler 1ca912373f perf: 修改用户确认 2023-10-13 14:59:58 +08:00
ibuler 452ee1224c perf: 修改用户确认 2023-10-13 14:40:40 +08:00
fit2bot 7eb497f9d3
fix: 资产登录被限制，没有记录到当前组织的操作日志，而是记录到全局组织 (#11827) 
Co-authored-by: feng <1304903146@qq.com>
 2023-10-12 20:13:21 +08:00
fit2bot 58fd578ddd
perf: 资产登录提示添加账号信息 (#11826) 
Co-authored-by: feng <1304903146@qq.com>
 2023-10-12 20:04:28 +08:00
fit2bot e1278360af
fix: 资产创建失败 (#11824) 
Co-authored-by: feng <1304903146@qq.com>
 2023-10-12 19:46:04 +08:00
fit2bot c0de27ff7a
perf: 资产批量更新平台字段，根据平台约束协议自动生效 (#11818) 
Co-authored-by: feng <1304903146@qq.com>
 2023-10-12 18:11:51 +08:00
ibuler 116d0ba5c6 perf: 优化任务记录 activity 2023-10-12 17:06:12 +08:00
fit2bot 9f042cfa04
Merge branch 'dev' into pr@dev@change_import (#11815) 
* perf: 修改获取 ip

* perf: 修改导入

---------

Co-authored-by: ibuler <ibuler@qq.com>
 2023-10-12 03:17:32 -05:00
Eric_Lee ce63ea7528
Merge pull request #11812 from jumpserver/pr@dev@fix_get_real_ip 
perf: 修改获取 ip
 2023-10-12 16:13:57 +08:00
ibuler 8b3fd2c117 perf: 修改获取 ip 2023-10-12 16:09:22 +08:00
ibuler 23ccd6df8c perf: mysql mariadb 数据库不再必填 2023-10-12 14:50:09 +08:00
Bai 614e019f14 fix: 修改迁移文件choices和翻译文件 2023-10-11 21:15:47 -05:00
ibuler 38aa828eb8 perf: passkey 只允许本地用户开启 2023-10-11 04:52:54 -05:00
Bai 7cd2736e82 perf: 优化用户传递的 phone 处理 2023-10-11 04:50:45 -05:00
ibuler 443f6d25e8 perf: Windows 默认使用 rdping 测试 2023-10-11 04:22:08 -05:00
Eric e8652af054 perf: 更新格式 2023-10-11 04:21:00 -05:00
Eric fd6a8dd807 perf: 增加错误类型 2023-10-11 04:21:00 -05:00
Eric 499eedd83e perf: 会话新增 error_reason 字段 2023-10-11 04:21:00 -05:00