From 96d3c1e5dd338ae74e02b5798fecd7f8b5f75d4f Mon Sep 17 00:00:00 2001 From: Fine0830 Date: Tue, 7 Sep 2021 09:19:23 +0800 Subject: [PATCH] Sync UI (#7667) --- CHANGES.md | 1 + dist-material/release-docs/LICENSE | 1 + .../ui-licenses/LICENSE-monaco-editor | 21 +++++++++++++++++++ skywalking-ui | 2 +- 4 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 dist-material/release-docs/licenses/ui-licenses/LICENSE-monaco-editor diff --git a/CHANGES.md b/CHANGES.md index a3df2985e4..eaa0f2d72c 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -65,6 +65,7 @@ Release Notes. * Add Python falcon icon on the UI. * Fix searching endpoints with keywords. * Support clicking the service name in the chart to link to the trace or log page. +* Implement the Log Analysis Language text regexp debugger. #### Documentation diff --git a/dist-material/release-docs/LICENSE b/dist-material/release-docs/LICENSE index e510bfb46d..da5aa84a6f 100755 --- a/dist-material/release-docs/LICENSE +++ b/dist-material/release-docs/LICENSE @@ -427,6 +427,7 @@ 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.5: https://mvnrepository.com/artifact/io.gsonfire/gson-fire MIT vue-i18n 8.10.0: https://github.com/kazupon/vue-i18n MIT +monaco-editor 0.27.0: https://github.com/microsoft/monaco-editor MIT ======================================== Apache 2.0 licenses diff --git a/dist-material/release-docs/licenses/ui-licenses/LICENSE-monaco-editor b/dist-material/release-docs/licenses/ui-licenses/LICENSE-monaco-editor new file mode 100644 index 0000000000..b65dd9e62e --- /dev/null +++ b/dist-material/release-docs/licenses/ui-licenses/LICENSE-monaco-editor @@ -0,0 +1,21 @@ +The MIT License (MIT) + +Copyright (c) 2013-present, Yuxi (Evan) You + +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. diff --git a/skywalking-ui b/skywalking-ui index 774b69dd84..1091bdaf45 160000 --- a/skywalking-ui +++ b/skywalking-ui @@ -1 +1 @@ -Subproject commit 774b69dd84e305be975e4c5ffc0d433aa8cbda32 +Subproject commit 1091bdaf45b2823c31ee42da0928cbf6a0c494f9 -- GitLab