From f9cf17be24304bdf4afef423cbb0d5e4925f668f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=B4=E6=99=9F=20Wu=20Sheng?= Date: Mon, 13 Jan 2020 21:19:23 +0800 Subject: [PATCH] UI Sync & remove elementui license (#4227) * Sync UI. * Remove elementui LICENSE --- dist-material/release-docs/LICENSE | 2 +- .../licenses/ui-licenses/LICENSE-elementui | 22 ------------------- skywalking-ui | 2 +- 3 files changed, 2 insertions(+), 24 deletions(-) delete mode 100644 dist-material/release-docs/licenses/ui-licenses/LICENSE-elementui diff --git a/dist-material/release-docs/LICENSE b/dist-material/release-docs/LICENSE index 8f0044ae5..103234af0 100755 --- a/dist-material/release-docs/LICENSE +++ b/dist-material/release-docs/LICENSE @@ -424,13 +424,13 @@ popper.js 1.14.7: https://github.com/FezVrasta/popper.js MIT vue-datepicker-local 1.0.19: https://github.com/weifeiyue/vue-datepicker-local MIT vue-js-modal 1.3.31: https://github.com/euvl/vue-js-modal MIT lodash 4.17.15: https://github.com/lodash/lodash MIT -elementui 2.12: https://github.com/ElemeFE/element ======================================== Apache 2.0 licenses ======================================== echarts 4.1.0: https://github.com/apache/incubator-echarts Apache-2.0 Material Icons 3.0.1 https://github.com/google/material-design-icons Apache-2.0 + ======================================== BSD licenses ======================================== diff --git a/dist-material/release-docs/licenses/ui-licenses/LICENSE-elementui b/dist-material/release-docs/licenses/ui-licenses/LICENSE-elementui deleted file mode 100644 index b84501fd7..000000000 --- a/dist-material/release-docs/licenses/ui-licenses/LICENSE-elementui +++ /dev/null @@ -1,22 +0,0 @@ -The MIT License (MIT) - -Copyright (c) 2016-present ElemeFE - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. -© 2019 GitHub, Inc. \ No newline at end of file diff --git a/skywalking-ui b/skywalking-ui index 90984a70d..825b39dc6 160000 --- a/skywalking-ui +++ b/skywalking-ui @@ -1 +1 @@ -Subproject commit 90984a70d602094eedcd027318df6e27639c8f9a +Subproject commit 825b39dc62da4fcdb1f5fdaf969b1a14ea5b8910