[incubator-echarts-doc] 01/01: Merge branch 'release'
This is an automated email from the ASF dual-hosted git repository.
sushuang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-echarts-doc.git
commit 38c635b8e311e55e579bb6516a1690879fbd7791
Merge: 51ac97b bc73344
Author: 100pah
AuthorDate: Sat Jan 4 03:26:39 2020 +0800
Merge branch 'release'
.gitignore | 15 +-
README.md | 22 +-
.../basic-concepts-overview/components-code.png| Bin 0 -> 76110 bytes
asset-src/basic-concepts-overview/components.png | Bin 0 -> 90255 bytes
.../basic-concepts-overview/coord-sys-0-code.png | Bin 0 -> 46037 bytes
asset-src/basic-concepts-overview/coord-sys-0.png | Bin 0 -> 43013 bytes
.../basic-concepts-overview/coord-sys-1-code.png | Bin 0 -> 95940 bytes
asset-src/basic-concepts-overview/coord-sys-1.png | Bin 0 -> 67670 bytes
.../basic-concepts-overview/coord-sys-2-code.png | Bin 0 -> 150171 bytes
asset-src/basic-concepts-overview/coord-sys-2.png | Bin 0 -> 92589 bytes
asset-src/basic-concepts-overview/locate-code.png | Bin 0 -> 47549 bytes
asset-src/basic-concepts-overview/locate.png | Bin 0 -> 59008 bytes
asset-src/basic-concepts-overview/make-img.html| 732 +
asset-src/basic-concepts-overview/make-img.pptx| Bin 0 -> 1535020 bytes
.../multiple-ec-instance-code1.png | Bin 0 -> 102650 bytes
.../multiple-ec-instance-code2.png | Bin 0 -> 70872 bytes
.../multiple-ec-instance.html | 190 +++
.../multiple-ec-instance.png | Bin 0 -> 134361 bytes
asset-src/basic-concepts-overview/series-all-a.jpg | Bin 0 -> 96582 bytes
asset-src/basic-concepts-overview/series-chart.png | Bin 0 -> 86922 bytes
.../basic-concepts-overview/series-code-a.png | Bin 0 -> 144314 bytes
.../basic-concepts-overview/series-code-b.png | Bin 0 -> 170388 bytes
asset/img/basic-concepts-overview/components.jpg | Bin 0 -> 71677 bytes
asset/img/basic-concepts-overview/coord-sys-0.jpg | Bin 0 -> 29259 bytes
asset/img/basic-concepts-overview/coord-sys-1.jpg | Bin 0 -> 45861 bytes
asset/img/basic-concepts-overview/coord-sys-2.jpg | Bin 0 -> 69891 bytes
asset/img/basic-concepts-overview/locate.jpg | Bin 0 -> 47641 bytes
.../multiple-ec-instance.jpg | Bin 0 -> 88599 bytes
asset/img/basic-concepts-overview/series-all-a.jpg | Bin 0 -> 63608 bytes
asset/img/basic-concepts-overview/series-all-b.jpg | Bin 0 -> 69138 bytes
build.js | 271 ++--
build/webpack.config.js|1 +
config/env.asf.js |7 +-
config/env.dev.js |7 +-
config/env.echartsjs.js|7 +-
config/env.github.js | 10 -
config/{env.dev.js => env.localsite.js}|7 +-
en/api/events.md |2 +-
en/option/component/axis-common.md | 103 +-
en/option/component/data-zoom.md |3 -
en/option/component/dataset.md |4 +-
en/option/component/graphic.md |7 -
en/option/partial/clip.md |7 +-
en/option/partial/text-style.md|4 +-
en/option/partial/zr-graphic.md|2 +-
en/option/series/candlestick.md|5 +
en/option/series/funnel.md |2 +-
en/option/series/pie.md| 45 +
en/tutorial/basic-concepts-overview.md | 202 +++
en/tutorial/custom-build.md|2 +-
en/tutorial/getting-started.md |4 +-
en/tutorial/tutorial.md|1 +
package-lock.json | 179 ++-
package.json |8 +-
public/css/doc-bundle.css | 1004
public/css/element-icons.ttf | Bin 55956 -> 0 bytes
public/css/element-icons.woff | Bin 28200 -> 0 bytes
public/en/documents/api-parts/api-outline.json |1 -
public/en/documents/api-parts/api.action.json | 36 -
public/en/documents/api-parts/api.echarts.json | 16 -
.../documents/api-parts/api.echartsInstance.json | 23 -
public/en/documents/api-parts/api.events.json | 28 -
public/en/documents/api-parts/api.json |6 -
public/en/documents/api.json |1 -
public/en/documents/asset/gl/img/alpha-beta.sketch | Bin 65536 -> 0 bytes
public/en/documents/asset/gl/img/bar3D-bevel.png | Bin 936101 -> 0 bytes
.../en/documents/asset/gl/img/bar3D-no-bevel.png | Bin 653448 -> 0 bytes
[incubator-echarts-doc] 01/01: Merge branch 'release'
This is an automated email from the ASF dual-hosted git repository. sushuang pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-echarts-doc.git commit 3b5949e77f8d923136a35a5d57488bde3e0cad5c Merge: d9c4b97 78283c0 Author: SHUANG SU AuthorDate: Sat Oct 19 03:12:44 2019 +0800 Merge branch 'release' public/documents/en/api.json | 2 +- public/documents/en/tutorial.json| 2 +- public/documents/zh/tutorial.json| 2 +- public/en/404.html | 2 +- public/en/api.html | 8 public/en/builder.html | 2 +- public/en/changelog.html | 2 +- public/en/cheat-sheet.html | 2 +- public/en/coding-standard.html | 2 +- public/en/committers.html| 2 +- public/en/dependencies.html | 2 +- public/en/documents/en/api.json | 2 +- public/en/documents/en/tutorial.json | 2 +- public/en/documents/zh/tutorial.json | 2 +- public/en/download-extension.html| 2 +- public/en/download-map.html | 2 +- public/en/download-theme.html| 2 +- public/en/download.html | 4 ++-- public/en/faq.html | 2 +- public/en/feature.html | 2 +- public/en/index.html | 4 ++-- public/en/maillist.html | 2 +- public/en/option-gl.html | 8 public/en/option.html| 8 public/en/option3.html | 2 +- public/en/tutorial.html | 8 public/zh/404.html | 2 +- public/zh/api.html | 8 public/zh/builder.html | 2 +- public/zh/builder3.html | 2 +- public/zh/changelog.html | 2 +- public/zh/cheat-sheet.html | 2 +- public/zh/coding-standard.html | 2 +- public/zh/committers.html| 2 +- public/zh/demo.html | 2 +- public/zh/dependencies.html | 2 +- public/zh/documents/en/api.json | 2 +- public/zh/documents/en/tutorial.json | 2 +- public/zh/documents/zh/tutorial.json | 2 +- public/zh/download-extension.html| 2 +- public/zh/download-map.html | 2 +- public/zh/download-theme.html| 2 +- public/zh/download.html | 4 ++-- public/zh/download3.html | 4 ++-- public/zh/examples.html | 2 +- public/zh/faq.html | 2 +- public/zh/feature.html | 2 +- public/zh/index.html | 4 ++-- public/zh/maillist.html | 2 +- public/zh/option-gl.html | 8 public/zh/option.html| 8 public/zh/option3.html | 8 public/zh/spreadsheet.html | 8 public/zh/tutorial.html | 8 54 files changed, 89 insertions(+), 89 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[incubator-echarts-doc] 01/01: Merge branch 'release'
This is an automated email from the ASF dual-hosted git repository. sushuang pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-echarts-doc.git commit 6fe0146d684f00e45eef7879f0fb83049e82e4b4 Merge: 127aad3 e392118 Author: SHUANG SU AuthorDate: Wed Oct 16 04:20:46 2019 +0800 Merge branch 'release' build.js | 12 public/en/404.html| 2 +- public/en/api.html| 8 public/en/builder.html| 2 +- public/en/changelog.html | 2 +- public/en/cheat-sheet.html| 2 +- public/en/coding-standard.html| 2 +- public/en/committers.html | 2 +- public/en/dependencies.html | 2 +- public/en/documents/en/api.json | 2 +- public/en/documents/en/option-gl.json | 2 +- public/en/documents/en/option.json| 2 +- public/en/documents/en/tutorial.json | 2 +- public/en/documents/zh/api.json | 2 +- public/en/documents/zh/option-gl.json | 2 +- public/en/documents/zh/option.json| 2 +- public/en/documents/zh/tutorial.json | 2 +- public/en/download-extension.html | 2 +- public/en/download-map.html | 2 +- public/en/download-theme.html | 2 +- public/en/download.html | 4 ++-- public/en/faq.html| 2 +- public/en/feature.html| 2 +- public/en/index.html | 4 ++-- public/en/maillist.html | 2 +- public/en/option-gl.html | 8 public/en/option.html | 8 public/en/option3.html| 2 +- public/en/tutorial.html | 8 public/zh/404.html| 2 +- public/zh/api.html| 8 public/zh/builder.html| 2 +- public/zh/builder3.html | 2 +- public/zh/changelog.html | 2 +- public/zh/cheat-sheet.html| 2 +- public/zh/coding-standard.html| 2 +- public/zh/committers.html | 2 +- public/zh/demo.html | 2 +- public/zh/dependencies.html | 2 +- public/zh/documents/en/api.json | 2 +- public/zh/documents/en/option-gl.json | 2 +- public/zh/documents/en/option.json| 2 +- public/zh/documents/en/tutorial.json | 2 +- public/zh/documents/zh/api.json | 2 +- public/zh/documents/zh/option-gl.json | 2 +- public/zh/documents/zh/option.json| 2 +- public/zh/documents/zh/tutorial.json | 2 +- public/zh/download-extension.html | 2 +- public/zh/download-map.html | 2 +- public/zh/download-theme.html | 2 +- public/zh/download.html | 4 ++-- public/zh/download3.html | 4 ++-- public/zh/examples.html | 2 +- public/zh/faq.html| 2 +- public/zh/feature.html| 2 +- public/zh/index.html | 4 ++-- public/zh/maillist.html | 2 +- public/zh/option-gl.html | 8 public/zh/option.html | 8 public/zh/option3.html| 8 public/zh/spreadsheet.html| 8 public/zh/tutorial.html | 8 release.sh| 4 ++-- 63 files changed, 106 insertions(+), 102 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[incubator-echarts-doc] 01/01: Merge branch 'release'
This is an automated email from the ASF dual-hosted git repository. sushuang pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-echarts-doc.git commit 127aad3a6e30290de87f14d96c0e3b0ac11bf098 Merge: 1a1c8e7 86e873d Author: SHUANG SU AuthorDate: Tue Oct 15 19:19:37 2019 +0800 Merge branch 'release' # Conflicts: # build.js # public/documents/en/api.json # public/documents/en/option-gl.json # public/documents/en/option.json # public/documents/en/tutorial.json # public/documents/zh/api.json # public/documents/zh/option-gl.json # public/documents/zh/option.json # public/documents/zh/tutorial.json # public/en/documents/en/changelog.html build.js | 31 +- cn/option/partial/clip.md | 15 + cn/option/partial/version.md |3 + en/api/graphic.md | 88 + en/changelog.md| 60 +- en/option/partial/clip.md | 15 + en/option/partial/version.md |3 + en/option/series/bar.md|4 + en/option/series/custom.md |5 + en/option/series/line.md |5 +- en/option/series/lines.md |4 + en/option/series/scatter.md|4 + public/documents/en/api.json |2 +- public/documents/en/option-gl.json |2 +- public/documents/en/option.json|2 +- public/documents/en/tutorial.json |2 +- public/documents/zh/api.json |2 +- public/documents/zh/option-gl.json |2 +- public/documents/zh/option.json|2 +- public/documents/zh/tutorial.json |2 +- public/en/404.html |2 +- public/en/api.html |8 +- public/en/builder.html |2 +- .../en/builder/src/echarts/chart/bar/BarSeries.js |5 + public/en/builder/src/echarts/chart/bar/BarView.js | 106 +- .../echarts/chart/candlestick/candlestickLayout.js |4 +- public/en/builder/src/echarts/chart/custom.js | 42 +- .../src/echarts/chart/helper/EffectSymbol.js |9 +- .../src/echarts/chart/helper/LargeSymbolDraw.js| 27 +- .../chart/helper/createClipPathFromCoordSys.js | 96 + .../builder/src/echarts/chart/line/LineSeries.js |2 +- .../en/builder/src/echarts/chart/line/LineView.js | 159 +- .../builder/src/echarts/chart/lines/LinesSeries.js |3 + .../builder/src/echarts/chart/lines/LinesView.js |9 + .../en/builder/src/echarts/chart/pie/PieSeries.js |4 +- public/en/builder/src/echarts/chart/pie/PieView.js | 74 +- .../src/echarts/chart/sankey/sankeyAction.js |2 +- .../src/echarts/chart/scatter/ScatterSeries.js |7 +- .../src/echarts/chart/scatter/ScatterView.js | 17 +- .../src/echarts/chart/sunburst/sunburstLayout.js | 18 +- .../builder/src/echarts/chart/tree/TreeSeries.js |2 +- .../en/builder/src/echarts/chart/tree/TreeView.js | 18 +- .../src/echarts/component/dataZoom/AxisProxy.js|2 +- .../echarts/component/dataZoom/DataZoomModel.js| 101 +- .../component/dataZoom/dataZoomProcessor.js|4 +- public/en/builder/src/echarts/component/graphic.js | 55 +- .../src/echarts/component/helper/MapDraw.js| 49 +- public/en/builder/src/echarts/component/legend.js |2 +- .../src/echarts/component/legend/LegendModel.js| 101 +- .../src/echarts/component/legend/LegendView.js | 155 +- .../component/legend/ScrollableLegendModel.js |9 - .../component/legend/ScrollableLegendView.js | 54 +- .../src/echarts/component/legend/legendAction.js |8 +- .../src/echarts/component/marker/MarkerModel.js| 16 +- .../echarts/component/toolbox/feature/DataZoom.js |3 + .../component/tooltip/TooltipContentManager.js |0 .../src/echarts/coord/cartesian/Cartesian2D.js | 33 +- .../en/builder/src/echarts/coord/geo/GeoModel.js |2 +- public/en/builder/src/echarts/coord/polar/Polar.js | 33 + public/en/builder/src/echarts/coord/radar/Radar.js |2 +- public/en/builder/src/echarts/echarts.js | 90 +- public/en/builder/src/echarts/export.js|2 +- public/en/builder/src/echarts/lang.js | 10 + public/en/builder/src/echarts/langEN.js| 10 + public/en/builder/src/echarts/langES.js| 10 + public/en/builder/src/echarts/langFI.js| 10 + public/en/builder/src/echarts/langTH.js| 10 + public/en/builder/src/echarts/layout/barGrid.js| 19 +- public/en/builder/src/echarts/model/Global.js
[incubator-echarts-doc] 01/01: Merge branch 'release'
This is an automated email from the ASF dual-hosted git repository. sushuang pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-echarts-doc.git commit db9e6df2abe7274a131645b6d6adeba951e399f3 Merge: 73d54a9 5f54261 Author: sushuang AuthorDate: Mon Sep 16 22:31:42 2019 +0800 Merge branch 'release' # Conflicts: # README.md README.md |15 +- build.js |38 +- cn/changelog.md| 173 + cn/option/partial/symbol.md| 2 +- config.js => config/env.asf.js | 0 configdev.js => config/env.dev.js | 0 config/env.echartsjs.js| 9 + configgithub.js => config/env.github.js| 0 configen.js| 9 - en/changelog.md| 174 + en/option/partial/symbol.md| 2 +- package.json | 3 +- public/404.html| 7 +- public/about.html | 7 +- public/api.html| 7 +- public/builder.html| 7 +- public/builder3.html | 7 +- public/changelog.html | 7 +- public/cheat-sheet.html| 6 + public/cn/documents/cn/api.json| 2 +- public/cn/documents/cn/changelog.html | 169 + public/cn/documents/cn/option.json | 2 +- public/cn/documents/cn/tutorial.json | 2 +- public/coding-standard.html| 7 +- public/committer.html | 7 +- public/demo.html | 7 +- public/download-extension.html | 7 +- public/download-map.html | 7 +- public/download-theme.html | 7 +- public/download.html | 7 +- public/download3.html | 7 +- public/en/404.html |20 + public/en/api.html |28 +- public/en/builder.html |29 +- public/en/builder/echarts.html | 2 +- .../src/echarts/action/createDataSelectAction.js | 3 +- public/en/builder/src/echarts/chart/bar.js | 5 +- public/en/builder/src/echarts/chart/bar/BarView.js |59 +- .../src/echarts/chart/chord/chordCircularLayout.js | 6 - public/en/builder/src/echarts/chart/custom.js |41 +- .../builder/src/echarts/chart/funnel/FunnelView.js |21 +- .../src/echarts/chart/funnel/funnelLayout.js |54 +- .../builder/src/echarts/chart/gauge/GaugeView.js | 3 +- public/en/builder/src/echarts/chart/graph.js | 2 +- .../builder/src/echarts/chart/graph/GraphView.js |54 +- .../builder/src/echarts/chart/graph/adjustEdge.js |12 +- .../src/echarts/chart/graph/categoryVisual.js |17 +- .../src/echarts/chart/graph/circularLayout.js | 2 +- .../echarts/chart/graph/circularLayoutHelper.js|87 +- .../builder/src/echarts/chart/graph/forceLayout.js | 2 +- .../dataZoom.js => chart/graph/graphHelper.js} |35 +- .../src/echarts/chart/heatmap/HeatmapLayer.js | 8 - public/en/builder/src/echarts/chart/helper/Line.js |15 +- .../builder/src/echarts/chart/helper/LinePath.js |13 +- .../en/builder/src/echarts/chart/helper/Symbol.js |56 +- .../en/builder/src/echarts/chart/pie/PieSeries.js | 3 + public/en/builder/src/echarts/chart/pie/PieView.js |76 +- .../builder/src/echarts/chart/pie/labelLayout.js |19 +- .../builder/src/echarts/chart/radar/RadarView.js |16 +- .../builder/src/echarts/chart/radar/radarLayout.js |37 +- .../src/echarts/chart/sankey/SankeySeries.js |55 +- .../builder/src/echarts/chart/sankey/SankeyView.js |14 +- .../src/echarts/chart/sankey/sankeyAction.js | 5 - .../src/echarts/chart/sankey/sankeyLayout.js | 318 +- .../src/echarts/chart/sankey/sankeyVisual.js |15 +- .../src/echarts/chart/sunburst/SunburstPiece.js| 2 +- .../echarts/chart/themeRiver/ThemeRiverSeries.js | 8 +- .../src/echarts/chart/themeRiver/ThemeRiverView.js | 5 - .../echarts/chart/themeRiver/themeRiverLayout.js | 5 - .../echarts/chart/themeRiver/themeRiverVisual.js | 5 - .../builder/src/echarts/chart/tree/TreeSeries.js | 5 - .../en/builder/src/echarts/chart/tree/TreeView.js | 5 - .../builder/src/echarts/chart/tree/treeAction.js | 5 -
