github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity
4,923 Commits
69 Branches
249 Tags
112 MiB
Commit Graph

4923 Commits (0a8eeca62969da0fe36f111f97f2c4ee5e8c8953)

Author SHA1 Message Date
Bai f1b8c1965d [Update] 修改删除管理用户（存在关联资产）的Bug 2020-01-13 14:07:42 +08:00
BaiJiangJie aa2a77ee7e
Merge pull request #3630 from jumpserver/dev_req 
[Update] 修改依赖
 2020-01-13 13:52:31 +08:00
Bai b107d15097 [Update] 修改依赖 2020-01-13 13:51:59 +08:00
BaiJiangJie 52b9c400eb
Merge pull request #3629 from jumpserver/dev 
Dev
 2020-01-13 12:51:13 +08:00
BaiJiangJie 851bd99eaf
Merge pull request #3628 from jumpserver/dev_node 
[Update] 修改资产树移动资产的问题
 2020-01-13 12:50:49 +08:00
Bai 0c0eb843ab [Update] 修改资产树移动资产的问题 2020-01-13 12:50:01 +08:00
BaiJiangJie bd19f8afe8
Merge pull request #3624 from jumpserver/dev 
Dev
 2020-01-10 18:27:49 +08:00
BaiJiangJie bafffc95b8
Merge pull request #3621 from jumpserver/dev_node 
[Update] 资产节点添加资产时，祖先节点授权的系统用户关联对应资产
 2020-01-10 16:47:44 +08:00
Bai 14581ac775 [Update] 资产节点添加资产时，祖先节点授权的系统用户关联对应资产 2020-01-10 16:46:18 +08:00
BaiJiangJie 6ddd48bfb1
Merge pull request #3618 from jumpserver/dev_swift 
[Update] 修改Swift录像存储创建参数及API返回值
 2020-01-10 11:44:23 +08:00
Bai ff1828bdd6 [Update] 修改Swift录像存储创建参数及API返回值 2020-01-10 11:42:53 +08:00
BaiJiangJie 84e5177ce2
Merge pull request #3614 from jumpserver/dev_ldap 
[Update] 修改LDAP认证逻辑，密码为空时认证失败
 2020-01-09 11:18:12 +08:00
