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

hxd pushed a commit to branch materials
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git

commit 55d094c1a98e37b0dfd7c679cf8e0aeaaa7badc6
Author: xiangdong huang <[email protected]>
AuthorDate: Sat Apr 18 18:06:11 2020 +0800

    add slides and videos from 2018 to 2020
---
 docs/Community/Materials.md       | 92 +++++++++++++++++++++++++++++++++++++++
 site/src/main/.vuepress/config.js |  2 +
 2 files changed, 94 insertions(+)

diff --git a/docs/Community/Materials.md b/docs/Community/Materials.md
new file mode 100644
index 0000000..269adab
--- /dev/null
+++ b/docs/Community/Materials.md
@@ -0,0 +1,92 @@
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+    
+        http://www.apache.org/licenses/LICENSE-2.0
+    
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
+
+## Meetups and Talks
+
+* 2018.12.09, Tsinghua Open Source Software Summit 2018. Beijing, China.
+  * (Chinese) IoTDB: from Tsinghua IoTDB to Apache IoTDB (incubating). 
IoTDB:从清华IoTDB到Apache孵化器项目。Reporter: Xiangdong Huang
+
+* 2019.02.21, Industrial Internet Summit 2019. Beijing, China.
+  * (Chinese) Apache IoTDB (incubating): Time Series Database for IIoT. 
IoTDB:工业互联网时序数据库. Reporter: Jianmin Wang
+
+* 2019.05.07, The 2nd Digital China Summit. Fuzhou, China.
+  * (Chinese) Apache IoTDB (incubating): Time Series Database for IIoT. 
IoTDB:工业互联网时序数据库. Reporter: Xiangdong Huang
+  
+* 2019.07.13, Beijing Hackatthon 2019. Beijing, China.
+  * (Chinese) Apache IoTDB (incubating): Time Series Database for IIoT. 
IoTDB:工业互联网时序数据库. Reporter: Xiangdong Huang
+
+* 2019.09.10, ApacheCon North America 2019. Las Vegas, USA.
+  * (English) [Hello World! Introducing Apache IoTDB - a Database for the 
Internet of Things](#apna2019). Reporter: Xiangdong Huang, Julian Feinauer
+  
+* 2019.10.23, ApacheCon Europe 2019. Berlin, Germany.
+  * (English) [Apache IoTDB: Time Series Database for Industrial 
IoT](#apeu2019).  Reporter: Xiangdong Huang, Julian Feinauer
+
+* 2019.11.09, Apache Event: Embrace Apache Software Foundation. Beijing China.
+  * (Chinese) Open Source in Campus - Apache IoTDB as an Example. 从 Apache 
IoTDB 看高校学生的 Apache 开源实践.  Reporter: Xiangdong Huang
+
+* 2019.12.28, Dalian, China. Apache RocketMQ x Apache IoTDB Meetup. 
+  * (Chinese) [Apache IoTDB: Why We Need a Time Series 
Database](#meetup2019-dalian). Apache IoTDB:为什么我们需要一个时序数据库. Reporter: Xiangdong 
Huang
+
+* 2020.01.04 Beijing, China. Apache IoTDB x Apache Pulsar Meetup.
+  * (Chinese) [Managing Time series data with IoTDB](#meetup2019-pulsar1).  
基于IoTDB的时序数据开源解决方案. Reporter: Jialin Qiao
+  * (Chinese) [Apache IoTDB: History and Technical 
Details](#meetup2019-pulsar2). Apache IoTDB的前世今生与技术细节. Reporter: Xiangdong Huang
+
+* 2020.01.12 Beijing, China. Apache IoTDB x Apache ShardingSphere Meetup.
+
+
+## Slides, Audios and Videos
+
+### English
+
+* Coding example (from Dalian Meetup 2019)
+
+<iframe 
src="//www.slideshare.net/slideshow/embed_code/key/MZBHJIVnVxff8?startSlide=26" 
width="640" height="480" frameborder="0" allowfullscreen> </iframe>
+
+* <span id = "apna2019"> ApacheCon North America 2019: Hello World! 
Introducing Apache IoTDB - a Database for the Internet of Things</span>
+
+<iframe width="640" height="50" 
src="https://feathercast.apache.org/wp-content/uploads/2019/09/2019-09-10-hello-world-introducing-apache-iotdb-xiangdong-huang-julian-feinauer.mp3";
 frameborder="0" allow="accelerometer; encrypted-media; gyroscope; 
picture-in-picture" autoplay="false"></iframe>
+
+* <span id = "apeu2019"> ApacheCon Europe 2019: Apache IoTDB: Time Series 
Database for Industrial IoT</span>
+
+<iframe src="//www.slideshare.net/slideshow/embed_code/key/lms4cEH1eqnRZC" 
width="640" height="480" frameborder="0" scrolling="no" allowfullscreen> 
</iframe>
+ 
+<iframe width="640" height="480" 
src="https://www.youtube.com/embed/LLFc3yPyTFY"; frameborder="0" 
allow="accelerometer; autoplay; encrypted-media; gyroscope; picture-in-picture" 
allowfullscreen></iframe>
+
+### Chinese
+
+* <span id = "meetup2019-pulsar1"> 北京Meetup 2019. 基于Apache IoTDB的时序数据开源解决方案. 
</span>
+
+<iframe src="//www.slideshare.net/slideshow/embed_code/key/Fmz5kXAzNgmVSu"  
width="640" height="480" frameborder="0"  allowfullscreen> </iframe> 
+
+<iframe 
src="//player.bilibili.com/player.html?aid=83462398&bvid=BV1sJ411J783&cid=142782989&page=5"
   width="640" height="480" scrolling="no" border="0" frameborder="no" 
framespacing="0" allowfullscreen="true"> </iframe>
+
+* <span id = "meetup2019-pulsar2"> 北京Meetup 2019. Apache IoTDB的前世今生与技术细节. 
</span>
+
+<iframe src="//www.slideshare.net/slideshow/embed_code/key/pEnS6vZrt8DJGl" 
width="640" height="480"   frameborder="0"  allowfullscreen> </iframe> 
+
+<iframe 
src="//player.bilibili.com/player.html?aid=83462398&bvid=BV1sJ411J783&cid=142782348&page=3"
   width="640" height="480"  scrolling="no" border="0" frameborder="no" 
framespacing="0" allowfullscreen="true"> </iframe>
+
+* <span id = "meetup2019-dalian"> 大连Meetup 2019. Apache IoTDB: 工业互联网时序数据库. 
</span>
+
+<iframe src="//www.slideshare.net/slideshow/embed_code/key/MZBHJIVnVxff8" 
width="640" height="480" frameborder="0"  allowfullscreen> </iframe>
+
+
+
diff --git a/site/src/main/.vuepress/config.js 
b/site/src/main/.vuepress/config.js
index 5281b83..6728813 100644
--- a/site/src/main/.vuepress/config.js
+++ b/site/src/main/.vuepress/config.js
@@ -91,6 +91,7 @@ var config = {
                                          { text: 'Wiki', link: 
'https://cwiki.apache.org/confluence/display/iotdb'},
                                          { text: 'People', link: 
'/Community/Community-Project Committers'},
                                          { text: 'Powered By', link: 
'/Community/Community-Powered By'},
+                                               { text: 'Materials', link: 
'/Community/Materials'},
                                        ]
                                  },
                                  {
@@ -504,6 +505,7 @@ var config = {
                                                { text: 'Wiki', link: 
'https://cwiki.apache.org/confluence/display/iotdb'},
                                            { text: '开发人员', link: 
'/zh/Community/Community-Project Committers'},
                                            { text: '技术支持', link: 
'/zh/Community/Community-Powered By'},
+                                                 { text: '活动与报告', link: 
'/Community/Materials'},
                                        ]
                                  },
                                  {

Reply via email to