7199 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
ibuler	ce84d51d88	Merge branch 'dev' of github.com:jumpserver/lina into dev	2020-06-02 20:33:59 +08:00
ibuler	70d4f6a71f	fix: 修复组织如果不对的问题，feat: 添加 submitting button	2020-06-02 20:29:51 +08:00
OrangeM21	ca2db6de4a	[fix]修复路径引用问题	2020-06-02 20:18:32 +08:00
OrangeM21	d99a322a50	[fix]修复路径引用问题	2020-06-02 20:03:23 +08:00
OrangeM21	0f88038f78	Merge branch 'dev' of https://github.com/jumpserver/lina into dev	2020-06-02 18:40:40 +08:00
OrangeM21	3fc3bdf612	[fix]修复Xpack收集用户功能有右键菜单	2020-06-02 18:40:22 +08:00
xinwen	4c7d785d4d	[Fix] 收集用户任务列表页不跳转详情页	2020-06-02 18:27:25 +08:00
OrangeM21	a7de450f36	[fix]系统用户和管理用户的Actions	2020-06-02 18:02:53 +08:00
OrangeM21	931c8be8a7	[fix]修改创建系统用户组件翻译传值	2020-06-02 16:49:40 +08:00
ibuler	2ec7f4eceb	feat: auto date search添加boolean的搜索	2020-06-02 16:41:51 +08:00
OrangeM21	0d71d02c60	Merge remote-tracking branch 'origin/dev' into dev	2020-06-02 16:23:14 +08:00
OrangeM21	5c84c55c46	[fix]修改组件样式,更新时可以传值	2020-06-02 16:22:48 +08:00
ibuler	c4c64c1e90	merge: with dev	2020-06-02 16:13:29 +08:00
ibuler	1c0cab434d	feat: 修改datetime picker增加最近一天	2020-06-02 16:10:34 +08:00
xinwen	ed51b9de1b	[Update] 日志审计 去掉 LeftAction	2020-06-02 15:57:10 +08:00
OrangeM21	e91b4a5828	Merge remote-tracking branch 'origin/dev' into dev	2020-06-02 15:47:03 +08:00
OrangeM21	548e436a12	[fix]修复英文路由翻译	2020-06-02 15:46:35 +08:00
xinwen	7e3d64f05c	[Update] 日志审计 添加时间过滤	2020-06-02 15:37:25 +08:00
OrangeM21	e34ad81674	[fix]修复打开新窗口问题2	2020-06-02 15:17:53 +08:00
ibuler	11170a3c91	fix: 修复xpack中云管name无法跳转	2020-06-02 15:15:49 +08:00
OrangeM21	46bfe8d966	[fix]修复打开新窗口问题	2020-06-02 15:11:19 +08:00
ibuler	dc12e90e57	feat: 修改系统用户创建的一些问题	2020-06-02 15:03:06 +08:00
OrangeM21	619260b79d	[fix]上传密钥应该和密码一起隐藏	2020-06-02 15:01:34 +08:00
OrangeM21	68849d4462	Merge remote-tracking branch 'origin/dev' into dev ... # Conflicts: # src/layout/components/NavBar/Logo.vue	2020-06-02 14:57:40 +08:00
ibuler	9c0a5e6a6c	Merge branch 'dev' of github.com:jumpserver/lina into dev	2020-06-02 14:52:53 +08:00
ibuler	1daadcaba0	fix: 简单修改系统用户创建	2020-06-02 14:50:34 +08:00
OrangeM21	f9edef3ff0	[fix]修复版本logo错误	2020-06-02 14:22:25 +08:00
xinwen	3fce5ae165	[Update] 日志审计 调整字段宽度	2020-06-02 14:17:19 +08:00
ibuler	c9d026b564	fix: 修复cleanDateStr 中使用replaceAll的bug	2020-06-02 14:16:42 +08:00
ibuler	d8b8b796d7	feat: processResult => transformOption	2020-06-02 14:03:15 +08:00
ibuler	defd199567	feat: tag search添加快捷操作	2020-06-02 12:07:58 +08:00
ibuler	974288455a	Merge branch 'dev' of github.com:jumpserver/lina into dev	2020-06-02 11:39:20 +08:00
ibuler	69ceea5fc6	feat: 优化 400请求的提示，优化tagsearch	2020-06-02 11:38:51 +08:00
OrangeM21	d7645a6820	[fix]增加资产批量激活和批量删除按钮,溢出资产其他页面的批量操作按钮	2020-06-02 11:14:14 +08:00
ibuler	8d688ee2df	feat: 优化 loginlog，和tag search	2020-06-02 10:52:48 +08:00
OrangeM21	e571a1af75	[fix]	2020-06-02 02:53:25 +08:00
Orange	fa1e7da539	Merge pull request #78 from jumpserver/orange_fix_tree_build_error ... Orange fix tree build error	2020-06-02 02:24:58 +08:00
OrangeM21	b554d0e333	Merge remote-tracking branch 'origin/orange_fix_tree_build_error' into orange_fix_tree_build_error	2020-06-02 02:22:21 +08:00
OrangeM21	eea802a7f3	[fix]	2020-06-02 02:21:53 +08:00
OrangeM21	c9fa9f3193	[fix]	2020-06-02 02:20:39 +08:00
OrangeM21	cc83b3ab2f	[fix]	2020-06-02 02:16:47 +08:00
OrangeM21	f577e46328	[fix]测试BASE_API	2020-06-02 02:09:24 +08:00
OrangeM21	53d0da6a5f	Merge remote-tracking branch 'origin/dev' into dev	2020-06-02 02:02:37 +08:00
OrangeM21	9f0e4e903e	[fix]修复创建资产tree组件异常	2020-06-02 01:50:52 +08:00
ibuler	698c7dc354	fix: 修复message的对齐	2020-06-01 20:11:06 +08:00
ibuler	df645eaeff	fix: 修复asset select组件的bug	2020-06-01 19:33:27 +08:00
OrangeM21	931a18e3ad	[fix]修复创建资产组件异常	2020-06-01 18:05:36 +08:00
OrangeM21	76cee647fc	Merge remote-tracking branch 'origin/dev' into dev	2020-06-01 18:01:16 +08:00
OrangeM21	2ed9dfff2c	[fix]修复创建资产组件异常	2020-06-01 18:00:40 +08:00
Bai	9bceca03c9	[Update] 修改env.development LOGOUT_PATH	2020-06-01 17:48:34 +08:00