6986 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
ibuler	bdd270c56c	feat: 修改组件detailcard	2020-06-05 12:02:58 +08:00
ibuler	d99bc2fea6	Merge branch 'dev' of github.com:jumpserver/lina into dev	2020-06-05 11:27:01 +08:00
ibuler	8e0de184af	feat: 修改xpack的布局	2020-06-05 11:26:04 +08:00
xinwen	f1add55ee0	[Fix] Xpack-云管中心-添加阿里云账户后创建同步阿里云实例的任务失败-地域选项列表为空白	2020-06-05 11:10:29 +08:00
ibuler	8c74d52dab	feat: 修改xpack中的收集用户和云管中心	2020-06-05 11:07:13 +08:00
ibuler	02a8325b70	Merge branch 'dev' of github.com:jumpserver/lina into dev	2020-06-05 10:37:29 +08:00
ibuler	201b8e5a37	feat: 修改资产用户列表	2020-06-05 10:36:27 +08:00
Bai	d9016a4dcf	[Update] 修改 route 位置，vault / cloud	2020-06-04 21:02:44 +08:00
BaiJiangJie	cb50595d9d	Merge pull request #83 from jumpserver/dev_vault ... Dev vault	2020-06-04 20:54:44 +08:00
OrangeM21	8dc72bcd57	Merge remote-tracking branch 'origin/dev' into dev	2020-06-04 20:53:26 +08:00
OrangeM21	dae2450274	[fix]修复Tree Error	2020-06-04 20:53:08 +08:00
Bai	01e00cca73	[Update] 添加密码匣子创建页面	2020-06-04 20:53:06 +08:00
xinwen	2e25d4c91f	[Fix] 系统设置/邮件设置 测试链接 错误信息	2020-06-04 20:42:14 +08:00
ibuler	a8f87eeab7	Merge branch 'dev' of github.com:jumpserver/lina into dev	2020-06-04 20:41:06 +08:00
ibuler	6f0292354c	feat: 修改ztree中menu样式	2020-06-04 20:40:40 +08:00
Bai	c89eca737f	[Update] 添加密码匣子列表页	2020-06-04 20:28:35 +08:00
xinwen	0ac4a22e88	[Fix] 系统设置/邮件设置 测试连接提示	2020-06-04 20:24:09 +08:00
OrangeM21	83e6b9d3c6	Merge remote-tracking branch 'origin/dev' into dev	2020-06-04 20:23:10 +08:00
OrangeM21	0ad44b2802	[fix]修改资产详情	2020-06-04 20:22:45 +08:00
ibuler	f3dd64499b	Merge branch 'dev' of github.com:jumpserver/lina into dev	2020-06-04 20:22:37 +08:00
ibuler	56053f791b	feat: 修改资产的一部分bug	2020-06-04 20:22:25 +08:00
ibuler	25700b197b	feat: 修改命令批量执行的审计	2020-06-04 19:50:53 +08:00
Bai	2beb4b89da	Merge branch 'dev' of github.com:jumpserver/lina into dev	2020-06-04 18:32:39 +08:00
Bai	a38f179acb	[Update] 更新用户首次登录页面	2020-06-04 18:32:23 +08:00
Eric	8268862b52	add dialogDetailformatter	2020-06-04 17:58:10 +08:00
xinwen	da70f1cba7	[Fix] Xpack/组织管理	2020-06-04 17:33:15 +08:00
xinwen	a6ed8333f4	[Fix] Xpack/收集用户	2020-06-04 17:33:02 +08:00
ibuler	7cf2aca5da	feat：删掉cloudcenter, 添加vault	2020-06-04 17:15:01 +08:00
ibuler	8d5be17507	feat: 修改support地址	2020-06-04 17:10:39 +08:00
ibuler	552d45c970	Merge branch 'dev' of github.com:jumpserver/lina into dev	2020-06-04 17:07:24 +08:00
ibuler	d3120ed361	feat: 修改xpack和audits部分	2020-06-04 17:07:00 +08:00
Bai	2604d933dd	Merge branch 'dev' of github.com:jumpserver/lina into dev	2020-06-04 16:19:26 +08:00
Bai	eb60843192	[Update] 修改改密计划资产页面2	2020-06-04 16:19:02 +08:00
ibuler	a0e1baf4fa	Merge branch 'dev' of github.com:jumpserver/lina into dev	2020-06-04 16:00:21 +08:00
Bai	2350e12699	Merge branch 'dev' of github.com:jumpserver/lina into dev	2020-06-04 15:56:08 +08:00
Bai	aebc4856ee	[Update] 修改改密计划资产页面	2020-06-04 15:55:52 +08:00
ibuler	154d118949	feat: 优化鉴权	2020-06-04 15:36:53 +08:00
Eric	f09e34a02f	add terminal en cn	2020-06-04 15:33:45 +08:00
Eric	9d87be8744	add task monitor	2020-06-04 15:10:11 +08:00
ibuler	ff39a2a19a	merge	2020-06-04 14:57:18 +08:00
ibuler	1760d43c9e	feat: 修改权限和路由的计算方法	2020-06-04 14:55:07 +08:00
OrangeM21	6f93349c29	[fix]更新右键菜单样式 更新资产列表Dialog	2020-06-04 14:08:06 +08:00
OrangeM21	2034f54f5b	[fix]修复资产列表没有Actions的问题	2020-06-04 13:26:29 +08:00
OrangeM21	0d489b8973	[fix]修复资产列表没有Actions的问题	2020-06-04 13:21:26 +08:00
OrangeM21	4f1e37022a	[fix]修复SSHkey下载失败问题	2020-06-04 12:14:50 +08:00
OrangeM21	59480a2136	[fix]修改提示样式	2020-06-04 12:03:32 +08:00
OrangeM21	889dfa4f17	[fix]修改Tree移动节点的提示信息	2020-06-04 11:48:34 +08:00
OrangeM21	ea8ab91e59	[fix]修复可连接性测试问题	2020-06-04 11:41:54 +08:00
OrangeM21	96fff777b4	[fix]修复登录打开白屏的问题	2020-06-04 11:14:12 +08:00
ibuler	1ed6925549	Merge branch 'dev' of github.com:jumpserver/lina into dev	2020-06-03 21:10:23 +08:00