Commit Graph

3383 Commits (78936bf9f2c29d113b6b31d7072778e288d20a75)
 

Author SHA1 Message Date
老广 722bf786f1
Merge pull request #1542 from jumpserver/dev
6 years ago
老广 2cb5876d1a
Merge branch 'master' into dev
6 years ago
ibuler 8883e0090f [Update] 更改版本号
6 years ago
ibuler 790652ff4d [Update] 修改协议小问题
6 years ago
ibuler ff3f74abe6 [Update] 修改api
6 years ago
老广 1a49cf4d9c
Merge pull request #1532 from wojiushixiaobai/dev
6 years ago
ibuler 4d1da56872 [Update] 修改asset api
6 years ago
老广 ff9e109a2c
Merge pull request #1533 from jumpserver/update_unblockuser
6 years ago
BaiJiangJie 09e636495e [Update] 模版删除unblock的id属性
6 years ago
BaiJiangJie 14076d8fe1 Merge branch 'dev' of github.com:jumpserver/jumpserver into github_dev
6 years ago
BaiJiangJie 812078331e [Update] 添加解除用户登录限制功能
6 years ago
wojiushixiaobai 696589a3cf 修改url
6 years ago
wojiushixiaobai 7eba46b303 Merge branch 'dev' of https://github.com/jumpserver/jumpserver into dev
6 years ago
wojiushixiaobai 5d63d2369f 合并冲突解决
6 years ago
ibuler 3e17e94245 [Update] 修改资产
6 years ago
ibuler 5648dcd7e7 [Update] 修改用户view
6 years ago
ibuler 28e47f33c1 [Update] 修改一些逻辑
6 years ago
老广 91b3b7ce69
Merge pull request #1515 from wstart/master
6 years ago
老广 8c587a1376
Merge pull request #1523 from wojiushixiaobai/dev
6 years ago
BaiJiangJie 1182313c1a [Update] 取消系统用户-清除认证信息,取消-网关rdp协议认证信息,添加用户unblock功能
6 years ago
ibuler 7412bdcba7 [Update] 完成基本框架
6 years ago
ibuler d6ec92d82d [Update] 修改url
6 years ago
ibuler ad3214641d [Update] 添加org
6 years ago
wojiushixiaobai 9004351ad1 修正字符串
6 years ago
wojiushixiaobai d3e22a2a90 修改url地址
6 years ago
wstart fd3df81a64
Update api.py
6 years ago
ycfuck 72517a2c72 授权页面分页
6 years ago
ibuler 01185a2d07 [Update] 添加gateway api
6 years ago
ibuler 8bfd2be21f [Update] 清除系统用户认证信息时提示
6 years ago
老广 b03ac46df9
Merge pull request #1456 from wojiushixiaobai/dev
6 years ago
老广 76be054fcb
Merge pull request #1502 from Nevss/patch-1
6 years ago
老广 df95c93bb1
Merge pull request #1503 from jumpserver/update_loginlog
6 years ago
ycfuck eaefb5c669 Revert "资产授权页面增加分页"
6 years ago
林峰任1049851 0ddb9476ba 资产授权页面增加分页
6 years ago
ibuler 75a9deebdd Merge remote-tracking branch 'github/dev' into dev
6 years ago
ibuler b6cd4a20c5 [Bugfix] Data table xss attack
6 years ago
BaiJiangJie 435acafccd [Update] 在线会话,历史会话显示登录来源 Web/SSH Terminal
6 years ago
BaiJiangJie 86e4bc5e9a Merge branch 'dev' of github.com:jumpserver/jumpserver into github_dev
6 years ago
ibuler 315609bc45 Merge remote-tracking branch 'github/dev' into dev
6 years ago
ibuler 814e6a7df8 [Update] 修改sshpass 引号引入密码,特殊字符处理
6 years ago
Nevss 7a7c6d40df
update docker-guacamole version to latest
6 years ago
BaiJiangJie 5d800fa629 [Update] 修改coco端登录限制次数逻辑
6 years ago
BaiJiangJie bd14266abd [Update] 修改登录日志模型类的MFA字段默认状态为-
6 years ago
BaiJiangJie 88f36c6f02 Merge branch 'dev' of github.com:jumpserver/jumpserver into github_dev
6 years ago
BaiJiangJie 512fc8f8f0 [Update] 优化登录失败次数限制的逻辑,并添加系统安全设置选项
6 years ago
ibuler 37bb344166 [Bugfix] 修复网关端口不对的问题
6 years ago
ibuler f8c2a445f7 [Bugfix] 修改gateway port
6 years ago
BaiJiangJie ff9b1a887f [Update] 添加用户登录失败次数限制
6 years ago
BaiJiangJie 43370c547a [Update] 登录日志逻辑修改变量名
6 years ago
BaiJiangJie 2eda58eadd Merge branch 'dev' of github.com:jumpserver/jumpserver into github_dev
6 years ago