-
- Downloads
Merge branch 'develop' into 'feature/install-switch-frontends'
# Conflicts: # CHANGELOG.md
Showing
- CHANGELOG.md 4 additions, 1 deletionCHANGELOG.md
- build/webpack.dev.conf.js 7 additions, 2 deletionsbuild/webpack.dev.conf.js
- src/lang/en.js 13 additions, 7 deletionssrc/lang/en.js
- src/lang/es.js 0 additions, 5 deletionssrc/lang/es.js
- src/lang/oc.js 0 additions, 5 deletionssrc/lang/oc.js
- src/lang/zh.js 0 additions, 5 deletionssrc/lang/zh.js
- src/router/index.js 1 addition, 1 deletionsrc/router/index.js
- src/styles/index.scss 0 additions, 29 deletionssrc/styles/index.scss
- src/utils/clipboard.js 1 addition, 1 deletionsrc/utils/clipboard.js
- src/utils/request.js 17 additions, 12 deletionssrc/utils/request.js
- src/views/charts/keyboard.vue 0 additions, 23 deletionssrc/views/charts/keyboard.vue
- src/views/charts/line.vue 0 additions, 23 deletionssrc/views/charts/line.vue
- src/views/charts/mixChart.vue 0 additions, 23 deletionssrc/views/charts/mixChart.vue
- src/views/clipboard/index.vue 0 additions, 45 deletionssrc/views/clipboard/index.vue
- src/views/dashboard/admin/components/BarChart.vue 0 additions, 106 deletionssrc/views/dashboard/admin/components/BarChart.vue
- src/views/dashboard/admin/components/BoxCard.vue 0 additions, 118 deletionssrc/views/dashboard/admin/components/BoxCard.vue
- src/views/dashboard/admin/components/LineChart.vue 0 additions, 156 deletionssrc/views/dashboard/admin/components/LineChart.vue
- src/views/dashboard/admin/components/PanelGroup.vue 0 additions, 138 deletionssrc/views/dashboard/admin/components/PanelGroup.vue
- src/views/dashboard/admin/components/PieChart.vue 0 additions, 84 deletionssrc/views/dashboard/admin/components/PieChart.vue
- src/views/dashboard/admin/components/RaddarChart.vue 0 additions, 120 deletionssrc/views/dashboard/admin/components/RaddarChart.vue
Loading
Please register or sign in to comment