5787 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
ibuler	fd5f562cbf	[Update] stash it	2018-07-18 12:57:08 +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	790652ff4d	[Update] 修改协议小问题	2018-07-17 17:09:36 +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
ibuler	4d1da56872	[Update] 修改asset api	2018-07-16 14:47:06 +08: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
ibuler	3e17e94245	[Update] 修改资产	2018-07-15 18:39:11 +08:00
ibuler	5648dcd7e7	[Update] 修改用户view	2018-07-15 00:55:05 +08:00
ibuler	28e47f33c1	[Update] 修改一些逻辑	2018-07-14 00:47:21 +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
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