2269 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
OrangeM21	660e3a3b27	[fix]修复用户链接资产跳转问题	2020-06-10 14:43:28 +08:00
OrangeM21	80b67c6862	fix	2020-06-10 14:32:35 +08:00
OrangeM21	87dafbfdc2	添加Vault下载导入需要MFA确认	2020-06-10 14:30:55 +08:00
ibuler	dc35b2935d	Merge branch 'dev' of github.com:jumpserver/lina into dev	2020-06-10 13:58:49 +08:00
ibuler	3da44667bd	feat: 修改命令过滤	2020-06-10 13:56:59 +08:00
ibuler	a54cbec098	feat: 修改command filter	2020-06-10 13:20:29 +08:00
OrangeM21	1caa675b56	[fix]添加命令执行翻译	2020-06-10 12:01:20 +08:00
xinwen	e240afed02	[Update] xpack优化创建同步任务表单，左侧菜单也没有高亮	2020-06-10 11:32:57 +08:00
xinwen	6c681b7bdb	[Update] 作业中心/批量命令 i18n	2020-06-10 11:32:57 +08:00
Bai	9825d1937b	[Update] 创建授权规则添加默认开始日期	2020-06-10 11:10:50 +08:00
BaiJiangJie	2e0fd71945	Merge pull request #92 from jumpserver/dev_perms ... Dev perms	2020-06-10 10:41:41 +08:00
Bai	3a5469f4e5	[Update] 修改改密计划详情资产页AssetRelationCard组件	2020-06-09 20:55:12 +08:00
ibuler	9809728d78	Merge branch 'dev' of github.com:jumpserver/lina into dev	2020-06-09 20:54:56 +08:00
ibuler	85ba553866	feat: 修改路由	2020-06-09 20:54:26 +08:00
Bai	d8b42b24ac	[Update] 添加AssetRelationCard组件	2020-06-09 20:49:34 +08:00
Bai	de6c0e8cfc	[Update] 修改资产授权规则详情资产页面Relation	2020-06-09 20:43:07 +08:00
xinwen	d84fbb1858	[Update] 作业中心/任务列表/任务详情 最后运行成功或失败的主机	2020-06-09 20:24:05 +08:00
ibuler	fbba875cfa	feat: 修改ztree高度	2020-06-09 20:04:25 +08:00
ibuler	b8966748d6	feat: 修改asset select	2020-06-09 19:56:44 +08:00
Bai	2111380838	[Update] 修改资产授权规则详情资产页reloadTable	2020-06-09 19:27:04 +08:00
ibuler	4b4bb455d6	Merge branch 'dev' of github.com:jumpserver/lina into dev	2020-06-09 18:54:27 +08:00
Bai	6bfd5f4c4a	[Update] 修改资产授权规则详情用户页reloadTable	2020-06-09 18:52:08 +08:00
Eric	ce864c4f34	替换位置	2020-06-09 18:41:55 +08:00
ibuler	2f274edd2b	Merge branch 'dev' of github.com:jumpserver/lina into dev	2020-06-09 18:28:25 +08:00
ibuler	ed2c17bd4c	feat: ztree添加高度	2020-06-09 18:27:57 +08:00
Bai	cb29943e8b	[Update] 修改授权规则详情文案	2020-06-09 18:25:21 +08:00
ibuler	de12c20854	feat: 添加翻译	2020-06-09 18:19:30 +08:00
Bai	1a84cb9636	[Update] 修改资产授权规则is_valid字段	2020-06-09 18:17:39 +08:00
Bai	b3c591ab26	Merge branch 'dev' of github.com:jumpserver/lina into dev	2020-06-09 18:12:24 +08:00
Bai	747602e7bf	[Update] 创建/更新授权规则页面添加DateStart字段	2020-06-09 18:12:07 +08:00
OrangeM21	42d841f855	Merge remote-tracking branch 'origin/dev' into dev	2020-06-09 17:44:16 +08:00
OrangeM21	50268991f9	[fix]退出之后清除Cookie	2020-06-09 17:38:12 +08:00
ibuler	6d024f48cb	Merge branch 'dev' of github.com:jumpserver/lina into dev	2020-06-09 17:28:59 +08:00
ibuler	bc400913e2	fix: 解决select2作为component的问题	2020-06-09 17:27:39 +08:00
Bai	7f47e791d0	[Update] 修改资产列表TreeTableDialog资产树背景色	2020-06-09 17:27:07 +08:00
Bai	c462a7ecd6	[Update] 修改翻译	2020-06-09 17:11:36 +08:00
ibuler	220b54788a	feat: webpack 添加websocket代理	2020-06-09 17:07:52 +08:00
ibuler	a8034bb0bf	Merge branch 'dev' of github.com:jumpserver/lina into dev	2020-06-09 16:50:51 +08:00
BaiJiangJie	429e639612	Merge pull request #91 from jumpserver/dev_assetTreeRMenu ... Dev asset tree r menu	2020-06-09 16:49:56 +08:00
ibuler	40e118bb41	feat: 修改base api	2020-06-09 16:48:12 +08:00
Bai	38c0875a31	[Update] 完善AssetList rMenu	2020-06-09 16:46:29 +08:00
Eric	2f92e9284a	gateway name display	2020-06-09 16:34:18 +08:00
ibuler	cd4da8409b	Merge branch 'dev' of github.com:jumpserver/lina into dev	2020-06-09 16:14:22 +08:00
ibuler	2b9d682dd9	feat: 修改用户权限详情	2020-06-09 16:06:04 +08:00
OrangeM21	fb58557d93	Merge remote-tracking branch 'origin/dev' into dev	2020-06-09 16:05:46 +08:00
OrangeM21	abd679b98b	修复Logo显示的问题	2020-06-09 16:01:39 +08:00
Eric	184ee38aa8	Merge branch 'dev' of https://github.com/jumpserver/lina into dev	2020-06-09 16:00:29 +08:00
Eric	60fed3724e	fix user detail rules search keys	2020-06-09 16:00:01 +08:00
xinwen	4f4bc26b81	[Update] 登录复核 i18n	2020-06-09 15:59:34 +08:00
ibuler	058e11167d	feat: 修改用户默认创建为用户	2020-06-09 15:46:57 +08:00