Commit Graph

4826 Commits (f8dae2a3c902c209514ad647a3e125401c5f7f26)
 

Author SHA1 Message Date
老广 1fd2e782f8
1.5.7 Merge to dev (#3766)
5 years ago
老广 1f6a8e8f02
Merge pull request #3698 from jumpserver/readme
5 years ago
老广 eca0a9a7d7
Merge pull request #3723 from jumpserver/settings_bug
5 years ago
ibuler 1e8ef8c925 [Update] Merge with master
5 years ago
ibuler c354b55f61 [update] 修复获取settings有问题的bug
5 years ago
ibuler 76ac0215fe [update] 修复获取settings有问题的bug
5 years ago
老广 4f93a3ca92
Merge pull request #3716 from jumpserver/dev
5 years ago
ibuler bcae30814d [Update] 修改导入
5 years ago
老广 98bb6c63f5
[Update] 修改切换组织后页面跳转 (#3715)
5 years ago
老广 8b8b11ce1e
[Update] 恢复到原来的sql (#3707)
5 years ago
BaiJiangJie 5f61f2b555
Merge pull request #3702 from jumpserver/dev_interface
5 years ago
Bai 62d2e01cdf [Update] 修改终端获取登录标题配置的逻辑
5 years ago
jym503558564 5e89ee9202 [Update] 修改README中 jumpserver ==> JumpServer
5 years ago
老广 5d313a827b
[Update] 优化session 索引 is_finished (#3697)
5 years ago
ibuler edf6baa52d [Update] 修改api创建的token有效期是600s
5 years ago
老广 3c69860b24
[Update] 优化sql, or方式改为union (#3682)
5 years ago
老广 aa2255a87e
[Update] sql优化,查询用户资产权限时,使用union替代or (#3681)
5 years ago
BaiJiangJie 3cc9e0a66c
Merge pull request #3680 from jumpserver/dev
5 years ago
BaiJiangJie ec1f6677ec
Merge pull request #3679 from jumpserver/dev_session
5 years ago
Bai ae98fb4332 [Bugfix] 处理心跳时guacamole上报的session为str处理为list
5 years ago
Yanzhe Lee 29730757b8 Infer User.name from OpenID UserInfo.name (#3674)
5 years ago
BaiJiangJie 1c2feedb27
Merge pull request #3661 from jumpserver/dev
5 years ago
BaiJiangJie b227d9cdc1
Merge pull request #3660 from jumpserver/dev_auth
5 years ago
Bai da6a0c286d [Update] 修复用户更新页面会清空用户public_key的问题
5 years ago
BaiJiangJie 13a042bc0f
Merge pull request #3658 from jumpserver/dev_loginip
5 years ago
Bai 7f9644dbac [Update] 修改获取用户登录的ip和type
5 years ago
BaiJiangJie ece9b16351
Merge pull request #3651 from jumpserver/dev
5 years ago
BaiJiangJie 23b896b301
Merge pull request #3650 from jumpserver/dev_i18n
5 years ago
Bai dd52baae12 [Update] 翻译应用树更节点(API)
5 years ago
BaiJiangJie eb1ca4c0f2
Merge pull request #3649 from jumpserver/dev_copyright
5 years ago
Bai 8e75e519fa [Update] 修改copyright
5 years ago
BaiJiangJie 389c6b5a84
Merge pull request #3648 from jumpserver/dev_i18n
5 years ago
Bai 6fc7a4cb21 [Update] 更新翻译
5 years ago
BaiJiangJie 68455156a3
Merge pull request #3646 from jumpserver/dev_ops
5 years ago
Bai 2827a64095 [Update] 更新命令批量执行资产树(将没有ssh协议的资产设置为nocheck)
5 years ago
BaiJiangJie c21505e92d
Merge pull request #3644 from jumpserver/dev_ops
5 years ago
Bai 7d855e5ad8 [Update] 批量命令执行开放rdp系统用户
5 years ago
BaiJiangJie 17956bf0db
Merge pull request #3633 from jumpserver/dev
5 years ago
BaiJiangJie 267a7fc9f7
Merge pull request #3643 from jumpserver/dev_i18n
5 years ago
Bai 9ef4762817 [Update] 更新翻译
5 years ago
八千流 29457ad867 Assets_permission_action 优化 (#3585)
5 years ago
BaiJiangJie d5082d1379
Merge pull request #3639 from jumpserver/dev_su_detail
5 years ago
Bai c07536b26f [Update] 系统用户详情(mysql)开放命令过滤器
5 years ago
BaiJiangJie 678999b9f5
Merge pull request #3638 from jumpserver/dev_su_mysql
5 years ago
Bai 4295aec492 [Update] 系统用户(mysql)开放命令过滤器
5 years ago
BaiJiangJie 75a2b9eac2
Merge pull request #3636 from jumpserver/dev_perms
5 years ago
Bai 2fc68ca6f1 [Update] 授权的 RemoteApp/DatabaseApp 进行去重
5 years ago
BaiJiangJie 56a156b717
Merge pull request #3634 from jumpserver/dev_req
5 years ago
Bai 7c59134635 [Update] 修改依赖
5 years ago
BaiJiangJie f98f0e2c06
Merge pull request #3632 from jumpserver/dev_i18n
5 years ago