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

7079 Commits (d856f1364afa70e4f31e6fc9013733ce191e9b00)

Author SHA1 Message Date
Michael Bai ca34216141 perf: 优化Core/Celery注册终端名称 2021-09-09 16:17:23 +08:00
fit2cloud-jiangweidong 905014d441
feat: 改密计划支持数据库改密 (#6709) 
* feat: 改密计划支持数据库改密

* fix: 将数据库账户信息不保存在资产信息里，保存到自己的存储中

* perf: 早餐村

* perf: 修改account

* perf: 修改app和系统用户

* perf: 优化系统用户和应用关系

* fix: 修复oracle不可连接问题

Co-authored-by: ibuler <ibuler@qq.com>
Co-authored-by: feng626 <1304903146@qq.com>
Co-authored-by: Michael Bai <baijiangjie@gmail.com>
 2021-09-09 16:04:54 +08:00
feng626 3e51f4d616 fix: 修复授权500 2021-09-09 14:43:03 +08:00
fit2bot 07179a4d22
feat: 页面配置serializer版 (#6750) 
* feat: 页面配置serializer版

* perf: 优化配置

* perf: 优化设置

* perf: 优化设置

* perf: 优化配置页面

* perf: 基本完成设置优化

Co-authored-by: feng626 <1304903146@qq.com>
Co-authored-by: ibuler <ibuler@qq.com>
 2021-09-09 14:00:50 +08:00
Michael Bai 7a2e93c087 perf: 优化终端注册时名称长度处理逻辑 2021-09-09 13:27:27 +08:00
xinwen 3fb368c741 fix: 修复 xrdp domain 不生效 2021-09-08 17:54:03 +08:00
fit2bot fca3a8fbca
perf: 绑定MFA认证密码时对密码进行加密传输 (#6776) 
* perf: 绑定MFA认证密码时对密码进行加密传输

* perf: 绑定MFA认证密码时对密码进行加密传输

Co-authored-by: Michael Bai <baijiangjie@gmail.com>
 2021-09-08 16:40:09 +08:00
xinwen c1375ed7cb feat: xrdp 支持挂载本地磁盘(仅适用于 win) 2021-09-07 19:10:27 +08:00
Michael Bai 8b483b8c36 fix: 终端获取配置API返回SECURITY_SESSION_SHARE 2021-09-07 19:07:50 +08:00
Jiangjie.Bai c465fccc33
feat: 支持 Session 会话共享 (#6768) 
* feat: 添加 SECURITY_SESSION_SHARE 配置

* feat: 添加 SessionShare / ShareJoinRecord Model

* feat: 添加 SessionShare / ShareJoinRecord Model

* feat: 添加 SessionSharing / SessionJoinRecord Model

* feat: 添加 SessionSharing API

* feat: 添加 SessionJoinRecord API

* feat: 修改迁移文件

* feat: 修改迁移文件

* feat: 修改迁移文件

* feat: 修改API权限
 2021-09-07 18:16:27 +08:00
ibuler 3d934dc7c0 perf: 优化迁移 2021-09-06 19:57:37 +08:00
feng626 b69ed8cbe9
Merge pull request #6767 from jumpserver/pr@dev@keep_only_flow_app_asset 
perf: 只保留app asset flow
 2021-09-06 18:45:50 +08:00
feng626 c27230762b perf: 只保留app asset flow 2021-09-06 18:44:58 +08:00
Bai 7ea8205672 feat: 云管中心添加GCP 2021-09-06 18:21:15 +08:00
wojiushixiaobai b9b55e3d67 perf: 添加常用工具 2021-09-06 18:20:30 +08:00
feng626 900fc4420c perf: 只保留app asset flow 2021-09-06 18:19:47 +08:00
feng626 0a3e5aed56 perf: 授权分类采用from_ticket字段 2021-09-06 11:03:16 +08:00
feng626 9fb6fd44d1
Merge pull request #6745 from jumpserver/pr@dev@add_authorization_rule 
feat: 授权规则分类管理
 2021-09-01 16:48:56 +08:00
feng626 4214b220e1 feat: 授权规则分类管理 2021-08-31 14:13:05 +08:00
feng626 ae80797ce4 fix: 修复工单迁移bug 2021-08-27 18:05:14 +08:00
feng626 d1be4a136e
Merge pull request #6735 from jumpserver/pr@dev@asset_app_suggestion 
feat: add app asset suggestion
 2021-08-27 16:52:56 +08:00
feng626 e8e211f47c feat: add app asset suggestion 2021-08-27 16:47:36 +08:00
feng626 44044a7d99
Merge pull request #6730 from jumpserver/pr@dev@ticket_fix 
perf: 优化变量名
 2021-08-27 10:14:46 +08:00
feng626 5854ad1975 perf: 优化变量名 2021-08-26 18:29:02 +08:00
健健 0b1a1591f8
从 __all__ 中删除 RDPFileSerializer (#6727) 
* 从 __all__ 中删除 RDPFileSerializer

RDPFileSerializer 已经被删除

Co-authored-by: Jiangjie.Bai <32935519+BaiJiangJie@users.noreply.github.com>
Co-authored-by: 老广 <ibuler@qq.com>
Co-authored-by: xinwen <coderWen@126.com>
Co-authored-by: Eric_Lee <xplzv@126.com>
 2021-08-26 15:12:19 +08:00
ibuler 6241238b45 feat: sso支持验证mfa 2021-08-26 15:07:55 +08:00
fit2bot 0f87f05b3f
feat: 工单多级审批 + 模版创建 (#6640) 
* feat: 工单多级审批 + 模版创建

* feat: 工单权限处理

* fix: 工单关闭后 再审批bug

* perf: 修改一点

Co-authored-by: feng626 <1304903146@qq.com>
Co-authored-by: ibuler <ibuler@qq.com>
 2021-08-25 19:02:50 +08:00
Jiangjie.Bai 19c63a0b19
Merge pull request #6708 from jumpserver/dev 
feat:README
 2021-08-20 16:52:02 +08:00
fit2bot 1fdc558ef7
feat: 修改readme (#6707) 
* feat: 修改readme

* feat: 修改readme

* feat: 修改readme

* feat: 修改readme

Co-authored-by: Bai <bugatti_it@163.com>
 2021-08-20 16:47:49 +08:00
ibuler 9f6e26c4db fix: 修复ws引起的redis连接增加 2021-08-20 15:23:23 +08:00
ibuler 628012a7ee perf: 修改健康监测 2021-08-20 14:33:51 +08:00
ibuler c1579f5fe4 perf: 修改readme 2021-08-20 14:13:40 +08:00
Bai cbe0483b46 fix: 资产mini接口返回platform、protocols 2021-08-20 14:12:59 +08:00
xinwen 10c2935df4 fix: 用户创建 500 2021-08-20 10:07:17 +08:00
Jiangjie.Bai 10e06a4533
Merge pull request #6692 from jumpserver/dev 
v2.13.0
 2021-08-19 18:52:25 +08:00
ibuler 98e38ebfd8 perf: 修复系统用户翻译 2021-08-19 17:26:38 +08:00
Bai 9660e20176 fix: 修复远程应用资产必填项 2021-08-19 16:28:51 +08:00
xinwen 21a7ec9fec fix: 升级时清空缓存 2021-08-19 15:45:59 +08:00
xinwen 7d123ff8c5 fix: 登录时验证码卡住 2021-08-19 15:19:01 +08:00
ibuler 2af6ac504d perf: 优化版本号 2021-08-19 11:15:10 +08:00
Jiangjie.Bai 6c8d1c4e77
Merge pull request #6680 from jumpserver/dev 
v2.13.0 rc4
 2021-08-18 19:50:17 +08:00
Bai 52d3e1b34b fix: 修改协议错误信息翻译 2021-08-18 19:33:50 +08:00
Bai bf6fcc9020 fix: 修改翻译信息；添加水印配置项到页面 2021-08-18 19:14:49 +08:00
Bai a0b756ebaa feat: 添加同步任务执行历史保留天数配置项 2021-08-18 18:30:10 +08:00
xinwen 5e8a55f949 fix: AuthBook 变动审计 2021-08-18 16:47:28 +08:00
xinwen f9218584f4 fix: 组织统计里系统用户与特权用户数量不对 2021-08-18 16:46:01 +08:00
Bai 228446979f fix: 修改过期节点资产映射缓存清除 2021-08-18 15:37:40 +08:00
Bai aa37d86959 fix: 将flower放到web服务中；修复账号列表过滤节点的逻辑，获取所有子节点。 2021-08-18 15:36:13 +08:00
feng626 0e9079fa2e
Merge pull request #6673 from jumpserver/pr@dev@user_role_search 
fix: 用户角色搜索
 2021-08-18 15:26:56 +08:00
feng626 58c058c1a5 fix: 修复user筛选用户bug 2021-08-18 15:25:35 +08:00