You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@echarts.apache.org by su...@apache.org on 2020/10/29 04:01:28 UTC
[incubator-echarts] 01/01: Merge branch 'release' into
timeline-scale
This is an automated email from the ASF dual-hosted git repository.
sushuang pushed a commit to branch timeline-scale
in repository https://gitbox.apache.org/repos/asf/incubator-echarts.git
commit 9ddb18234601b994140ec836c44e7fbf90a5cc2f
Merge: af508e8 f995676
Author: 100pah <su...@gmail.com>
AuthorDate: Thu Oct 29 12:00:43 2020 +0800
Merge branch 'release' into timeline-scale
src/chart/line/LineView.ts | 5 ++---
src/util/decal.ts | 10 +++++++---
src/util/states.ts | 5 ++++-
src/util/types.ts | 2 +-
test/custom-hexbin.html | 8 ++++----
test/decal.html | 19 +++++++++++++++----
test/graph.html | 12 ++++++++----
test/hoverStyle.html | 4 ++--
test/runTest/actions/__meta__.json | 20 ++++++++++----------
test/runTest/actions/appendData.json | 2 +-
test/runTest/actions/axis-interval2.json | 2 +-
test/runTest/actions/brush.json | 2 +-
test/runTest/actions/calendar-month.json | 2 +-
test/runTest/actions/clip.json | 2 +-
test/runTest/actions/color-mix-aqi.json | 2 +-
test/runTest/actions/connect-dynamic.json | 2 +-
test/runTest/actions/connect.json | 2 +-
test/runTest/actions/connect2.json | 2 +-
test/runTest/actions/custom-hexbin.json | 2 +-
test/runTest/actions/dataZoom-action.json | 2 +-
test/runTest/actions/dataZoom-axes.json | 2 +-
test/runTest/actions/dataZoom-rainfall.json | 2 +-
test/runTest/actions/dataZoom-scatter-hv.json | 2 +-
test/runTest/actions/dataZoom-toolbox.json | 2 +-
test/runTest/actions/geo-map.json | 2 +-
test/runTest/actions/getOption.json | 2 +-
test/runTest/actions/heatmap.json | 2 +-
test/runTest/actions/homepage3.json | 2 +-
test/runTest/actions/hoverStyle.json | 2 +-
test/runTest/actions/legend.json | 2 +-
test/runTest/actions/mapWorld.json | 2 +-
test/runTest/actions/markArea.json | 2 +-
test/runTest/actions/pie-calculable.json | 2 +-
test/runTest/actions/scatter-single-axis.json | 2 +-
test/runTest/client/client.js | 4 +---
test/runTest/server.js | 4 ++--
36 files changed, 81 insertions(+), 62 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@echarts.apache.org
For additional commands, e-mail: commits-help@echarts.apache.org