You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@echarts.apache.org by ov...@apache.org on 2022/09/16 07:55:01 UTC

[echarts-doc] 01/02: Merge branch 'master' into dev

This is an automated email from the ASF dual-hosted git repository.

ovilia pushed a commit to branch doc-coarse-pointer
in repository https://gitbox.apache.org/repos/asf/echarts-doc.git

commit a299ea80e844b4c6e5b33105279cf0b043d68901
Merge: c6ccf94d 91c9ecc6
Author: Ovilia <zw...@gmail.com>
AuthorDate: Fri Sep 16 14:27:47 2022 +0800

    Merge branch 'master' into dev

 build.js                          |     9 +-
 build/webpack.config.js           |     1 -
 editor/package-lock.json          |    88 +-
 editor/src/store/store.js         |     2 +-
 en/api/events.md                  |    68 +-
 en/option/component/tooltip.md    |     3 +-
 en/option/partial/2d-data.md      |     8 +-
 en/option/partial/coord-sys.md    |    48 +
 en/option/series/boxplot.md       |     2 +-
 en/option/series/candlestick.md   |     2 +-
 en/option/series/effectScatter.md |     2 +-
 en/option/series/line.md          |     2 +-
 en/option/series/pie.md           |     9 +
 en/option/series/scatter.md       |     2 +-
 en/option/series/themeRiver.md    |     2 +-
 package-lock.json                 | 18684 ++++++++++++++++++++++++------------
 package.json                      |    22 +-
 src/App.vue                       |     1 +
 src/components/DocContent.vue     |     4 +
 src/components/LiveExample.vue    |    54 +-
 src/components/SearchResult.vue   |     2 +-
 src/directive/mark.js             |     2 +-
 src/i18n.js                       |     8 +-
 src/main.js                       |     5 +-
 tool/md2json.js                   |     2 +-
 zh/api/events.md                  |    68 +-
 zh/option/component/tooltip.md    |     3 +-
 zh/option/partial/2d-data.md      |     8 +-
 zh/option/partial/coord-sys.md    |    48 +
 zh/option/series/boxplot.md       |     2 +-
 zh/option/series/candlestick.md   |     2 +-
 zh/option/series/effectScatter.md |     2 +-
 zh/option/series/line.md          |     2 +-
 zh/option/series/pie.md           |     9 +
 zh/option/series/scatter.md       |     2 +-
 35 files changed, 12706 insertions(+), 6472 deletions(-)


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@echarts.apache.org
For additional commands, e-mail: commits-help@echarts.apache.org