7199 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
ibuler	1ad59070f2	Merge branch 'dev' of github.com:jumpserver/lina into dev	2020-06-15 17:46:12 +08:00
Bai	ae7952d6e3	Merge branch 'dev' of github.com:jumpserver/lina into dev	2020-06-15 17:41:43 +08:00
Eric	4bd48d7bb7	fix ticket detail assignee display	2020-06-15 17:27:31 +08:00
Bai	ca34ef5ac9	Merge branch 'dev' of github.com:jumpserver/lina into dev	2020-06-15 17:08:11 +08:00
ibuler	eef282b66a	Merge branch 'dev' of github.com:jumpserver/lina into dev	2020-06-15 17:02:29 +08:00
ibuler	5334892af3	fix: 修复session detail中打开链接失败的bug	2020-06-15 17:01:54 +08:00
OrangeM21	a0ca717aa2	[fix]修复创建Tree的错误提示	2020-06-15 16:31:15 +08:00
Bai	bf79d40c00	[Update] 资产详情，无关联标签时显示无	2020-06-15 15:51:50 +08:00
OrangeM21	89a6c778aa	Merge remote-tracking branch 'origin/dev' into dev	2020-06-15 15:37:42 +08:00
OrangeM21	581d23a3f2	[fix]去掉多余提醒	2020-06-15 15:37:09 +08:00
Bai	1c08dca60c	[Update] 修改云管帐号创建字段required属性	2020-06-15 15:23:07 +08:00
Bai	a43c3e560c	Merge branch 'dev' of github.com:jumpserver/lina into dev	2020-06-15 14:57:41 +08:00
Bai	0c7abd5af6	[Update] 批量改密计划资产页面添加删除按钮	2020-06-15 14:57:23 +08:00
Eric	dc0040a1cc	fix 收集用户表单问题	2020-06-15 14:11:29 +08:00
OrangeM21	37fd0a9459	Merge remote-tracking branch 'origin/dev' into dev	2020-06-15 13:55:07 +08:00
ibuler	9eb92a8402	feat: 修改同步实例form	2020-06-15 13:52:37 +08:00
OrangeM21	3baa932d3a	[fix]修复Tree右键菜单Error	2020-06-15 13:47:26 +08:00
ibuler	ac03897720	Merge branch 'dev' of github.com:jumpserver/lina into dev	2020-06-15 13:40:13 +08:00
Eric	7d06edc55a	Merge branch 'dev' of https://github.com/jumpserver/lina into dev	2020-06-15 13:27:07 +08:00
xinwen	188ad48824	[Fix] 资产管理/系统用户 详情	2020-06-15 13:26:38 +08:00
Eric	f773862fdc	fix session url	2020-06-15 13:26:10 +08:00
OrangeM21	8f6a14e17c	[fix]修复工单菜单位置	2020-06-15 10:49:16 +08:00
ibuler	4161ede4d3	Merge branch 'dev' of github.com:jumpserver/lina into dev	2020-06-15 10:20:49 +08:00
OrangeM21	fb98ce1217	Merge remote-tracking branch 'origin/dev' into dev	2020-06-14 12:38:19 +08:00
OrangeM21	5e0f3783d6	[update]添加企业版链接	2020-06-14 12:37:57 +08:00
Eric	13812bcafe	add router-link	2020-06-12 14:50:07 +08:00
ibuler	74777bdd4c	Merge branch 'dev' of github.com:jumpserver/lina into dev	2020-06-12 14:03:28 +08:00
Bai	ff1152c74c	[Update] 修改翻译	2020-06-12 14:03:17 +08:00
ibuler	7306bfe1df	fix: 修改title	2020-06-12 14:02:49 +08:00
xinwen	1b94b03d3f	[Update] 检查表单Title 和 activeMenu	2020-06-12 13:59:35 +08:00
OrangeM21	d789a2e0fc	[fix]隐藏资产列表导入按钮	2020-06-12 13:59:08 +08:00
ibuler	8c06e185e9	Merge branch 'dev' of github.com:jumpserver/lina into dev	2020-06-12 13:54:50 +08:00
ibuler	cb2546bc3f	feat: 修改select的css	2020-06-12 13:54:18 +08:00
OrangeM21	52fbc747db	Merge remote-tracking branch 'origin/dev' into dev	2020-06-12 13:49:19 +08:00
OrangeM21	cd754d5ce2	[fix]修复默认时间Error	2020-06-12 13:49:01 +08:00
ibuler	64cb063719	fix: 去掉一个console warn	2020-06-12 13:43:33 +08:00
ibuler	6b09bcbea1	Merge branch 'dev' of github.com:jumpserver/lina into dev	2020-06-12 13:42:58 +08:00