github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity
3,251 Commits
64 Branches
246 Tags
105 MiB
Commit Graph

3251 Commits (dded4e10fb6a62be83486f1d90f3b8a57cf2a363)

Author SHA1 Message Date
老广 dded4e10fb
Merge pull request #1599 from jumpserver/dev 
Dev
 2018-07-26 21:45:32 -05:00
ibuler 8386f107c6 Merge remote-tracking branch 'github/dev' into dev 2018-07-26 19:32:23 +08:00
ibuler 5ce3dd4079 [Update] 添加unblock user脚本 2018-07-26 19:30:37 +08:00
BaiJiangJie d649aacfd6 [Update] asset platform 取消*required (#1595) 2018-07-26 05:25:14 -05:00
ibuler 7e65e44a3c [Update] 兼容guacamole手动模式上传system user是uuid 2018-07-26 18:12:25 +08:00
ibuler 74c3f12275 [Update] 添加脚本，将windows协议改为rdp 2018-07-26 14:37:10 +08:00
BaiJiangJie ac238aa36e [Update] 修改用户登录失败限制次数，3->7 (#1586) 
* [Update] 修改用户登录失败限制次数，3->7

* [Update] 修改用户登录失败限制次数，3->7 - 续
 2018-07-25 04:51:09 -05:00
老广 16b23a37fe
增加命令导出 (#1566) 
* [Update] gunicorn不使用eventlet

* [Update] 添加eventlet

* 替换淘宝IP查询接口

* [Feature] 添加命令记录下载功能 (#1559)

* [Feature] 添加命令记录下载功能

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

* [Update] 命令导出，修复时间问题

* [Update] paramiko => 2.4.1

* [Update] 修改settings

* [Update] 修改权限判断
 2018-07-24 22:09:58 -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
ibuler 1c56ba5a11 [Update] paramiko => 2.4.1 2018-07-20 18:48:57 +08:00
ibuler cd797b18fb Merge remote-tracking branch 'github/dev' into dev 2018-07-20 11:10:51 +08:00
BaiJiangJie 83f220d7de [Feature] 添加命令记录下载功能 (#1559) 
* [Feature] 添加命令记录下载功能

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

* [Update] 命令导出，修复时间问题
 2018-07-19 05:36:52 -05:00
老广 8e42a65736
Merge pull request #1560 from wojiushixiaobai/dev 
[Update]替换淘宝IP查询接口
 2018-07-19 05:03:59 -05:00
wojiushixiaobai e1fff18ce3 替换淘宝IP查询接口 2018-07-19 14:14:58 +08:00
ibuler 3052744203 [Update] 添加eventlet 2018-07-18 19:17:20 +08:00
ibuler 7924b094f8 [Update] gunicorn不使用eventlet 2018-07-18 16:15:35 +08:00
老广 3d34b06203
Merge pull request #1551 from jumpserver/dev 
[Bugfix] 修复转义引起的中文乱码问题
 2018-07-18 02:33:33 -05:00
ibuler c94d018d7e [Bugfix] 修复转义引起的中文乱码问题 2018-07-18 15:31:14 +08:00
老广 53086a8977
Merge pull request #1550 from jumpserver/dev 
Dev
 2018-07-18 02:28:13 -05: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
老广 061963a316
Merge pull request #1549 from jumpserver/revert-1515-master 
Revert "授权页面分页问题"
 2018-07-18 01:56:18 -05:00
老广 97b240cfdd
Revert "授权页面分页问题" 2018-07-18 14:55:16 +08:00
老广 722bf786f1
Merge pull request #1542 from jumpserver/dev 
Dev to master
 2018-07-17 04:26:37 -05: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
老广 ff9e109a2c
Merge pull request #1533 from jumpserver/update_unblockuser 
[Update] 取消系统用户-清除认证信息，取消-网关rdp协议认证信息，添加解除用户登录限制功能
 2018-07-16 01:42:30 -05:00
BaiJiangJie 09e636495e [Update] 模版删除unblock的id属性 2018-07-16 12:22:32 +08:00
BaiJiangJie 14076d8fe1 Merge branch 'dev' of github.com:jumpserver/jumpserver into github_dev 2018-07-16 12:13:59 +08:00
BaiJiangJie 812078331e [Update] 添加解除用户登录限制功能 2018-07-16 12:13:13 +08:00
wojiushixiaobai 696589a3cf 修改url 2018-07-16 12:13:06 +08:00
wojiushixiaobai 7eba46b303 Merge branch 'dev' of https://github.com/jumpserver/jumpserver into dev 2018-07-16 11:01:49 +08:00
wojiushixiaobai 5d63d2369f 合并冲突解决 2018-07-16 11:01:06 +08:00
老广 91b3b7ce69
Merge pull request #1515 from wstart/master 
授权页面分页问题
 2018-07-13 08:22:34 -05:00
老广 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
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