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

5424 Commits (2209a2c8d24ba7c92888f5c534e6e823eea2a93b)

Author SHA1 Message Date
老广 775f8f2ffd
Merge pull request #3722 from jumpserver/settings_bug 
Settings bug
 2020-02-26 16:18:24 +08:00
ibuler 1e8ef8c925 [Update] Merge with master 2020-02-26 16:15:42 +08:00
ibuler c354b55f61 [update] 修复获取settings有问题的bug 2020-02-26 16:12:41 +08:00
ibuler 76ac0215fe [update] 修复获取settings有问题的bug 2020-02-26 16:12:08 +08:00
老广 4f93a3ca92
Merge pull request #3716 from jumpserver/dev 
Dev
 2020-02-24 12:08:32 +08:00
ibuler bcae30814d [Update] 修改导入 2020-02-24 12:06:02 +08:00
老广 98bb6c63f5
[Update] 修改切换组织后页面跳转 (#3715) 2020-02-24 12:00:20 +08:00
老广 8b8b11ce1e
[Update] 恢复到原来的sql (#3707) 2020-02-15 20:49:20 +08:00
BaiJiangJie 5f61f2b555
Merge pull request #3702 from jumpserver/dev_interface 
[Update] 修改终端获取登录标题配置的逻辑
 2020-02-14 10:45:37 +08:00
Bai 62d2e01cdf [Update] 修改终端获取登录标题配置的逻辑 2020-02-14 10:40:18 +08:00
jym503558564 5e89ee9202 [Update] 修改README中 jumpserver ==> JumpServer 2020-02-13 19:58:14 +08:00
老广 5d313a827b
[Update] 优化session 索引 is_finished (#3697) 2020-02-13 15:17:13 +08:00
ibuler edf6baa52d [Update] 修改api创建的token有效期是600s 2020-02-07 17:24:52 +08:00
老广 3c69860b24
[Update] 优化sql, or方式改为union (#3682) 
* [Update] 优化sql, or方式改为union

* [Update] 优化union操作，直接union后，queryset 的一些参数不能使用，如annoate, 如filter assets__isnull=True
 2020-02-05 15:56:28 +08:00
老广 aa2255a87e
[Update] sql优化，查询用户资产权限时，使用union替代or (#3681) 2020-02-05 12:10:24 +08:00
BaiJiangJie 3cc9e0a66c
Merge pull request #3680 from jumpserver/dev 
Dev
 2020-02-03 14:25:24 +08:00
BaiJiangJie ec1f6677ec
Merge pull request #3679 from jumpserver/dev_session 
[Bugfix] 处理心跳时guacamole上报的session为str处理为list
 2020-02-03 14:08:37 +08:00
Bai ae98fb4332 [Bugfix] 处理心跳时guacamole上报的session为str处理为list 2020-02-03 13:54:59 +08:00
Yanzhe Lee 29730757b8 Infer User.name from OpenID UserInfo.name (#3674) 
Signed-off-by: YanzheL <lee.yanzhe@yanzhe.org>
 2020-01-27 10:15:06 +08:00
BaiJiangJie 1c2feedb27
Merge pull request #3661 from jumpserver/dev 
Dev
 2020-01-20 11:36:18 +08:00
BaiJiangJie b227d9cdc1
Merge pull request #3660 from jumpserver/dev_auth 
[Update] 修复用户更新页面会清空用户public_key的问题
 2020-01-20 11:28:40 +08:00
Bai da6a0c286d [Update] 修复用户更新页面会清空用户public_key的问题 2020-01-20 11:27:34 +08:00
BaiJiangJie 13a042bc0f
Merge pull request #3658 from jumpserver/dev_loginip 
[Update] 修改获取用户登录的ip和type
 2020-01-19 12:14:34 +08:00
Bai 7f9644dbac [Update] 修改获取用户登录的ip和type 2020-01-19 12:13:42 +08:00
BaiJiangJie ece9b16351
Merge pull request #3651 from jumpserver/dev 
Dev
 2020-01-16 11:39:26 +08:00
BaiJiangJie 23b896b301
Merge pull request #3650 from jumpserver/dev_i18n 
[Update] 翻译应用树更节点（API）
 2020-01-16 11:31:55 +08:00
Bai dd52baae12 [Update] 翻译应用树更节点（API） 2020-01-16 11:31:08 +08:00
BaiJiangJie eb1ca4c0f2
Merge pull request #3649 from jumpserver/dev_copyright 
[Update] 修改copyright
 2020-01-16 10:36:48 +08:00
Bai 8e75e519fa [Update] 修改copyright 2020-01-16 10:35:00 +08:00
BaiJiangJie 389c6b5a84
Merge pull request #3648 from jumpserver/dev_i18n 
[Update] 更新翻译
 2020-01-16 09:59:22 +08:00
Bai 6fc7a4cb21 [Update] 更新翻译 2020-01-16 09:58:00 +08:00
BaiJiangJie 68455156a3
Merge pull request #3646 from jumpserver/dev_ops 
[Update] 更新命令批量执行资产树（将没有ssh协议的资产设置为nocheck）
 2020-01-15 10:47:39 +08:00
Bai 2827a64095 [Update] 更新命令批量执行资产树（将没有ssh协议的资产设置为nocheck） 2020-01-15 10:46:41 +08:00
BaiJiangJie c21505e92d
Merge pull request #3644 from jumpserver/dev_ops 
[Update] 批量命令执行开放rdp系统用户
 2020-01-14 17:34:40 +08:00
Bai 7d855e5ad8 [Update] 批量命令执行开放rdp系统用户 2020-01-14 17:33:41 +08:00
BaiJiangJie 17956bf0db
Merge pull request #3633 from jumpserver/dev 
Dev
 2020-01-14 16:56:04 +08:00
BaiJiangJie 267a7fc9f7
Merge pull request #3643 from jumpserver/dev_i18n 
[Update] 更新翻译
 2020-01-14 16:55:44 +08:00
Bai 9ef4762817 [Update] 更新翻译 2020-01-14 16:54:52 +08:00
八千流 29457ad867 Assets_permission_action 优化 (#3585) 
* [Update] 初步实现 actions的checkbox层叠嵌套

* [Update] 优化actions的checkbox层叠嵌套

* [Update] 修改校验用户/系统用户/资产的权限API可能会出现的问题

* [Update] 更新资产授权中动作的展示

* [Update] 更新资产授权中动作的展示 2

* [Update] 更新资产授权中动作的展示 3

Co-authored-by: BaiJiangJie <32935519+BaiJiangJie@users.noreply.github.com>
 2020-01-14 16:44:28 +08:00
BaiJiangJie d5082d1379
Merge pull request #3639 from jumpserver/dev_su_detail 
[Update] 系统用户详情(mysql)开放命令过滤器
 2020-01-14 11:08:32 +08:00
Bai c07536b26f [Update] 系统用户详情(mysql)开放命令过滤器 2020-01-14 11:07:35 +08:00
BaiJiangJie 678999b9f5
Merge pull request #3638 from jumpserver/dev_su_mysql 
[Update] 系统用户(mysql)开放命令过滤器
 2020-01-14 11:03:29 +08:00
Bai 4295aec492 [Update] 系统用户(mysql)开放命令过滤器 2020-01-14 10:53:52 +08:00
BaiJiangJie 75a2b9eac2
Merge pull request #3636 from jumpserver/dev_perms 
[Update] 授权的 RemoteApp/DatabaseApp 进行去重
 2020-01-13 18:57:33 +08:00
Bai 2fc68ca6f1 [Update] 授权的 RemoteApp/DatabaseApp 进行去重 2020-01-13 18:56:58 +08:00
BaiJiangJie 56a156b717
Merge pull request #3634 from jumpserver/dev_req 
[Update] 修改依赖
 2020-01-13 17:28:44 +08:00
Bai 7c59134635 [Update] 修改依赖 2020-01-13 17:28:00 +08:00
BaiJiangJie f98f0e2c06
Merge pull request #3632 from jumpserver/dev_i18n 
Dev i18n
 2020-01-13 14:24:41 +08:00
Bai 63746accf9 [Update] 修改js默认语言为中文 2020-01-13 14:23:33 +08:00
Bai 670e2d7352 [Update] 更新翻译 2020-01-13 14:13:45 +08:00