Commit Graph

1707 Commits

Author SHA1 Message Date
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
Bai
4c00790a22 [Update] 修改授权规则创建初始化开始日期值 2020-06-12 10:55:18 +08:00
xinwen
71e27fe8a0 [Fix] 作业中心/任务详情/ 最后运行成功/失败 主机 2020-06-12 10:54:51 +08:00
ibuler
d6ce8a6ff6 Merge branch 'dev' of github.com:jumpserver/lina into dev 2020-06-11 20:49:54 +08:00
ibuler
9a3e9b16b2 fix: 修改user group users tranform option 2020-06-11 20:49:28 +08:00
Eric
f4b89f3ce4 add moment.js 2020-06-11 20:40:09 +08:00
xinwen
d7e4cb4200 [Update] 应用管理/远程应用 i18n 2020-06-11 20:30:42 +08:00
xinwen
8391d10aec [Update] src/views/applications/RemoteApp/const.js 2020-06-11 20:30:42 +08:00
Bai
316480e02d Merge branch 'dev' of github.com:jumpserver/lina into dev 2020-06-11 20:21:11 +08:00
Bai
361eb5e0ac [Update] 修改云管中心创建表单页面 2020-06-11 20:20:57 +08:00
Eric
21598aa464 router link 2020-06-11 20:07:11 +08:00
Bai
7a579df138 Merge branch 'dev' of github.com:jumpserver/lina into dev 2020-06-11 19:46:23 +08:00
Bai
33fadfbc88 [Update] 修改用户详情字段顺序 2020-06-11 19:45:46 +08:00
OrangeM21
89ffb38ae4 Merge remote-tracking branch 'origin/dev' into dev 2020-06-11 19:32:41 +08:00
OrangeM21
1400a0f8e3 [fix]资产详情增加添加资产的组件 2020-06-11 19:31:28 +08:00
BaiJiangJie
70eee87d1c
Merge pull request #96 from jumpserver/dev_bulk
Dev bulk
2020-06-11 19:27:53 +08:00
Bai
9b24bbb114 [Update] Merge to dev 2020-06-11 19:27:24 +08:00
Eric
36c7c50fbf remove msg 2020-06-11 19:24:59 +08:00
Bai
f5696ac07a [Update] 修改翻译 2020-06-11 19:24:58 +08:00
Bai
29e804e5e6 [Update] 过滤批量更新表单提交字段 2020-06-11 19:17:16 +08:00
ibuler
19f9bde148 merge: with dev 2020-06-11 19:02:25 +08:00
ibuler
1f4e24b681 feat: merge 2020-06-11 18:51:15 +08:00
ibuler
9b5c3884e0 feat: 修改翻译 2020-06-11 18:49:59 +08:00
BaiJiangJie
b5a8854611
Merge pull request #95 from jumpserver/dev_bulkUpdate
Dev bulk update
2020-06-11 18:49:26 +08:00
Bai
b3b9ff8c82 [Update] 修改批量更新表单样式 2020-06-11 18:44:25 +08:00
Bai
0054abe706 [Update] 资产列表更新bulkUpdate 2020-06-11 18:32:36 +08:00
ibuler
45f21c7abe fix: 修改翻译 2020-06-11 18:30:22 +08:00
OrangeM21
13953df74e Merge remote-tracking branch 'origin/dev' into dev 2020-06-11 18:29:53 +08:00
OrangeM21
c4dc28314b [fix]给Tag增加默认值 2020-06-11 18:29:33 +08:00
Bai
80f4149de1 [Update] 批量更新表单添加fields选择 2020-06-11 18:27:23 +08:00