From 9946ec49f6ba8210dcf938b8d660ac0d4f29f67c Mon Sep 17 00:00:00 2001 From: Qiuxia Fan Date: Thu, 4 Mar 2021 08:14:12 +0800 Subject: [PATCH] Sync uI and update license (#6478) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: 吴晟 Wu Sheng Co-authored-by: Zhenxu Ke --- .github/actions/skip/action.yml | 1 + CHANGES.md | 1 + dist-material/release-docs/LICENSE | 7 ++++--- skywalking-ui | 2 +- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.github/actions/skip/action.yml b/.github/actions/skip/action.yml index 91779305a..7ed03e424 100644 --- a/.github/actions/skip/action.yml +++ b/.github/actions/skip/action.yml @@ -33,6 +33,7 @@ inputs: ".licenserc.yaml" "docs/menu.yml" ".github/actions/skip/action.yml" + "dist-material/release-docs" runs: using: "composite" steps: diff --git a/CHANGES.md b/CHANGES.md index 2ced45fcb..15c07603f 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -48,6 +48,7 @@ Release Notes. * Fix trace id by clear search conditions. * Search endpoints with keywords. * Fix pageSize on logs page. +* Update echarts version to 5.0.2. #### Documentation * Polish documentation due to we have covered all tracing, logging, and metrics fields. diff --git a/dist-material/release-docs/LICENSE b/dist-material/release-docs/LICENSE index 4b6dcc286..d41a486d4 100755 --- a/dist-material/release-docs/LICENSE +++ b/dist-material/release-docs/LICENSE @@ -452,11 +452,12 @@ vue-datepicker-local 1.0.19: https://github.com/weifeiyue/vue-datepicker-local M vue-js-modal 1.3.31: https://github.com/euvl/vue-js-modal MIT lodash 4.17.15: https://github.com/lodash/lodash MIT gson-fire 1.8.4: https://mvnrepository.com/artifact/io.gsonfire/gson-fire MIT +vue-i18n 8.10.0: https://github.com/kazupon/vue-i18n MIT ======================================== Apache 2.0 licenses ======================================== -echarts 4.1.0: https://github.com/apache/incubator-echarts Apache-2.0 +echarts 5.0.2: https://github.com/apache/echarts Apache-2.0 Material Icons 3.0.1 https://github.com/google/material-design-icons Apache-2.0 groovy 3.0.3 https://github.com/apache/groovy Apache-2.0 @@ -498,8 +499,8 @@ d3-tip 0.9.1: https://github.com/Caged/d3-tip BSD-3-Clause d3-transition 1.1.3: https://github.com/d3/d3-transition BSD-3-Clause d3-voronoi 1.1.4: https://github.com/d3/d3-voronoi BSD-3-Clause d3-zoom 1.7.3: https://github.com/d3/d3-zoom BSD-3-Clause -zrender 4.0.4: https://github.com/ecomfe/zrender BSD-3-Clause -vue-i18n 8.10.0: https://github.com/kazupon/vue-i18n MIT +zrender 5.0.4: https://github.com/ecomfe/zrender BSD-3-Clause +tslib 2.0.3 https://www.npmjs.com/package/tslib BSD Zero Clause ======================================== Public Domain licenses diff --git a/skywalking-ui b/skywalking-ui index febdd527c..24339b466 160000 --- a/skywalking-ui +++ b/skywalking-ui @@ -1 +1 @@ -Subproject commit febdd527c97855d2da9548b17f21d74d5668d6b1 +Subproject commit 24339b46655e99c146cc75fe0b23bf1ba7370512