This repository has been archived on 2025-09-14. You can view files and clone it, but cannot push or open issues or pull requests.

chenjinsong 7581b30f2c Merge remote-tracking branch 'origin/dev-3.1' into dev-3.2 ...

# Conflicts:
#	nezha-fronted/src/assets/css/common/rightBoxCommon.scss
#	nezha-fronted/src/assets/css/components/common/project/topology.scss
#	nezha-fronted/src/components/common/bottomBox/tabs/chartTempPreview.vue
#	nezha-fronted/src/components/common/bottomBox/tabs/panelTabNew.vue
#	nezha-fronted/src/components/common/bottomBox/tabs/terminalLogCMDTab.vue
#	nezha-fronted/src/components/common/bottomBox/tabs/terminalLogRecordTab.vue
#	nezha-fronted/src/components/common/bottomBox/tabs/terminalLogTab.vue
#	nezha-fronted/src/components/common/popBox/selectPanel.vue
#	nezha-fronted/src/components/common/project/popData/Info.vue
#	nezha-fronted/src/components/common/project/topologyL5.vue
#	nezha-fronted/src/components/common/rightBox/alertRuleBox.vue
#	nezha-fronted/src/components/common/rightBox/setting/globalizationBox.vue
#	nezha-fronted/src/components/page/config/changePin.vue
#	nezha-fronted/src/components/page/dashboard/explore/editor.vue
#	nezha-fronted/src/components/page/dashboard/metricPreview.vue
#	nezha-fronted/src/components/page/dashboard/panel.vue
#	nezha-fronted/src/permission.js
#	nezha-fronted/src/store/user.js

2021-11-29 16:19:13 +08:00

..

subBox.vue

Merge remote-tracking branch 'origin/dev-3.1' into dev-3.2

2021-11-29 16:19:13 +08:00

trafficSettingBox.vue

style: 主题颜色调整

2021-11-17 11:12:06 +08:00

trafficSettingTab.vue

Merge remote-tracking branch 'origin/dev-3.1' into dev-3.1.1_theme

2021-11-01 18:24:01 +08:00