You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@skywalking.apache.org by ha...@apache.org on 2018/04/17 09:27:35 UTC
[incubator-skywalking-ui] 02/02: Merge branch 'master' into
5.0.0/beta
This is an automated email from the ASF dual-hosted git repository.
hanahmily pushed a commit to branch 5.0.0/beta
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking-ui.git
commit 45d694039159c0a7e33c201806152d8f84c1dd2f
Merge: f5d83d1 a42f1b2
Author: gaohongtao <ha...@gmail.com>
AuthorDate: Tue Apr 17 17:26:17 2018 +0800
Merge branch 'master' into 5.0.0/beta
.ga | 3 --
.localized | 0
mock/.gitkeep | 0
public/css/iconfont.css | 73 -----------------------------
public/css/iconfont.eot | Bin 5116 -> 0 bytes
public/css/iconfont.js | 1 -
public/css/iconfont.svg | 57 ----------------------
public/css/iconfont.ttf | Bin 4948 -> 0 bytes
public/css/iconfont.woff | Bin 3216 -> 0 bytes
public/img/icon/app.png | Bin 0 -> 6140 bytes
public/img/icon/app.svg | 1 -
public/img/icon/service.png | Bin 0 -> 9892 bytes
public/img/icon/service.svg | 1 -
src/common/menu.js | 8 ++--
src/components/Charts/ChartCard/index.less | 17 +++++++
src/components/Charts/Field/index.less | 17 +++++++
src/components/Charts/Pie/index.less | 17 +++++++
src/components/SiderMenu/SiderMenu.js | 5 +-
src/components/TraceTable/index.js | 2 +-
src/index.ejs | 1 -
src/models/application.js | 2 +-
src/routes/Dashboard/Dashboard.js | 4 +-
src/routes/Server/Server.js | 4 +-
23 files changed, 65 insertions(+), 148 deletions(-)
--
To stop receiving notification emails like this one, please contact
hanahmily@apache.org.