From de55288277e89b8acf7c570d0a06a846e3fd0936 Mon Sep 17 00:00:00 2001
From: VTHINKXIE <vthinkxie@users.noreply.github.com>
Date: Thu, 12 Apr 2018 17:28:03 +0800
Subject: [PATCH] release(0.7.0-beta.4): release 0.7.0-beta.4 (#1319)

---
 README.md                                    |  2 +-
 components/timeline/nz-timeline.component.ts |  4 +-
 docs/changelog.zh-CN.md                      | 57 ++++++++++++++++++--
 package.json                                 |  2 +-
 site_scripts/_site/src/index.html            |  8 +++
 5 files changed, 66 insertions(+), 7 deletions(-)

diff --git a/README.md b/README.md
index f986006f134..ce416caa3a7 100644
--- a/README.md
+++ b/README.md
@@ -50,7 +50,7 @@ $ yarn add ng-zorro-antd
 If you are in a bad network environment，you can try other registries and tools like [cnpm](https://github.com/cnpm/cnpm).
 
 
-## Companies using antd
+## Companies using ng-zorro-antd
 
 - [Alibaba](http://www.alibaba.com/)
 - [Aliyun](http://www.aliyun.com/)
diff --git a/components/timeline/nz-timeline.component.ts b/components/timeline/nz-timeline.component.ts
index a86e535180d..7af325cfcbd 100644
--- a/components/timeline/nz-timeline.component.ts
+++ b/components/timeline/nz-timeline.component.ts
@@ -35,9 +35,9 @@ import { NzTimelineItemComponent } from './nz-timeline-item.component';
 })
 export class NzTimelineComponent implements AfterContentInit, OnDestroy {
   private _pending: string | boolean | TemplateRef<void>;
-  private isPendingString: boolean;
-  private isPendingBoolean: boolean = false;
   private timeLineSubscription: Subscription;
+  isPendingString: boolean;
+  isPendingBoolean: boolean = false;
 
   @Input()
   set nzPending(value: string | boolean | TemplateRef<void>) {
diff --git a/docs/changelog.zh-CN.md b/docs/changelog.zh-CN.md
index 9070ff61306..b2009bd1679 100755
--- a/docs/changelog.zh-CN.md
+++ b/docs/changelog.zh-CN.md
@@ -12,13 +12,64 @@ timeline: true
 * 主版本号：含有破坏性更新和新特性，不在发布周期内。
 
 ---
-##
+## 0.7.0-beta.4
+
+#### Mention
+
+- 新增 Mention 组件
 
 #### Tree
 
 - `nzTreeData` 变更为 `ngModel`, 初始化数据使用 `new NzTreeNode({})`,请参阅示例
 - 新增 `origin` 属性存储用户原始数据
-- 支持根据 `NzTreeComponent` 上下文获取NzTreeService
+- 支持根据 `NzTreeComponent` 上下文获取 `NzTreeService`
+
+#### Table
+
+- 修复计算滚动条宽度导致的重绘问题
+- 修复过滤器高亮问题
+
+#### Message
+
+- 修复动态创建时报错的问题
+
+#### Notification
+
+- 修复动态创建时报错的问题
+
+#### Card
+
+- 修复了 `card-meta` 的对齐问题
+
+#### Transfer
+
+- 修复了 Transfer 在 OnPush 下使用的问题
+
+#### Select
+
+- 修复 `nzValue` 值为 0 不能选中的问题
+- 修复滚动条定位的问题
+
+#### Carousel
+
+- 修复自动播放的问题
+
+#### Menu
+
+- 修复动态修改结构时 `ExpressionChangedAfterItHasBeenCheckedError` 的问题
+
+#### i18n
+
+- 更详细的描述了国际化的使用方式
+- 修复了未设置 i18n 时的报错
+
+#### 其他
+
+- 官网支持动态修改主题
+- 更新了 angular.cn 的网址
+- 更新了 `Upload` 组件的说明
+- 更新了 `Tree` 组件的说明
+
 
 ## 0.7.0-beta.3
 
@@ -27,7 +78,7 @@ timeline: true
 - 支持拖拽文件夹前 `beforeDrop` 进行确认的API
 
 #### Modal
- 
+
 - 支持手动触发 `nzOnOk` 与 `nzOnCancel` 的方法
 
 #### Cascader
diff --git a/package.json b/package.json
index deae0e1a96c..e6cf4319c5a 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ng-zorro-antd",
-  "version": "0.7.0-beta.3",
+  "version": "0.7.0-beta.4",
   "license": "MIT",
   "description": "An enterprise-class UI components based on Ant Design and Angular",
   "scripts": {
diff --git a/site_scripts/_site/src/index.html b/site_scripts/_site/src/index.html
index 872e79da169..4c7f7690b3c 100644
--- a/site_scripts/_site/src/index.html
+++ b/site_scripts/_site/src/index.html
@@ -39,6 +39,14 @@
         }
       }(window.location))
     </script>
+    <!-- Global site tag (gtag.js) - Google Analytics -->
+    <script async src="https://www.googletagmanager.com/gtag/js?id=UA-52892298-2"></script>
+    <script>
+      window.dataLayer = window.dataLayer || [];
+      function gtag(){dataLayer.push(arguments);}
+      gtag('js', new Date());
 
+      gtag('config', 'UA-52892298-2');
+    </script>
   </body>
 </html>