6986 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
OrangeM21	749c57eec1	Merge remote-tracking branch 'origin/master'	2020-05-21 15:37:36 +08:00
OrangeM21	56a5ca9ce0	[fix]	2020-05-21 15:34:30 +08:00
Eric	35d9954978	Merge branch 'master' of https://github.com/jumpserver/lina	2020-05-21 15:30:24 +08:00
Eric	253be38771	[Update] update license view	2020-05-21 15:29:53 +08:00
jym503558564	62221f9cce	Merge branch 'master' of https://github.com/jumpserver/lina	2020-05-21 15:25:12 +08:00
OrangeM21	5fdb1c05db	[fix]修翻译Bug	2020-05-21 15:25:02 +08:00
jym503558564	2d6792e197	[Update] 更新如果org的page，则getApiPath不取xpack路径	2020-05-21 15:24:30 +08:00
Eric	d0a1369b20	[Update] License detail view	2020-05-21 15:15:48 +08:00
OrangeM21	32d2d4bbff	[fix]修翻译Bug	2020-05-21 14:46:11 +08:00
OrangeM21	c8f1f2f566	[fix]修资产bug	2020-05-21 14:41:25 +08:00
jym503558564	c821ef7e64	[Update] 修改翻译	2020-05-21 14:16:48 +08:00
jym503558564	bf73eeaf12	[Update] 初步实现组织管理Page	2020-05-21 12:03:51 +08:00
jym503558564	0c33c7cd59	[Update] 初步实现组织管理Page	2020-05-21 11:59:33 +08:00
OrangeM21	284c8a7155	Merge remote-tracking branch 'origin/master'	2020-05-21 11:40:59 +08:00
OrangeM21	cbe8d5d7db	[fix]用户界面隐藏组织	2020-05-21 11:40:47 +08:00
ibuler	66c25c7ab2	Merge branch 'master' of github.com:jumpserver/lina	2020-05-21 11:28:24 +08:00
ibuler	714313c22c	Merge branch 'master' of github.com:jumpserver/lina	2020-05-21 11:28:11 +08:00
ibuler	b107726479	[Update] dashboard基本完成	2020-05-21 11:26:34 +08:00
OrangeM21	ede9a8fb3f	[fix]修改Ztree被覆盖的样式	2020-05-21 11:11:51 +08:00
OrangeM21	69af831ac8	Merge remote-tracking branch 'origin/master'	2020-05-21 11:08:40 +08:00
OrangeM21	b7d301bb33	[update]添加用户按钮	2020-05-21 11:07:12 +08:00
xinwen	97f4f4dc8d	[Update] gather user task page add helpTips	2020-05-21 10:49:43 +08:00
ibuler	10ac35771b	Merge branch 'master' of github.com:jumpserver/lina	2020-05-20 21:00:50 +08:00
ibuler	a47f8d1974	[Update] 修改top 10	2020-05-20 21:00:14 +08:00
OrangeM21	f8b246a77c	Merge remote-tracking branch 'origin/master'	2020-05-20 20:16:17 +08:00
OrangeM21	59a39d77ec	[update]添加用户页面资产	2020-05-20 20:15:41 +08:00
ibuler	ed98028fff	[Merge]	2020-05-20 19:40:50 +08:00
ibuler	f535ae04d2	[Update] 基本完成dashboard metric	2020-05-20 19:39:12 +08:00
xinwen	bfb454957b	[Update] 更改一些 i18n 配置	2020-05-20 18:53:22 +08:00
OrangeM21	b1969f1f11	[fix]	2020-05-20 18:21:17 +08:00
OrangeM21	d90b01923b	Merge remote-tracking branch 'origin/master'	2020-05-20 17:29:48 +08:00
OrangeM21	2bfd6f2045	[update]完善用户界面	2020-05-20 17:29:00 +08:00
Eric_Lee	049db348c6	[Update] interface view (#55)	2020-05-20 17:25:25 +08:00
xinwen	b895af5cfe	[Add] gathered user task	2020-05-20 16:41:22 +08:00
ibuler	81edbe46e4	[Update] 完成dashboard metric后台对接	2020-05-20 15:43:15 +08:00
ibuler	b8825f10f1	[Update] 修改echarts	2020-05-20 14:30:39 +08:00
ibuler	8c46abbd64	[Update] 重命名 TimeLine => Timeline	2020-05-20 14:02:09 +08:00
ibuler	45d1ce2d96	[Update] 完成组件timeline card	2020-05-20 13:59:59 +08:00
jym503558564	54fe95f938	[Update] 修改任务详情页中的RunInfoCard	2020-05-20 12:03:19 +08:00
ibuler	6385a1929d	[Update] Merge it	2020-05-19 21:08:50 +08:00
ibuler	13a1082c79	[Update] 修改dashboard	2020-05-19 21:03:03 +08:00
ibuler	7610da3be4	[Update] 使用vue echats	2020-05-19 20:58:39 +08:00
OrangeM21	4176ae458c	Merge remote-tracking branch 'origin/master'	2020-05-19 20:58:12 +08:00
OrangeM21	2bb61ff726	[upate]更新用户界面	2020-05-19 20:57:56 +08:00
xinwen	7d89ea686f	[Add] GatherUser page	2020-05-19 20:49:58 +08:00
OrangeM21	10d4f1f04a	[upate]更新用户界面	2020-05-19 20:10:07 +08:00
ibuler	88050a06a1	[Update] 去掉submodule	2020-05-19 20:04:05 +08:00
ibuler	03450c05ed	[Update] 添加dashboard	2020-05-19 19:57:26 +08:00
Eric	f1c68e494b	xpack views	2020-05-19 19:02:13 +08:00
Eric	ac2ca3bfd5	remove submodule	2020-05-19 19:00:51 +08:00