zyh
|
83566bf8ef
|
Merge branch 'dev-3.7' of git.mesalab.cn:nezha/nezha-fronted into dev-3.8
|
2023-07-10 11:16:44 +08:00 |
|
zyh
|
9c96ab84e9
|
NEZ-2970 fix：asset comments调整大小后 底部弹窗样式错误
|
2023-07-10 11:15:55 +08:00 |
|
zyh
|
9a0f24f521
|
Merge branch 'dev-3.7' of git.mesalab.cn:nezha/nezha-fronted into dev-3.8
|
2023-07-06 17:58:45 +08:00 |
|
zyh
|
47b860d51d
|
Merge branch 'dev-3.6' of git.mesalab.cn:nezha/nezha-fronted into dev-3.7
|
2023-07-06 17:57:44 +08:00 |
|
zyh
|
da649d407d
|
fix：修复dashboard变量name重复时 修改其中一个name 另一个校验未消失
|
2023-07-06 17:53:40 +08:00 |
|
zhangyu
|
794a9502c1
|
Merge branch 'dev-3.7' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.8
|
2023-07-06 17:11:11 +08:00 |
|
zhangyu
|
7819cec20d
|
Merge branch 'dev-3.6' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.7
rel-23.04.06
|
2023-07-06 17:10:46 +08:00 |
|
zhangyu
|
ca2a4dc5e4
|
NEZ-2969 fix：登录成功后，依然跳转到了 setup 页面
|
2023-07-06 17:07:46 +08:00 |
|
zhangyu
|
1dd57d730b
|
Merge branch 'dev-3.7' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.8
|
2023-07-04 17:10:58 +08:00 |
|
zhangyu
|
ae3461d2d6
|
style： 修复 aseet Comments input不显示下边框的问题
rel-23.04.05
|
2023-07-04 17:09:28 +08:00 |
|
zhangyu
|
d5f3d70b46
|
Merge branch 'dev-3.8' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.8
|
2023-07-03 16:18:07 +08:00 |
|
zyh
|
a0f90796f2
|
NEZ-2962 fix：explore页面部分国际化修改
|
2023-07-03 16:16:55 +08:00 |
|
zhangyu
|
9922b71dda
|
Merge branch 'dev-3.7' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.8
|
2023-07-03 14:36:30 +08:00 |
|
zhangyu
|
df5458154e
|
fix： Comments输入框 设置最小高度
|
2023-07-03 14:35:54 +08:00 |
|
zhangyu
|
d8a421ac36
|
NEZ-2959 fix：建议编辑Comments时用户可自动拖拽输入框大小
|
2023-07-03 14:35:27 +08:00 |
|
zhangyu
|
e937b24b4c
|
NEZ-2943 fix：Silences-Alert页面，删除告警报错，Request method 'DELETE' not supported
rel-23.04.04
|
2023-06-29 17:20:03 +08:00 |
|
zhangyu
|
27beb95fbd
|
Merge branch 'dev-3.7' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.8
|
2023-06-29 16:33:43 +08:00 |
|
zhangyu
|
3c8904f224
|
NEZ-2951 fix：修复clock 不加载的问题
|
2023-06-29 16:31:49 +08:00 |
|
zyh
|
2ae5342870
|
Merge branch 'dev-3.7' of git.mesalab.cn:nezha/nezha-fronted into dev-3.8
|
2023-06-29 14:23:16 +08:00 |
|
zyh
|
4c8b42544f
|
Merge branch 'dev-3.7' of git.mesalab.cn:nezha/nezha-fronted into dev-3.7
|
2023-06-29 14:22:34 +08:00 |
|
zyh
|
9bb1b1aba2
|
NEZ-2948 fix：Endpoints弹窗选择资产表头未国际化
|
2023-06-29 14:22:20 +08:00 |
|
zhangyu
|
ed9dea68ab
|
Merge branch 'dev-3.7' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.8
|
2023-06-29 14:18:58 +08:00 |
|
zhangyu
|
6757b0da7c
|
fix：中文下Users模块Name与详情下Name不一致
|
2023-06-29 14:18:12 +08:00 |
|
zhangyu
|
e44e4042b7
|
Merge branch 'dev-3.7' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.8
|
2023-06-29 10:02:41 +08:00 |
|
zhangyu
|
daa35d5df1
|
NEZ-2945 fix：查看告警详情时开启同比后下方选项被遮挡
|
2023-06-29 10:01:07 +08:00 |
|
zhangyu
|
7c6875b9c9
|
Merge branch 'dev-3.7' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.8
|
2023-06-28 17:09:47 +08:00 |
|
zhangyu
|
49ba836760
|
NEZ-2944 fix：Project拓扑图点击非下拉框位置时，下拉框被展开
|
2023-06-28 17:07:46 +08:00 |
|
zhangyu
|
0cf64684b7
|
Merge branch 'dev-3.7' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.8
|
2023-06-28 16:28:58 +08:00 |
|
zhangyu
|
7e73403dc5
|
NEZ-2942 fix：告警静默-告警页面，ID和确认查询条件未生效
|
2023-06-28 16:28:20 +08:00 |
|
zhangyu
|
1e4f6aca7a
|
Merge branch 'dev-3.7' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.8
|
2023-06-28 15:58:24 +08:00 |
|
zhangyu
|
7fb5ec2c1f
|
fix：修改 meta删除后表格不刷新的问题
|
2023-06-28 15:57:01 +08:00 |
|
zhangyu
|
b3bc6f69e7
|
Merge branch 'dev-3.7' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.8
|
2023-06-28 15:11:39 +08:00 |
|
zhangyu
|
4ea9b5411d
|
NEZ-2941 fix：Users模块Web terminal log搜索记录中State未显示实际值
|
2023-06-28 15:10:03 +08:00 |
|
zhangyu
|
c0880530d9
|
NEZ-2941 fix：Users模块Web terminal log搜索记录中State未显示实际值
|
2023-06-28 15:09:10 +08:00 |
|
zhangyu
|
54913c21bf
|
Merge branch 'dev-3.7' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.8
|
2023-06-28 14:45:34 +08:00 |
|
zhangyu
|
f45b563144
|
NEZ-2939 style：拓扑图Thumbnail 添加主题
|
2023-06-28 14:44:59 +08:00 |
|
zhangyu
|
5920005710
|
Merge branch 'dev-3.6' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.7
|
2023-06-28 14:36:36 +08:00 |
|
zhangyu
|
f80f0dc3c9
|
Merge branch 'dev-3.5' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.6
|
2023-06-28 14:35:06 +08:00 |
|
zhangyu
|
5c36266eea
|
NEZ-2940 fix：Users模块重置2FA按钮缺少图标
|
2023-06-28 14:32:26 +08:00 |
|
zhangyu
|
b619aedc0d
|
Merge branch 'dev-3.7' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.8
|
2023-06-28 10:05:37 +08:00 |
|
zhangyu
|
310a699471
|
NEZ-2933 fix：添加mac地址的正则表达式
|
2023-06-27 15:44:02 +08:00 |
|
zhangyu
|
48968749d4
|
Merge branch 'dev-3.7' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.8
|
2023-06-27 15:28:45 +08:00 |
|
zhangyu
|
cc591b79ce
|
Merge branch 'dev-3.7' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.7
|
2023-06-27 15:27:35 +08:00 |
|
zhangyu
|
844fc835e8
|
Merge branch 'dev-3.6' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.7
|
2023-06-27 15:27:21 +08:00 |
|
zhangyu
|
f502b7a74f
|
Merge branch 'dev-3.5' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.6
|
2023-06-27 15:25:04 +08:00 |
|
zhangyu
|
6a7db88f91
|
NEZ-2935 fix：告警规则页面，有效时间日期与新增时显示的不一致
|
2023-06-27 15:22:31 +08:00 |
|
zyh
|
aa9435b726
|
Merge branch 'dev-3.7' of git.mesalab.cn:nezha/nezha-fronted into dev-3.8
|
2023-06-27 15:19:37 +08:00 |
|
zyh
|
37ddf4acda
|
Merge branch 'dev-3.7' of git.mesalab.cn:nezha/nezha-fronted into dev-3.7
|
2023-06-27 15:15:48 +08:00 |
|
zyh
|
29c6580d32
|
NEZ-2929 fix：IPAM新建时Type下拉框靠后位置无法点击
|
2023-06-27 15:15:15 +08:00 |
|
zhangyu
|
3086e5e6c4
|
Merge branch 'dev-3.7' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.8
|
2023-06-27 14:45:38 +08:00 |
|