This is an automated email from the ASF dual-hosted git repository.
deqingli pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/incubator-echarts.git
commit 7991282ce2db096657c7c0fdc251d9cc0f4c7e8f
Merge: f1fbe38 0ba8769
Author: deqingli <annong...@gmail.com>
AuthorDate: Wed May 2 17:12:16 2018 +0800
Merge branch 'master' of https://github.com/apache/incubator-echarts
DISCLAIMER | 12 +
LICENSE | 53 ++++-
build/addHeader.js | 21 +-
build/preamble.js | 1 +
dist/echarts-en.common.js | 243 +++++++++++---------
dist/echarts-en.common.min.js | 3 +-
dist/echarts-en.js | 286 ++++++++++++++---------
dist/echarts-en.js.map | 2 +-
dist/echarts-en.min.js | 3 +-
dist/echarts-en.simple.js | 238 ++++++++++---------
dist/echarts-en.simple.min.js | 3 +-
dist/echarts.common.js | 243 +++++++++++---------
dist/echarts.common.min.js | 3 +-
dist/echarts.js | 286 ++++++++++++++---------
dist/echarts.js.map | 2 +-
dist/echarts.min.js | 3 +-
dist/echarts.simple.js | 238 ++++++++++---------
dist/echarts.simple.min.js | 3 +-
dist/extension/bmap.min.js | 1 +
dist/extension/dataTool.min.js | 1 +
index.common.js | 1 +
index.js | 1 +
index.simple.js | 1 +
src/chart/graph/forceHelper.js | 7 +
src/chart/line/helper.js | 4 +-
src/chart/line/poly.js | 84 +++----
src/chart/tree/layoutHelper.js | 7 +
src/chart/treemap/treemapLayout.js | 11 +-
src/component/axis/CartesianAxisView.js | 5 +-
src/component/marker/markerHelper.js | 2 +-
src/coord/Axis.js | 5 +-
src/coord/axisTickLabelBuilder.js | 85 ++++---
src/coord/cartesian/Grid.js | 8 +-
src/coord/polar/polarCreator.js | 10 +-
src/data/helper/dataStackHelper.js | 36 ++-
src/helper.js | 9 +-
src/layout/barGrid.js | 2 +-
src/layout/barPolar.js | 2 +-
src/layout/points.js | 4 +-
src/scale/Time.js | 8 +-
src/util/array/nest.js | 7 +
test/area-stack.html | 370 +++++++++++++++++++++++++++++-
test/axis-interval2.html | 112 +++++++++
test/smooth.html | 391 ++++++++++++++++++++++++++++++--
44 files changed, 1989 insertions(+), 828 deletions(-)
--
To stop receiving notification emails like this one, please contact
deqin...@apache.org.
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org
For additional commands, e-mail: commits-h...@echarts.apache.org
