6986 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
ibuler	1d14aa8f75	Merge branch 'dev' of github.com:jumpserver/lina into dev	2020-06-16 15:19:36 +08:00
ibuler	efaa116605	feat: 修改detail	2020-06-16 15:19:13 +08:00
OrangeM21	537d945485	Merge remote-tracking branch 'origin/dev' into dev	2020-06-16 15:11:31 +08:00
ibuler	a5f5833d7c	Merge branch 'dev' of github.com:jumpserver/lina into dev	2020-06-16 15:06:02 +08:00
ibuler	9d0562e11a	fix: 修改资产标签	2020-06-16 15:05:45 +08:00
Bai	32ef10d6c8	Merge branch 'dev' of github.com:jumpserver/lina into dev	2020-06-16 14:58:59 +08:00
Bai	a5c70be7cb	[Update] 在线会话加入按钮判断是否禁用	2020-06-16 14:58:42 +08:00
ibuler	ca8c06fc9b	feat: 资产添加label搜索	2020-06-16 14:58:40 +08:00
ibuler	345a962aac	fix: 修改同步实例任务中的时间显示，feat: 完成执行同步实例大人物	2020-06-16 14:32:42 +08:00
OrangeM21	98991af6ef	[fix]修复Tree右键删除2条提示的问题	2020-06-16 14:32:16 +08:00
ibuler	afc7f75ef1	fix: 修复acount list	2020-06-16 14:18:25 +08:00
ibuler	79d11a64ed	feat: 优化会话管理	2020-06-16 14:04:23 +08:00
ibuler	cf62fdc629	Merge branch 'dev' of github.com:jumpserver/lina into dev	2020-06-16 13:48:37 +08:00
ibuler	5df1355b5f	feat: 修改session命令	2020-06-16 13:48:05 +08:00
Eric	fa60c3a169	fix ingore request error	2020-06-16 13:37:31 +08:00
ibuler	c73bb3f9c7	merge: with dev	2020-06-16 12:24:47 +08:00
Bai	2e7dfb8571	Merge branch 'dev' of github.com:jumpserver/lina into dev	2020-06-16 11:57:55 +08:00
Bai	8dc62dc6bb	[Update] 修改远程应用授权详情用户、远程应用页面table和card问题	2020-06-16 11:57:35 +08:00
xinwen	bfddc20a16	[Update] 更改作业中心/任务列表 卡片	2020-06-16 11:33:11 +08:00
Eric	b92d47e5ad	fix remove user i18n msg	2020-06-16 11:28:08 +08:00
ibuler	8e6a797d70	fix: 修复userpassword comp不能实时校验的问题	2020-06-16 11:21:20 +08:00
Bai	bb4fe97053	[Update] 数据库授权详情用户页table添加搜索框	2020-06-16 11:07:22 +08:00
Bai	8ebd0b4807	[Update] 修改数据库授权详情用户、数据库页面table和card问题	2020-06-16 11:04:17 +08:00
ibuler	dc8939e0da	feat: 添加密码组件	2020-06-16 10:49:43 +08:00
Bai	ab974d5967	[Update] 资产授权详情用户、资产页面table添加搜索框	2020-06-16 10:47:00 +08:00
Bai	1afbdf6bd4	[Update] 会话列表添加index，可进入详情页面	2020-06-15 20:48:19 +08:00
OrangeM21	5512ce6b5c	[fix]新窗口打开命令记录日志界面	2020-06-15 20:36:12 +08:00
OrangeM21	e5827116d2	Revert "[fix]新窗口打开命令记录日志界面" ... This reverts commit ebfb12b6	2020-06-15 20:32:17 +08:00
OrangeM21	1a8316c573	Merge remote-tracking branch 'origin/dev' into dev ... # Conflicts: # src/views/audits/CommandExecutionList.vue	2020-06-15 20:29:59 +08:00
OrangeM21	ebfb12b614	[fix]新窗口打开命令记录日志界面	2020-06-15 20:29:32 +08:00
Bai	05822276b1	Merge branch 'dev' of github.com:jumpserver/lina into dev	2020-06-15 20:20:53 +08:00
Bai	180efed420	[Update] 修改批量命令日志查看结果打开新页面	2020-06-15 20:20:28 +08:00
Eric	c8949f7f73	fix 用户列表 移除所选	2020-06-15 20:18:51 +08:00
Bai	ee662e316c	Merge branch 'dev' of github.com:jumpserver/lina into dev	2020-06-15 20:17:13 +08:00
OrangeM21	33499f030e	[fix]修复Xpack bugs	2020-06-15 20:06:14 +08:00
OrangeM21	bf1b829310	Merge remote-tracking branch 'origin/dev' into dev	2020-06-15 19:47:52 +08:00
OrangeM21	81b858cd31	[fix]新窗口打开命令记录日志界面	2020-06-15 19:47:42 +08:00
Bai	fda44265d8	Merge branch 'dev' of github.com:jumpserver/lina into dev	2020-06-15 19:43:37 +08:00
xinwen	5835b41c94	[Update] 完善 作业中心/任务列表	2020-06-15 19:40:17 +08:00
OrangeM21	75fd314ad6	[fix]去掉多余的Border	2020-06-15 19:32:35 +08:00
OrangeM21	a4d2d98f04	Merge remote-tracking branch 'origin/dev' into dev	2020-06-15 18:32:41 +08:00
OrangeM21	87f85e572c	[fix]修复平台列表默认系统平台的详情页中的删除和更新按钮	2020-06-15 18:32:31 +08:00
ibuler	9eed960846	Merge branch 'dev' of github.com:jumpserver/lina into dev	2020-06-15 18:32:21 +08:00
ibuler	894bdb708e	feat: 修改资产授权里的action树	2020-06-15 18:32:01 +08:00
Eric	c53df877e4	fix 增加更新提示信息	2020-06-15 18:28:45 +08:00
OrangeM21	e1d5d676ab	[fix]修复激活按钮405错误	2020-06-15 18:18:32 +08:00
OrangeM21	eca763a79f	Merge remote-tracking branch 'origin/dev' into dev	2020-06-15 18:14:46 +08:00
OrangeM21	93fa4ae28b	[fix]修复MFA error提示	2020-06-15 17:59:49 +08:00
OrangeM21	07772398b9	[fix]修复MFA error提示	2020-06-15 17:50:47 +08:00
Bai	144bfeb527	Merge branch 'dev' of github.com:jumpserver/lina into dev	2020-06-15 17:47:10 +08:00