Skip to content
Permalink
Browse files
remove incubator and incubating.
  • Loading branch information
100pah committed Jan 18, 2021
1 parent fd82eb9 commit cbf6803acc48d6379cdba0b597d09b9f67bb30c0
Show file tree
Hide file tree
Showing 22 changed files with 69 additions and 61 deletions.
@@ -1,6 +1,6 @@
# About

This project is part of the source of [The Apache ECharts Official Website](https://echarts.apache.org/). See [echarts-website](https://github.com/apache/incubator-echarts-website) for more details of the building process.
This project is part of the source of [The Apache ECharts Official Website](https://echarts.apache.org/). See [echarts-website](https://github.com/apache/echarts-website) for more details of the building process.

## dev

@@ -28,21 +28,21 @@ block content
th 从 GitHub 下载编译产物

.checksum
p <strong>注意:</strong>如果从镜像网站下载,请检查 <a href="https://www.apache.org/dev/release-signing#sha-checksum">SHA-512</a> 并且检验确认 <a href="https://www.apache.org/dev/release-signing#openpgp">OpenPGP</a> 与 <a href="https://www.apache.org">Apache 主站</a>的签名一致。链接在上面的 Source 旁。这个 <a href="https://www.apache.org/dist/incubator/echarts/KEYS">KEYS</a> 文件包含了用于签名发布版的公钥。如果可能的话,建议使用<a href="https://www.apache.org/dev/release-signing#web-of-trust">可信任的网络(web of trust)</a>确认 KEYS 的同一性。
p <strong>注意:</strong>如果从镜像网站下载,请检查 <a href="https://www.apache.org/dev/release-signing#sha-checksum">SHA-512</a> 并且检验确认 <a href="https://www.apache.org/dev/release-signing#openpgp">OpenPGP</a> 与 <a href="https://www.apache.org">Apache 主站</a>的签名一致。链接在上面的 Source 旁。这个 <a href="https://www.apache.org/dist/echarts/KEYS">KEYS</a> 文件包含了用于签名发布版的公钥。如果可能的话,建议使用<a href="https://www.apache.org/dev/release-signing#web-of-trust">可信任的网络(web of trust)</a>确认 KEYS 的同一性。

h4 使用 GPG 验证 ECharts 发布版本
ol
li 从镜像网站下载 apache-echarts-X.Y.Z-incubating-src.zip
li 从 <a href="https://www.apache.org/dist/incubator/echarts/">Apache</a> 下载 checksum apache-echarts-X.Y.Z-incubating-src.zip.asc
li 下载 <a href="https://www.apache.org/dist/incubator/echarts/KEYS">ECharts KEYS</a>
li 从镜像网站下载 apache-echarts-X.Y.Z-src.zip
li 从 <a href="https://www.apache.org/dist/echarts/">Apache</a> 下载 checksum apache-echarts-X.Y.Z-src.zip.asc
li 下载 <a href="https://www.apache.org/dist/echarts/KEYS">ECharts KEYS</a>
li gpg –import KEYS
li gpg –verify apache-echarts-X.Y.Z-incubating-src.zip.asc
li gpg –verify apache-echarts-X.Y.Z-src.zip.asc

h4 使用 SHA-512 验证
ol
li 从镜像网站下载 apache-echarts-X.Y.Z-incubating-src.zip
li 从 <a href="https://www.apache.org/dist/incubator/echarts/">Apache</a> 下载 checksum apache-echarts-X.Y.Z-incubating-src.zip.sha512
li shasum -a 512 apache-echarts-X.Y.Z-incubating-src.zip
li 从镜像网站下载 apache-echarts-X.Y.Z-src.zip
li 从 <a href="https://www.apache.org/dist/echarts/">Apache</a> 下载 checksum apache-echarts-X.Y.Z-src.zip.sha512
li shasum -a 512 apache-echarts-X.Y.Z-src.zip

h4 License
p Apache ECharts 基于 <a href="https://www.apache.org/licenses/LICENSE-2.0">Apache License 2.0</a> 发布
@@ -5,13 +5,13 @@ footer
p Copyright © 2017-2020, The Apache Software Foundation Apache ECharts, ECharts, Apache, the Apache feather, and the Apache ECharts project logo are either registered trademarks or trademarks of the Apache Software Foundation.

.icon-panel
a.footer-icon(href='mailto:dev@echarts.apache.org?body=%28Thanks%20for%20using%20ECharts.%20Email%20us%20if%20you%20have%20non-technical%20problems%20using%20ECharts.%20For%20technical%20support%2C%20please%20go%20to%20https%3A//github.com/apache/incubator-echarts/issues%20.%29')
a.footer-icon(href='mailto:dev@echarts.apache.org?body=%28Thanks%20for%20using%20ECharts.%20Email%20us%20if%20you%20have%20non-technical%20problems%20using%20ECharts.%20For%20technical%20support%2C%20please%20go%20to%20https%3A//github.com/apache/echarts/issues%20.%29')
img(src='#{cdnPayRoot}/#{ecWWWLang}/images/icon-email.png?_v_=#{cdnPayVersion}')
a.footer-icon(href='https://twitter.com/EChartsJs')
img(src='#{cdnPayRoot}/#{ecWWWLang}/images/icon-twitter.png?_v_=#{cdnPayVersion}')
a.footer-icon(href='https://weibo.com/u/5160877841')
img(src='#{cdnPayRoot}/#{ecWWWLang}/images/icon-weibo.png?_v_=#{cdnPayVersion}')
a.footer-icon(href='https://github.com/apache/incubator-echarts')
a.footer-icon(href='https://github.com/apache/echarts')
img(src='#{cdnPayRoot}/#{ecWWWLang}/images/icon-github.png?_v_=#{cdnPayVersion}')

.col-md-3#footer-icon-panel
@@ -72,10 +72,10 @@ mixin nav(hostParam, cdnPayRootParam, cdnPayVersionParam)
li
a(href='#{hostParam}/zh/coding-standard.html') 代码规范
li
a(href='https://github.com/apache/incubator-echarts', target='_blank') 源码(GitHub)
a(href='https://github.com/apache/echarts', target='_blank') 源码(GitHub)
include ./svg/external-link
li
a(href='https://github.com/apache/incubator-echarts/issues', target='_blank') Issues(GitHub)
a(href='https://github.com/apache/echarts/issues', target='_blank') Issues(GitHub)
include ./svg/external-link
li#nav-others
a(href='#', class="dropdown-toggle", data-toggle="dropdown") 其他
@@ -172,7 +172,7 @@ block content
h4.group.contributor Contributors
.row
<p></p>
p Thanks to all the <a href="https://github.com/apache/incubator-echarts/graphs/contributors">CONTRIBUTORS</a> <br /> making their effort to help ECharts getting better.
p Thanks to all the <a href="https://github.com/apache/echarts/graphs/contributors">CONTRIBUTORS</a> <br /> making their effort to help ECharts getting better.

include ./footer

@@ -22,7 +22,7 @@ block content
p There are many ways that you can help make ECharts better. Please dive in and help!

h3 Issues
p Review the <a href="https://github.com/apache/incubator-echarts/issues" target="_blank">issues</a> and see if you can offer some help.
p Review the <a href="https://github.com/apache/echarts/issues" target="_blank">issues</a> and see if you can offer some help.
ul
li If it's a bug report or how-to question, make sure the author has provided a minimum online demo with either <a href="https://codepen.io/Ovilia/pen/dyYWXWM" target="_blank">Codepen</a> or <a href="https://gallery.echartsjs.com/editor.html" target="_blank">ECharts Gallery (Chinese)</a> to show what's going wrong.
li If it's a feature request, make sure the author has a clear explanation about what is expected and a picture would be very helpful for some cases.
@@ -32,16 +32,16 @@ block content
h3 Pull Requests
p We appreciate pull requests from the community!
p Before you start, please checkout the <a href="./coding-standard.html">Coding Standard</a> and <a href="https://www.apache.org/foundation/policies/conduct.html" target="_blank">Apache Code of Conduct</a>.
p Please refer to <a href="https://github.com/apache/incubator-echarts/wiki/How-to-setup-the-dev-environment" target="_blank">How to setup the dev environment</a> and <a href="https://github.com/apache/incubator-echarts/wiki/How-to-make-a-pull-request" target="_blank">How to make a pull request</a> for more detailed instructions.
p Please refer to <a href="https://github.com/apache/echarts/wiki/How-to-setup-the-dev-environment" target="_blank">How to setup the dev environment</a> and <a href="https://github.com/apache/echarts/wiki/How-to-make-a-pull-request" target="_blank">How to make a pull request</a> for more detailed instructions.
p If you have any problem when making pull requests, please comment in the issues or pull requests or send an email to <a href="mailto:dev@echarts.apache.org">dev@echarts.apache.org</a> to ask for help.

h3 Mailing List
p Join us on the <a href="./maillist.html">mailing list</a> and take part in any conversations.

h3 Documents
p Documentation is massively important to help users make the most of Apache ECharts and it's probably the area that needs the most help! So if you are interested, whether it's just to fix a page here or there, correct a link or improve what documentation is already there, please do dive in and help!
p The source code of document is available at <a href="https://github.com/apache/incubator-echarts-doc" target="_blank">GitHub</a> and maybe the easiest way to find where to change is by searching key words already there.
p In the issue list, we also have a <a href="https://github.com/apache/incubator-echarts/labels/doc" target="_blank">"doc"</a> label. We appreciate pull requests to fix them indeed!
p The source code of document is available at <a href="https://github.com/apache/echarts-doc" target="_blank">GitHub</a> and maybe the easiest way to find where to change is by searching key words already there.
p In the issue list, we also have a <a href="https://github.com/apache/echarts/labels/doc" target="_blank">"doc"</a> label. We appreciate pull requests to fix them indeed!


h2 Becoming a PPMC Member or Committer!
@@ -40,21 +40,21 @@ block content
th Dist files on GitHub

.checksum
p <strong>Note:</strong> when downloading from a mirror please check the <a href="https://www.apache.org/dev/release-signing#sha-checksum">SHA-512</a> and verify the <a href="https://www.apache.org/dev/release-signing#openpgp">OpenPGP</a> compatible signature from the main <a href="https://www.apache.org">Apache site</a>. Links are provided above (next to the release download link). This <a href="https://www.apache.org/dist/incubator/echarts/KEYS">KEYS</a> file contains the public keys used for signing release. It is recommended that (when possible) a <a href="https://www.apache.org/dev/release-signing#web-of-trust">web of trust</a> is used to confirm the identity of these keys.
p <strong>Note:</strong> when downloading from a mirror please check the <a href="https://www.apache.org/dev/release-signing#sha-checksum">SHA-512</a> and verify the <a href="https://www.apache.org/dev/release-signing#openpgp">OpenPGP</a> compatible signature from the main <a href="https://www.apache.org">Apache site</a>. Links are provided above (next to the release download link). This <a href="https://www.apache.org/dist/echarts/KEYS">KEYS</a> file contains the public keys used for signing release. It is recommended that (when possible) a <a href="https://www.apache.org/dev/release-signing#web-of-trust">web of trust</a> is used to confirm the identity of these keys.

h4 To verify ECharts releases using GPG:
ol
li Download the release apache-echarts-X.Y.Z-incubating-src.zip from a mirror site.
li Download the checksum apache-echarts-X.Y.Z-incubating-src.zip.asc from <a href="https://www.apache.org/dist/incubator/echarts/">Apache</a>.
li Download the <a href="https://www.apache.org/dist/incubator/echarts/KEYS">ECharts KEYS</a> file.
li Download the release apache-echarts-X.Y.Z-src.zip from a mirror site.
li Download the checksum apache-echarts-X.Y.Z-src.zip.asc from <a href="https://www.apache.org/dist/echarts/">Apache</a>.
li Download the <a href="https://www.apache.org/dist/echarts/KEYS">ECharts KEYS</a> file.
li gpg –import KEYS
li gpg –verify apache-echarts-X.Y.Z-incubating-src.zip.asc
li gpg –verify apache-echarts-X.Y.Z-src.zip.asc

h4 To perform a quick check using SHA-512:
ol
li Download the release apache-echarts-X.Y.Z-incubating-src.zip from a mirror site.
li Download the checksum apache-echarts-X.Y.Z-incubating-src.zip.512 from <a href="https://www.apache.org/dist/incubator/echarts/">Apache</a>.
li shasum -a 512 apache-echarts-X.Y.Z-incubating-src.zip
li Download the release apache-echarts-X.Y.Z-src.zip from a mirror site.
li Download the checksum apache-echarts-X.Y.Z-src.zip.512 from <a href="https://www.apache.org/dist/echarts/">Apache</a>.
li shasum -a 512 apache-echarts-X.Y.Z-src.zip

h4 License
p Apache ECharts is licensed under <a href="https://www.apache.org/licenses/LICENSE-2.0">Apache License 2.0</a>.
@@ -72,7 +72,7 @@ block content
h2#map-chart map-chart
h3 Province names overlap on the chart. How to modify the location of the names?
p You can modify the <code>cp</code> coordinates of the corresponding province in the map file (JS or JSON), or modify the map data that has been loaded by <code>echarts.getMap('china')</code>.
p For more details, please refer to <a href="https://github.com/apache/incubator-echarts/issues/4379#issuecomment-257765948">GitHub</a>.
p For more details, please refer to <a href="https://github.com/apache/echarts/issues/4379#issuecomment-257765948">GitHub</a>.

h3 Where can I download maps from other countries?
p Map information for other countries can be downloaded from <a href="https://github.com/echarts-maps/echarts-countries-js">here</a>.
@@ -88,7 +88,7 @@ block content
p Please refer to <a href="https://gallery.echartsjs.com/editor.html?c=xHyqn_rQ6g">this example</a>.

h3 How to make my custom map?
p The ECharts map is <a href="https://github.com/apache/incubator-echarts/blob/8eeb7e5abe207d0536c62ce1f4ddecc6adfdf85e/src/util/mapData/rawData/encode.js">additionally encoded</a> from original coordinates. You can use the <a href="https://github.com/giscafer/mapshaper-plus">mapshaper-plus tool</a> to upload a custom geojson file and then generate a map file that can be used in Echarts.
p The ECharts map is <a href="https://github.com/apache/echarts/blob/8eeb7e5abe207d0536c62ce1f4ddecc6adfdf85e/src/util/mapData/rawData/encode.js">additionally encoded</a> from original coordinates. You can use the <a href="https://github.com/giscafer/mapshaper-plus">mapshaper-plus tool</a> to upload a custom geojson file and then generate a map file that can be used in Echarts.


h2#baidu-map baidu-map
@@ -4,13 +4,13 @@ footer
.col-md-9
p Copyright © 2017-2020, The Apache Software Foundation Apache ECharts, ECharts, Apache, the Apache feather, and the Apache ECharts project logo are either registered trademarks or trademarks of the Apache Software Foundation.
.icon-panel
a.footer-icon(href='mailto:dev@echarts.apache.org?body=%28Thanks%20for%20using%20ECharts.%20Email%20us%20if%20you%20have%20non-technical%20problems%20using%20ECharts.%20For%20technical%20support%2C%20please%20go%20to%20https%3A//github.com/apache/incubator-echarts/issues%20.%29')
a.footer-icon(href='mailto:dev@echarts.apache.org?body=%28Thanks%20for%20using%20ECharts.%20Email%20us%20if%20you%20have%20non-technical%20problems%20using%20ECharts.%20For%20technical%20support%2C%20please%20go%20to%20https%3A//github.com/apache/echarts/issues%20.%29')
img(src='#{cdnPayRoot}/#{ecWWWLang}/images/icon-email.png?_v_=#{cdnPayVersion}')
a.footer-icon(href='https://twitter.com/EChartsJs')
img(src='#{cdnPayRoot}/#{ecWWWLang}/images/icon-twitter.png?_v_=#{cdnPayVersion}')
a.footer-icon(href='https://weibo.com/u/5160877841')
img(src='#{cdnPayRoot}/#{ecWWWLang}/images/icon-weibo.png?_v_=#{cdnPayVersion}')
a.footer-icon(href='https://github.com/apache/incubator-echarts')
a.footer-icon(href='https://github.com/apache/echarts')
img(src='#{cdnPayRoot}/#{ecWWWLang}/images/icon-github.png?_v_=#{cdnPayVersion}')
.col-md-3#footer-icon-panel
a(href='https://www.apache.org')
@@ -25,7 +25,7 @@ block content
a#index-play-btn(href='javascript:;', onclick='playIndexVideo()')
.btn-panel
a.btn.btn-index-home(href='./download.html', style="letter-spacing:0px") Download
a.btn.btn-index-home(href='https://github.com/apache/incubator-echarts', style="letter-spacing:0px") Source Code
a.btn.btn-index-home(href='https://github.com/apache/echarts', style="letter-spacing:0px") Source Code
.main-bg

//- section.banner-section(style='background: #1e2e55')
@@ -63,7 +63,7 @@ block content
include ../components/svg/community
h3 Active Community
p <!-- Place this tag where you want the button to render. -->
<a class="github-button" href="https://github.com/apache/incubator-echarts" data-icon="octicon-star" data-size="large" data-show-count="true" aria-label="Star apache/incubator-echarts on GitHub">GitHub Stars</a>
<a class="github-button" href="https://github.com/apache/echarts" data-icon="octicon-star" data-size="large" data-show-count="true" aria-label="Star apache/echarts on GitHub">GitHub Stars</a>

.row.feature-detail#feature-4
.col-sm-4.col
@@ -143,7 +143,7 @@ block content
h3 Follow Us
p You may follow Apache ECharts to keep informed.
.btn-panel
a#btn-github(href='https://github.com/apache/incubator-echarts')
a#btn-github(href='https://github.com/apache/echarts')
.btn-content
img.lazy(data-src='#{cdnPayRoot}/#{ecWWWLang}/images/icon-github.png?_v_=#{cdnPayVersion}')
span GitHub

0 comments on commit cbf6803

Please sign in to comment.