You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@skywalking.apache.org by wu...@apache.org on 2023/05/03 01:15:16 UTC
[skywalking] branch master updated: Sync UI. (#10751)
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/skywalking.git
The following commit(s) were added to refs/heads/master by this push:
new 8453e00f14 Sync UI. (#10751)
8453e00f14 is described below
commit 8453e00f14e94e4a34d64b2cea5c57c153e04789
Author: 吴晟 Wu Sheng <wu...@foxmail.com>
AuthorDate: Wed May 3 09:15:09 2023 +0800
Sync UI. (#10751)
---
dist-material/release-docs/LICENSE | 9 ++++----
.../licenses/ui-licenses/LICENSE-escape-html | 24 ++++++++++++++++++++++
docs/en/changes/changes.md | 4 ++++
skywalking-ui | 2 +-
4 files changed, 34 insertions(+), 5 deletions(-)
diff --git a/dist-material/release-docs/LICENSE b/dist-material/release-docs/LICENSE
index 712305f0fa..77f64fdc7f 100644
--- a/dist-material/release-docs/LICENSE
+++ b/dist-material/release-docs/LICENSE
@@ -440,7 +440,7 @@ The text of each license is also included in licenses/LICENSE-[project].txt.
https://npmjs.com/package/@babel/parser/v/7.20.5 7.20.5 MIT
https://npmjs.com/package/@ctrl/tinycolor/v/3.5.0 3.5.0 MIT
https://npmjs.com/package/@egjs/hammerjs/v/2.0.17 2.0.17 MIT
- https://npmjs.com/package/@element-plus/icons-vue/v/0.2.7 0.2.7 MIT
+ https://npmjs.com/package/@element-plus/icons-vue/v/1.1.4 1.1.4 MIT
https://npmjs.com/package/@interactjs/actions/v/1.10.17 1.10.17 MIT
https://npmjs.com/package/@interactjs/auto-scroll/v/1.10.17 1.10.17 MIT
https://npmjs.com/package/@interactjs/auto-start/v/1.10.17 1.10.17 MIT
@@ -490,11 +490,12 @@ The text of each license is also included in licenses/LICENSE-[project].txt.
https://npmjs.com/package/d3-dsv/node_modules/commander/v/7.2.0 7.2.0 MIT
https://npmjs.com/package/d3-tip/v/0.9.1 0.9.1 MIT
https://npmjs.com/package/dayjs/v/1.11.7 1.11.7 MIT
- https://npmjs.com/package/element-plus/v/2.0.2 2.0.2 MIT
+ https://npmjs.com/package/element-plus/v/2.1.0 2.1.0 MIT
https://npmjs.com/package/element-plus/node_modules/@vueuse/core/v/7.7.1 7.7.1 MIT
https://npmjs.com/package/element-plus/node_modules/@vueuse/core/node_modules/@vueuse/shared/v/7.7.1 7.7.1 MIT
https://npmjs.com/package/element-plus/node_modules/@vueuse/core/node_modules/vue-demi/v/0.13.11 0.13.11 MIT
https://npmjs.com/package/element-resize-detector/v/1.2.4 1.2.4 MIT
+ https://npmjs.com/package/escape-html/v/1.0.3 1.0.3 MIT
https://npmjs.com/package/estree-walker/v/2.0.2 2.0.2 MIT
https://npmjs.com/package/follow-redirects/v/1.15.2 1.15.2 MIT
https://npmjs.com/package/iconv-lite/v/0.6.3 0.6.3 MIT
@@ -506,7 +507,7 @@ The text of each license is also included in licenses/LICENSE-[project].txt.
https://npmjs.com/package/mitt/v/2.1.0 2.1.0 MIT
https://npmjs.com/package/moment/v/2.29.4 2.29.4 MIT
https://npmjs.com/package/monaco-editor/v/0.34.1 0.34.1 MIT
- https://npmjs.com/package/nanoid/v/3.3.4 3.3.4 MIT
+ https://npmjs.com/package/nanoid/v/3.3.6 3.3.6 MIT
https://mvnrepository.com/artifact/org.bouncycastle/bcpkix-jdk18on/1.72 MIT
https://mvnrepository.com/artifact/org.bouncycastle/bcprov-jdk18on/1.72 MIT
https://mvnrepository.com/artifact/org.bouncycastle/bcutil-jdk18on/1.72 MIT
@@ -514,7 +515,7 @@ The text of each license is also included in licenses/LICENSE-[project].txt.
https://mvnrepository.com/artifact/org.codehaus.mojo/animal-sniffer-annotations/1.21 MIT
https://npmjs.com/package/pinia/v/2.0.28 2.0.28 MIT
https://npmjs.com/package/pinia/node_modules/vue-demi/v/0.13.11 0.13.11 MIT
- https://npmjs.com/package/postcss/v/8.4.20 8.4.20 MIT
+ https://npmjs.com/package/postcss/v/8.4.23 8.4.23 MIT
https://npmjs.com/package/propagating-hammerjs/v/2.0.1 2.0.1 MIT
https://npmjs.com/package/safer-buffer/v/2.1.2 2.1.2 MIT
https://npmjs.com/package/sourcemap-codec/v/1.4.8 1.4.8 MIT
diff --git a/dist-material/release-docs/licenses/ui-licenses/LICENSE-escape-html b/dist-material/release-docs/licenses/ui-licenses/LICENSE-escape-html
new file mode 100644
index 0000000000..36bf049fdc
--- /dev/null
+++ b/dist-material/release-docs/licenses/ui-licenses/LICENSE-escape-html
@@ -0,0 +1,24 @@
+The MIT License)
+
+Copyright (c) 2012-2013 TJ Holowaychuk
+Copyright (c) 2015 Andreas Lubbe
+Copyright (c) 2015 Tiancheng "Timothy" Gu
+
+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.
\ No newline at end of file
diff --git a/docs/en/changes/changes.md b/docs/en/changes/changes.md
index 9d2cda46c4..8b9b7f0fa9 100644
--- a/docs/en/changes/changes.md
+++ b/docs/en/changes/changes.md
@@ -57,6 +57,10 @@
* [Clean UI templates before upgrade] Set `showSymbol: true`, and make the data point shows on the Line graph.
Please clean `ui_template` index in elasticsearch storage or table in JDBC storage.
* [Clean UI templates before upgrade] UI templates: Simplify metric name with the label.
+* Add MQ menu.
+* Add Jeysey icon.
+* Fix: set endpoint and instance selectors with url parameters correctly.
+* Bump up dependencies versions icons-vue 1.1.4, element-plus 2.1.0, nanoid 3.3.6, postcss 8.4.23
#### Documentation
diff --git a/skywalking-ui b/skywalking-ui
index 7257858921..903cf8e9bd 160000
--- a/skywalking-ui
+++ b/skywalking-ui
@@ -1 +1 @@
-Subproject commit 7257858921839d43f9b6fd8900fa78eaa7bb98b4
+Subproject commit 903cf8e9bde6d9036cb0b42e41e566f78b224734