Bai 1c9be184fd [Update] 修改LDAP认证逻辑，密码为空时认证失败 2020-01-09 11:16:13 +08:00
BaiJiangJie 57155c2469
[Update] 更新 Readme (#3608) 
* [Update] readme 1

* [Update] readme 2

* [Update] readme 3

* [Update] readme 4

* [Update] readme 5
 2020-01-08 12:17:56 +08:00
BaiJiangJie f9578f4474
Merge pull request #3606 from jumpserver/dev 
Dev
 2020-01-07 17:34:07 +08:00
BaiJiangJie a37e14221e
Merge pull request #3603 from jumpserver/dev_systemuser 
[Update] 更新系统用户认证信息private_key转换
 2020-01-07 15:56:16 +08:00
Bai 005272cdc0 [Update] 更新系统用户认证信息private_key转换 2020-01-07 15:53:53 +08:00
BaiJiangJie f88cb3da20
Merge pull request #3600 from jumpserver/dev_i18n 
[Update] dateRange插件支持i18n
 2020-01-06 18:24:14 +08:00
Bai 9f42dfb26e [Update] dateRange插件支持i18n 2 2020-01-06 18:23:35 +08:00
Bai f702fc7d93 [Update] dateRange插件支持i18n 2020-01-06 18:21:12 +08:00
BaiJiangJie 05adb4e95f
Merge pull request #3598 from jumpserver/dev_terminal 
[Update] 更新Session表asset字段长度128
 2020-01-06 15:36:51 +08:00
Bai 210a2d7fe6 [Update] 更新Session表asset字段长度128 2020-01-06 15:36:03 +08:00
BaiJiangJie c9dc1ea254
Merge pull request #3596 from jumpserver/dev_ops 
[Update] 修改作业中心批量命令资产树收藏夹循环现实的问题
 2020-01-06 14:48:08 +08:00
Bai 79b5618756 [Update] 修改作业中心批量命令资产树收藏夹循环现实的问题 2020-01-06 14:46:59 +08:00
BaiJiangJie bf922459ff
[Update] 修改创建按钮样式；Open 数据库应用；取消资产/系统用户/组织等名称对于特殊字符的限制； (#3594) 
* [Update] 修改创建按钮样式

* [Update] Open数据库应用

* [Update] 取消资产/系统用户/组织等名称对于特殊字符的限制
 2020-01-06 11:43:37 +08:00
BaiJiangJie a27fb18a17
Merge pull request #3591 from jumpserver/dev 
Dev
 2020-01-03 17:03:37 +08:00
BaiJiangJie f62f750266
Merge pull request #3588 from jumpserver/dev_mfa 
Dev mfa
 2020-01-03 15:31:43 +08:00
BaiJiangJie b072e98148 [Update] 修改确认用户认证成功和绑定MFA的前后逻辑（解决绕过绑定MFA的漏洞；解决管理员重置用户MFA后自动退出的问题） 2020-01-03 15:26:38 +08:00
BaiJiangJie 352bfeeb7a [Update] 绑定MFA页面（二维码显示） 2020-01-03 11:41:07 +08:00
BaiJiangJie 1d7bdd5f5f
Merge pull request #3586 from jumpserver/dev_bai 
[Bugfix] 修改BlockLoginError的msg值在初始化中设置（数据表没生成之前启动会有问题）
 2020-01-02 16:25:07 +08:00
BaiJiangJie 8702761303 [Bugfix] 修改BlockLoginError的msg值在初始化中设置（数据表没生成之前启动会有问题） 2020-01-02 16:24:13 +08:00
BaiJiangJie ce3cc80037
Merge pull request #3583 from jumpserver/dev_version 
[Update] 修改版本号（v1.5.6）
 2019-12-31 18:50:56 +08:00
BaiJiangJie 9556d33d1c [Update] 修改版本号（v1.5.6） 2019-12-31 18:49:21 +08:00
BaiJiangJie 02650c9cdc
Merge pull request #3582 from jumpserver/dev_session 
[Update] 添加清除幽灵mysql会话
 2019-12-31 16:49:20 +08:00
BaiJiangJie 75c6047236 [Update] 添加清除幽灵mysql会话 2019-12-31 16:47:25 +08:00
BaiJiangJie e6c369cfd8
Merge pull request #3581 from jumpserver/dev_session 
[Update] 添加清除幽灵rdp会话
 2019-12-31 15:39:04 +08:00
BaiJiangJie 131496bfee [Update] 添加清除幽灵rdp会话 2019-12-31 15:38:10 +08:00
BaiJiangJie c084412e53
[Update] 解决Vault翻页再次选择资产时不能设置到select框的问题：select.style === single 时 (#3579) 
* [Update] 解决Vault翻页再次选择资产时不能设置到select框的问题：select.style === single 时

* [Update] 优化1
 2019-12-30 16:40:38 +08:00
BaiJiangJie ad81d6c28e
Merge pull request #3576 from jumpserver/dev_audit 
[Update] 修改操作日志title文案：操作者
 2019-12-30 12:27:58 +08:00
BaiJiangJie 08fb8f5d92 [Update] 修改操作日志title文案：操作者 2019-12-30 12:27:14 +08:00
BaiJiangJie 4df08f0521
Merge pull request #3575 from jumpserver/dev_storage 
[Update] 命令存储ES字段设置为required
 2019-12-30 11:55:25 +08:00
BaiJiangJie c963937f00 [Update] 命令存储ES字段设置为required 2019-12-30 11:54:36 +08:00
BaiJiangJie b64ae358fb
Merge pull request #3572 from jumpserver/dev_bai 
[Update] 修改右击节点rMenu菜单show offset
 2019-12-27 16:59:30 +08:00
BaiJiangJie 42c5783e43 [Update] 修改右击节点rMenu菜单show offset 2019-12-27 16:42:36 +08:00
BaiJiangJie a2350e7f1d
Merge pull request #3571 from jumpserver/bugfix 
[Bugfix] 修复vault导出选择id的bug
 2019-12-27 16:05:28 +08:00
ibuler b3114a1f3d [Bugfix] 修复vault导出选择id的bug 2019-12-27 16:03:45 +08:00
BaiJiangJie b4cf540e51
[Update] 操作日志添加新的Record Model；用户登录日志采用同步机制；修改DatabaseAppAPI权限（加入AppUser）； (#3570) 
* [Update] 操作日志 Model Need Record 添加RemoteApp、DatabaseApp、DatabaseAppPermission

* [Update] 用户登录日志，采用同步机制

* [Update] 修改DatabaseApp API权限OrgAdmin和AppUser
 2019-12-27 16:00:32 +08:00
BaiJiangJie deeb9cdfa6
Merge pull request #3564 from jumpserver/dev_bai 
[Update] 修改校验用户资产权限API不使用缓存
 2019-12-25 10:30:45 +08:00
BaiJiangJie 7a6a1b9b59 [Update] 修改校验用户资产权限API不使用缓存 2019-12-25 10:29:58 +08:00
BaiJiangJie 15d1e021de
Merge pull request #3559 from jumpserver/dev_command 
[Update] 支持Windows批量命令
 2019-12-23 11:23:46 +08:00