github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity
3,365 Commits
70 Branches
249 Tags
114 MiB
Commit Graph

3365 Commits (41e7f45c20180c2659339a0d628a118a5a3a821a)

Author SHA1 Message Date
老广 8c587a1376
Merge pull request #1523 from wojiushixiaobai/dev 
[Update]修改url地址
 2018-07-13 08:19:40 -05:00
BaiJiangJie 1182313c1a [Update] 取消系统用户-清除认证信息，取消-网关rdp协议认证信息，添加用户unblock功能 2018-07-13 19:30:48 +08:00
ibuler 7412bdcba7 [Update] 完成基本框架 2018-07-13 15:05:46 +08:00
ibuler d6ec92d82d [Update] 修改url 2018-07-13 00:31:50 +08:00
ibuler ad3214641d [Update] 添加org 2018-07-13 00:00:35 +08:00
wojiushixiaobai 9004351ad1 修正字符串 2018-07-12 16:47:35 +08:00
wojiushixiaobai d3e22a2a90 修改url地址 2018-07-12 10:53:39 +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
老广 76be054fcb
Merge pull request #1502 from Nevss/patch-1 
update docker-guacamole version  to latest
 2018-07-10 02:32:06 -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
Nevss 7a7c6d40df
update docker-guacamole version to latest 
update docker-guacamole version  to latest
 2018-07-05 19:08:35 +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
老广 442d4e727a
Merge pull request #1492 from jumpserver/feature_telnet 
[Feature] 添加功能，支持 telnet server.
 2018-07-01 22:23:20 -05: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 401a7f88a8 [Update] 更新依赖storage的版本 2018-06-26 22:27: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
wojiushixiaobai 2950613b69 修改提示文字 2018-06-20 15:58:01 +08:00
老广 6fa0562d7a
Merge pull request #1441 from chnliyong/master 
python-gssapi libkrb5-dev for gssapi/gssapi.h
 2018-06-18 21:25:15 -05:00
老广 ef22d33afa
Merge pull request #1161 from Nidhoggur1993/dev 
更新make_migrations.sh的migration逻辑
 2018-06-13 21:53:23 -05:00
老广 86404db6c7
Merge pull request #1414 from leostudio/dev 
[fixed #1404]新增Redis DB配置
 2018-06-13 21:51:53 -05:00
老广 fdf2807d9b
Merge pull request #1419 from jumpserver/feature_login_mode 
[Update] 添加功能，系统用户选择登录模式(自动/手动登录)
 2018-06-13 21:25:00 -05:00
BaiJiangJie 2e6d238c76 [Bugfix] 修复系统用户选择手动登录，ssh命令行连接获取不到login_mode字段值 2018-06-11 19:09:24 +08:00
BaiJiangJie f5a4370b80 [Update] 系统用户选择手动登录，取消自动推送 2018-06-11 17:56:20 +08:00