1707 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
jym503558564	2df8077a58	Merge branch 'master' of https://github.com/jumpserver/lina	2020-05-21 18:55:01 +08:00
jym503558564	52da322254	[Update] 修改任务详情组件	2020-05-21 18:54:44 +08:00
Eric	0a24debd32	Merge branch 'master' of https://github.com/jumpserver/lina	2020-05-21 18:41:05 +08:00
Eric	2ad3dda895	[Update] xpack i18n en	2020-05-21 18:40:39 +08:00
BaiJiangJie	516eb86151	Merge pull request #56 from jumpserver/cap ... [Update] 添加改密计划模块路由和目录结构	2020-05-21 18:37:43 +08:00
Eric	dc9dcd766b	[Update] i18n msg	2020-05-21 18:30:58 +08:00
OrangeM21	063863b5f5	Merge remote-tracking branch 'origin/master'	2020-05-21 18:17:35 +08:00
OrangeM21	9cfce136d1	[fix]添加上传私钥组件,修复翻译bug	2020-05-21 18:17:19 +08:00
Bai	b3b66b7d5b	[Update] 添加改密计划模块路由和目录结构	2020-05-21 18:11:51 +08:00
jym503558564	158aecbc3a	Merge branch 'master' of https://github.com/jumpserver/lina	2020-05-21 17:38:44 +08:00
jym503558564	aaa1ba329e	[Update] 修改任务详情组件	2020-05-21 17:38:23 +08:00
Eric	53e449a7d7	Merge branch 'master' of https://github.com/jumpserver/lina	2020-05-21 17:03:59 +08:00
Eric	fd0625cb2a	[Update] update quickActions	2020-05-21 17:03:32 +08:00
jym503558564	b0e21d9e5d	Merge branch 'master' of https://github.com/jumpserver/lina	2020-05-21 16:37:27 +08:00
jym503558564	9caa75b365	[Update] 修改组织管理详情的relationcard	2020-05-21 16:37:09 +08:00
Eric	7516fa2e59	update interface view i18n	2020-05-21 16:33:43 +08:00
OrangeM21	54f09e5406	[fix]更新权限控制	2020-05-21 16:28:43 +08:00
ibuler	3d6c259214	Merge branch 'master' of github.com:jumpserver/lina	2020-05-21 16:18:53 +08:00
ibuler	d43a30932e	[Update] 优化一些问题	2020-05-21 16:18:28 +08:00
jym503558564	ac016e1782	Merge branch 'master' of https://github.com/jumpserver/lina	2020-05-21 15:40:19 +08:00
jym503558564	17366886df	[Update] 组织列表页面只显示名称和备注，删掉多余的fields	2020-05-21 15:40:02 +08:00
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