From ecd50b8f8dc329903b2784b855d58ff44fc8bad3 Mon Sep 17 00:00:00 2001
From: The Gitter Badger
Date: Mon, 31 Oct 2016 01:21:53 +0000
Subject: [PATCH 1/4] Add Gitter badge
---
README.md | 2 ++
1 file changed, 2 insertions(+)
diff --git a/README.md b/README.md
index 60502cc2..b54def4c 100644
--- a/README.md
+++ b/README.md
@@ -6,6 +6,8 @@
# iView [](https://travis-ci.org/iview/iview) [](https://www.npmjs.org/package/iview) [](https://npmjs.org/package/iview)
+[](https://gitter.im/iview/iview?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+
### A high quality UI Components Library with Vue.js
## Docs
From b6af9572d74aa0e9d8fe711aac3fa0c469321d3b Mon Sep 17 00:00:00 2001
From: Aresn
Date: Mon, 31 Oct 2016 09:27:16 +0800
Subject: [PATCH 2/4] add gitter.im
add gitter.im
---
README.md | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/README.md b/README.md
index b54def4c..04b3aa62 100644
--- a/README.md
+++ b/README.md
@@ -4,9 +4,7 @@
-# iView [](https://travis-ci.org/iview/iview) [](https://www.npmjs.org/package/iview) [](https://npmjs.org/package/iview)
-
-[](https://gitter.im/iview/iview?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+# iView [](https://travis-ci.org/iview/iview) [](https://www.npmjs.org/package/iview) [](https://npmjs.org/package/iview) [](https://gitter.im/iview/iview?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
### A high quality UI Components Library with Vue.js
From 3336334ea27f591f1440e810c0f5f4728f1dbc06 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E7=81=8F?=
Date: Mon, 31 Oct 2016 10:58:11 +0800
Subject: [PATCH 3/4] =?UTF-8?q?Support=20IE9=E3=80=8110=E3=80=8111?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Support IE9、10、11
---
package.json | 2 +-
src/components/modal/modal.vue | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/package.json b/package.json
index c228ac19..fcca4c59 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "iview",
- "version": "0.9.5",
+ "version": "0.9.6",
"title": "iView",
"description": "A high quality UI components Library with Vue.js",
"homepage": "http://www.iviewui.com",
diff --git a/src/components/modal/modal.vue b/src/components/modal/modal.vue
index c7891941..bd66c860 100644
--- a/src/components/modal/modal.vue
+++ b/src/components/modal/modal.vue
@@ -2,7 +2,7 @@
-
+
From e3a12bd330384eee9a1b67d7077b723828b52ba1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E7=81=8F?=
Date: Mon, 31 Oct 2016 11:01:42 +0800
Subject: [PATCH 4/4] bug fixed
bug fixed
---
package.json | 2 +-
src/components/base/notification/notice.vue | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/package.json b/package.json
index fcca4c59..544da812 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "iview",
- "version": "0.9.6",
+ "version": "0.9.7-rc-1",
"title": "iView",
"description": "A high quality UI components Library with Vue.js",
"homepage": "http://www.iviewui.com",
diff --git a/src/components/base/notification/notice.vue b/src/components/base/notification/notice.vue
index e1308a71..874dabb7 100644
--- a/src/components/base/notification/notice.vue
+++ b/src/components/base/notification/notice.vue
@@ -1,7 +1,7 @@