github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity
3,239 Commits
72 Branches
250 Tags
115 MiB
Commit Graph

1131 Commits (ac238aa36e37513523ec00f7266189addb50c023)

Author SHA1 Message Date
BaiJiangJie ac238aa36e [Update] 修改用户登录失败限制次数，3->7 (#1586) 
* [Update] 修改用户登录失败限制次数，3->7

* [Update] 修改用户登录失败限制次数，3->7 - 续
 2018-07-25 04:51:09 -05:00
ibuler e41add6126 Merge remote-tracking branch 'github/dev' into dev 2018-07-25 10:23:18 +08:00
ibuler f4c31d8e86 [Update] 修改权限判断 2018-07-25 10:22:32 +08:00
ibuler 28e8f204ec Merge remote-tracking branch 'github/dev' into dev 2018-07-24 16:41:17 +08:00
ibuler 80f147cf13 [Update] 修改settings 2018-07-24 16:40:41 +08:00
BaiJiangJie 83f220d7de [Feature] 添加命令记录下载功能 (#1559) 
* [Feature] 添加命令记录下载功能

* [Update] 文案修改，导出记录、提交，取消全部命令导出

* [Update] 命令导出，修复时间问题
 2018-07-19 05:36:52 -05:00
wojiushixiaobai e1fff18ce3 替换淘宝IP查询接口 2018-07-19 14:14:58 +08:00
ibuler c94d018d7e [Bugfix] 修复转义引起的中文乱码问题 2018-07-18 15:31:14 +08:00
ibuler ce1fc0f3e2 [Bugfix] 修复授权列表引起的分页bug 2018-07-18 15:26:58 +08:00
ibuler c215278978 [Bugfix] 修复授权列表引起的分页bug 2018-07-18 15:24:58 +08:00
老广 2cb5876d1a
Merge branch 'master' into dev 2018-07-17 04:25:37 -05:00
ibuler 8883e0090f [Update] 更改版本号 2018-07-17 17:12:28 +08:00
ibuler ff3f74abe6 [Update] 修改api 2018-07-17 12:06:47 +08:00
老广 1a49cf4d9c
Merge pull request #1532 from wojiushixiaobai/dev 
[Update]修改url地址
 2018-07-16 22:24:09 -05:00
BaiJiangJie 09e636495e [Update] 模版删除unblock的id属性 2018-07-16 12:22:32 +08:00
BaiJiangJie 812078331e [Update] 添加解除用户登录限制功能 2018-07-16 12:13:13 +08:00
wojiushixiaobai 696589a3cf 修改url 2018-07-16 12:13:06 +08:00
BaiJiangJie 1182313c1a [Update] 取消系统用户-清除认证信息，取消-网关rdp协议认证信息，添加用户unblock功能 2018-07-13 19:30:48 +08:00
wstart fd3df81a64
Update api.py 2018-07-10 17:03:31 +08:00
ycfuck 72517a2c72 授权页面分页 
授权页面分页
 2018-07-10 16:33:28 +08:00
ibuler 01185a2d07 [Update] 添加gateway api 2018-07-10 16:03:05 +08:00
ibuler 8bfd2be21f [Update] 清除系统用户认证信息时提示 2018-07-10 15:50:15 +08:00
老广 b03ac46df9
Merge pull request #1456 from wojiushixiaobai/dev 
[Update]修改提示文字
 2018-07-10 02:35:26 -05:00
老广 df95c93bb1
Merge pull request #1503 from jumpserver/update_loginlog 
[Update] 记录用户登录失败日志，限制用户登录失败次数
 2018-07-10 02:31:39 -05:00
ycfuck eaefb5c669 Revert "资产授权页面增加分页" 
This reverts commit 0ddb9476ba.
 2018-07-09 16:00:02 +08:00
林峰任1049851 0ddb9476ba 资产授权页面增加分页 
资产授权页面增加分页
 2018-07-09 15:55:07 +08:00
ibuler 75a9deebdd Merge remote-tracking branch 'github/dev' into dev 2018-07-08 13:03:43 +08:00
ibuler b6cd4a20c5 [Bugfix] Data table xss attack 2018-07-08 13:02:43 +08:00
BaiJiangJie 435acafccd [Update] 在线会话，历史会话显示登录来源 Web/SSH Terminal 2018-07-06 13:22:20 +08:00
BaiJiangJie 86e4bc5e9a Merge branch 'dev' of github.com:jumpserver/jumpserver into github_dev 2018-07-06 10:57:42 +08:00
ibuler 315609bc45 Merge remote-tracking branch 'github/dev' into dev 2018-07-06 10:35:31 +08:00
ibuler 814e6a7df8 [Update] 修改sshpass 引号引入密码，特殊字符处理 2018-07-06 10:34:16 +08:00
BaiJiangJie 5d800fa629 [Update] 修改coco端登录限制次数逻辑 2018-07-05 17:07:03 +08:00
BaiJiangJie bd14266abd [Update] 修改登录日志模型类的MFA字段默认状态为- 2018-07-05 16:45:05 +08:00
BaiJiangJie 88f36c6f02 Merge branch 'dev' of github.com:jumpserver/jumpserver into github_dev 2018-07-05 16:23:48 +08:00
BaiJiangJie 512fc8f8f0 [Update] 优化登录失败次数限制的逻辑，并添加系统安全设置选项 2018-07-05 16:23:33 +08:00
ibuler 37bb344166 [Bugfix] 修复网关端口不对的问题 2018-07-05 10:58:52 +08:00
ibuler f8c2a445f7 [Bugfix] 修改gateway port 2018-07-05 10:26:16 +08:00
BaiJiangJie ff9b1a887f [Update] 添加用户登录失败次数限制 2018-07-04 16:55:11 +08:00
BaiJiangJie 43370c547a [Update] 登录日志逻辑修改变量名 2018-07-04 10:57:37 +08:00
BaiJiangJie 2eda58eadd Merge branch 'dev' of github.com:jumpserver/jumpserver into github_dev 2018-07-03 17:48:22 +08:00
BaiJiangJie e1be867913 [Update] 更新用户登录日志，记录登录失败日志并添加MFA启用状态信息 2018-07-03 17:47:12 +08:00
ibuler 01afcf701c Merge remote-tracking branch 'origin/dev' into dev 2018-07-03 13:24:07 +08:00
ibuler 4002289974 [Bugfix] 修复详情中删除时的bug 2018-07-03 13:23:21 +08:00
ibuler ef9e03c7ed Merge remote-tracking branch 'github/dev' into dev 2018-07-02 12:11:45 +08:00
BaiJiangJie 3993797527 Merge branch 'dev' of github.com:jumpserver/jumpserver into github_dev 2018-06-29 15:00:15 +08:00
BaiJiangJie f1f06491d6 [Feature] 添加功能, 支持 telnet server. 2018-06-29 14:59:43 +08:00
ibuler eb95a0a912 [Bugfix] 修改下载录像没有目录的bug 2018-06-27 10:34:16 +08:00
ibuler 0a2ff83ca1 Merge remote-tracking branch 'origin/dev' into dev 2018-06-26 22:14:21 +08:00
ibuler 7276bd0b2a [Update] 更新获取session log的方法，以后统一到media/replay中 2018-06-26 22:13:39 +08:00