Commit Graph

6986 Commits

Author SHA1 Message Date
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
ibuler
70f58ce509 fix: 修改详情中的提示 2020-06-12 13:39:54 +08:00
Bai
e8b262db30 Merge branch 'dev' of github.com:jumpserver/lina into dev 2020-06-12 13:24:51 +08:00
Eric
9803208d22 fix getRoute 2020-06-12 12:43:16 +08:00
Bai
8bd99c145d [Update] 修改标签创建页面 2020-06-12 11:44:31 +08:00
xinwen
b3dd892797 [Fix] 作业中心/任务详情 最后成功失败主机 2020-06-12 11:40:39 +08:00
Bai
7d5a86b0a3 Merge branch 'dev' of github.com:jumpserver/lina into dev 2020-06-12 11:34:43 +08:00
Bai
a3aa808468 [Update] 修改平台列表路由高亮 2020-06-12 11:32:39 +08:00
Eric
a2f81e457e formater router-link 2020-06-12 11:18:49 +08:00
ibuler
21a70dd55b Merge branch 'dev' of github.com:jumpserver/lina into dev 2020-06-12 11:06:37 +08:00
OrangeM21
fcf8d2cb9d [fix]资产详情增加上边距 2020-06-12 11:05:03 +08:00
ibuler
2796f32df9 feat: 去掉console.log 2020-06-12 11:04:37 +08:00
Bai
0ca3363fcc [Update] 修改翻译 2020-06-12 11:00:02 +08:00
Bai
cd7dfdf8af Merge branch 'dev' of github.com:jumpserver/lina into dev 2020-06-12 10:55:40 +08:00