Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

use date.toLocaleDateString to format year/month #2097

Merged
merged 3 commits into from Oct 23, 2017

Conversation

SergioCrisostomo
Copy link
Contributor

@SergioCrisostomo SergioCrisostomo commented Oct 15, 2017

This changes how Date picker label is displayed.

With this change the text for month year comes from JavaScript Date.prototype.toLocaleString() combined with the locale file i.datepicker.datePanelLabel.

What we can configure is the format following this pattern:

yyyy - 4 digit year
m - month, numeric, 1 - 12
mm - month, numeric, 01 - 12
mmm - month, 3 letters, as in toLocaleDateString
Mmm - month, 3 letters, capitalize the return from toLocaleDateString
mmmm - month, full name, as in toLocaleDateString
Mmmm - month, full name, capitalize the return from toLocaleDateString

The [...] indicates the month or year field that will be used as target for the @click events.

Examples:

  • zn-CN format: '[yyyy年] [m月]'
  • zh-PT format: '[mmmm] de [yyyy]'
  • vi-VN format: '[Tháng mm]/[yyyy]'

@SergioCrisostomo
Copy link
Contributor Author

SergioCrisostomo commented Oct 16, 2017

@dspangenberg, @MatiasVerdier, @LekisS, @IndraGunawan, @dokenzy, @explosivebit, @ndrshn, @hckhanh

Please give me some help: the DatePicker label needs some adjustment for i18n.

Could you please check and let me know what would be the correct/expected format in your language: https://jsfiddle.net/Sergio_fiddle/tf89oa79/9/ ?

skarmavbild 2017-10-16 kl 11 53 20

@IndraGunawan
Copy link
Contributor

id-ID format MMMM yyyy

@dspangenberg
Copy link
Contributor

de-DE: MMMM yyyy is correct

@LekisS
Copy link
Contributor

LekisS commented Oct 16, 2017

fr-FR: MMMM yyyy

@MatiasVerdier
Copy link
Contributor

es-ES: MMMM yyyy is correct

@ndrshn
Copy link
Contributor

ndrshn commented Oct 16, 2017

tr-TR: MMMM yyyy is correct

@dokenzy
Copy link
Contributor

dokenzy commented Oct 16, 2017 via email

@hckhanh
Copy link
Contributor

hckhanh commented Oct 17, 2017 via email

@explosivebit
Copy link
Contributor

ru-RU: MMMM yyyy is correct

@explosivebit
Copy link
Contributor

I'm sorry, that's the correct MMM format yyyy

@SergioCrisostomo
Copy link
Contributor Author

@explosivebit just to clearify what would the month now be:

a) октябрь 2017
b) Oктябрь 2017
c) Окт 2017
d) окт 2017

@explosivebit
Copy link
Contributor

b) Oктябрь 2017

@icarusion icarusion merged commit f672ae0 into iview:2.0 Oct 23, 2017
@icarusion
Copy link
Contributor

@SergioCrisostomo i found that [m] is begin at 0, so, my country is displayed 9, it should be 10, could you have a check?

@dokenzy
Copy link
Contributor

dokenzy commented Oct 23, 2017

I'm sorry I made a mistake. In ko-KR, 'yyyy년 m월' is correct.

BTW,
m - month, numeric, 1 - 12
m - month, numeric, 01 - 12
what's diffent between first 'm' and second 'm'? Isn't second one 'mm'?

@SergioCrisostomo
Copy link
Contributor Author

@icarusion sorry for that, fix suggested in #2170.
@dokenzy yes, should be mm, fix suggested in #2170, thanks!

krislavten added a commit to baishancloud/iview-bsc that referenced this pull request Oct 24, 2017
commit 7053de4
Author: 梁灏 <admin@aresn.com>
Date:   Tue Oct 24 09:52:42 2017 +0800

    update demo

commit c61015d
Merge: a5f4a1d 65255c9
Author: Aresn <admin@aresn.com>
Date:   Mon Oct 23 20:22:51 2017 -0500

    Merge pull request iview#2172 from SergioCrisostomo/fix-2164

    format string dates in daterange also

commit a5f4a1d
Author: 梁灏 <admin@aresn.com>
Date:   Mon Oct 23 23:08:40 2017 +0800

    fixed iview#1922

commit 65255c9
Author: Sergio Crisostomo <sergiosbox@gmail.com>
Date:   Mon Oct 23 15:53:12 2017 +0200

    fix date formatting when strings are supplied to DatePicker

commit 6c634aa
Author: 梁灏 <admin@aresn.com>
Date:   Mon Oct 23 19:01:47 2017 +0800

    fixed iview#2078

commit c2d74ec
Author: 梁灏 <admin@aresn.com>
Date:   Mon Oct 23 18:26:42 2017 +0800

    fixed iview#2100

commit b92a1b5
Merge: 6261a49 3ed12b4
Author: Aresn <admin@aresn.com>
Date:   Mon Oct 23 04:22:44 2017 -0500

    Merge pull request iview#2170 from SergioCrisostomo/use-locale-formated-year-month

    Correct month calculation and add specs for date-picker labels

commit 6261a49
Merge: a1553a9 7afb406
Author: Aresn <admin@aresn.com>
Date:   Mon Oct 23 04:19:11 2017 -0500

    Merge pull request iview#2171 from iview/pr/2124

    update Tag style for check

commit a1553a9
Merge: 5064c7b fd79f10
Author: Aresn <admin@aresn.com>
Date:   Mon Oct 23 04:17:50 2017 -0500

    Merge pull request iview#2124 from daiyanze/feature/checkable_tag

    Feature/checkable tag (追加功能:可选标签)

commit 7afb406
Author: 梁灏 <admin@aresn.com>
Date:   Mon Oct 23 17:14:29 2017 +0800

    update Tag style for check

commit 3ed12b4
Author: Sergio Crisostomo <sergiosbox@gmail.com>
Date:   Mon Oct 23 11:13:06 2017 +0200

    Correct month calculation and add specs for date-picker labels

commit fd79f10
Author: Aresn <admin@aresn.com>
Date:   Mon Oct 23 03:57:05 2017 -0500

    Update tag.vue

commit 5064c7b
Author: 梁灏 <admin@aresn.com>
Date:   Mon Oct 23 16:52:30 2017 +0800

    update ja-JP

commit 4c6d996
Author: Aresn <admin@aresn.com>
Date:   Mon Oct 23 03:40:39 2017 -0500

    Update tag.vue

commit b75ad4a
Author: 梁灏 <admin@aresn.com>
Date:   Mon Oct 23 14:12:02 2017 +0800

    fixed iview#1700

commit 6ed0cd7
Author: 梁灏 <admin@aresn.com>
Date:   Mon Oct 23 11:55:35 2017 +0800

    update Tree demo

commit 0e31618
Author: 梁灏 <admin@aresn.com>
Date:   Mon Oct 23 11:00:20 2017 +0800

    update demo

commit ba1422c
Author: 梁灏 <admin@aresn.com>
Date:   Mon Oct 23 09:52:56 2017 +0800

    update zh-TW

commit f672ae0
Merge: 0f65109 2537c26
Author: Aresn <admin@aresn.com>
Date:   Sun Oct 22 20:29:51 2017 -0500

    Merge pull request iview#2097 from SergioCrisostomo/use-locale-formated-year-month

    use date.toLocaleDateString to format year/month

commit 0f65109
Author: 梁灏 <admin@aresn.com>
Date:   Mon Oct 23 09:26:41 2017 +0800

    update

commit a730a84
Author: 梁灏 <admin@aresn.com>
Date:   Fri Oct 20 17:44:58 2017 +0800

    update Tabs

commit ec1a5e2
Merge: 758bd76 be3fbd2
Author: Aresn <admin@aresn.com>
Date:   Fri Oct 20 04:38:28 2017 -0500

    Merge pull request iview#2156 from marxy/tabs-scroll

    Tabs add scroll

commit 758bd76
Merge: 45103ca e15746f
Author: 梁灏 <admin@aresn.com>
Date:   Fri Oct 20 16:56:33 2017 +0800

    Merge branch '2.0' of https://github.com/iview/iview into 2.0

commit 45103ca
Author: 梁灏 <admin@aresn.com>
Date:   Fri Oct 20 16:53:59 2017 +0800

    fixed iview#2066

commit be3fbd2
Author: marxy <334905044@qq.com>
Date:   Fri Oct 20 16:30:44 2017 +0800

    Tabs add scroll

commit e15746f
Author: Aresn <admin@aresn.com>
Date:   Fri Oct 20 03:18:08 2017 -0500

    update dependence

commit 485a903
Author: 梁灏 <admin@aresn.com>
Date:   Fri Oct 20 15:36:43 2017 +0800

    fixed iview#2149

commit cbe5ccf
Merge: 11baa9a 437b805
Author: Aresn <admin@aresn.com>
Date:   Thu Oct 19 22:47:33 2017 -0500

    Merge pull request iview#2114 from SergioCrisostomo/improve-csv

    Improve export to CSV functionality

commit 11baa9a
Merge: 2e8add2 a3336b3
Author: Aresn <admin@aresn.com>
Date:   Thu Oct 19 05:45:31 2017 -0500

    Merge pull request iview#2136 from SergioCrisostomo/fix-scroll-event

    add missing event in callback

commit a3336b3
Author: Sergio Crisostomo <sergiosbox@gmail.com>
Date:   Thu Oct 19 10:41:19 2017 +0200

    add missing event in callback

commit 62bf2b3
Author: daiyanze <ginoalex8964@yahoo.com>
Date:   Wed Oct 18 17:21:52 2017 +0900

    Modify: example of tags

commit dc39cc3
Author: daiyanze <ginoalex8964@yahoo.com>
Date:   Wed Oct 18 17:13:06 2017 +0900

    Feature: Checkable tag

commit 2e8add2
Author: 梁灏 <admin@aresn.com>
Date:   Wed Oct 18 08:58:16 2017 +0800

    release 2.5.1

commit 95dfbe1
Merge: 3c6d8ea 5d1c24c
Author: Aresn <admin@aresn.com>
Date:   Tue Oct 17 19:52:02 2017 -0500

    Merge pull request iview#2120 from SergioCrisostomo/fix-2119

    correct behaviour when initialising date-picker with a empty string

commit 5d1c24c
Author: Sergio Crisostomo <sergiosbox@gmail.com>
Date:   Tue Oct 17 15:13:42 2017 +0200

    correct behaviour when initialising date-picker with a empty string

commit 2537c26
Author: Sergio Crisostomo <sergiosbox@gmail.com>
Date:   Tue Oct 17 14:26:12 2017 +0200

    add dateLabel to time panel

commit b27858d
Author: Sergio Crisostomo <sergiosbox@gmail.com>
Date:   Tue Oct 17 13:09:04 2017 +0200

    add date panel label format logic

commit 3d50db5
Author: Sergio Crisostomo <sergiosbox@gmail.com>
Date:   Tue Oct 17 12:25:36 2017 +0200

    add datePanelLabel format in locale files

commit 437b805
Author: Sergio Crisostomo <sergiosbox@gmail.com>
Date:   Tue Oct 17 10:14:10 2017 +0200

    Added Table to CSV example and tests

commit fb84799
Author: Sergio Crisostomo <sergiosbox@gmail.com>
Date:   Tue Oct 17 10:13:54 2017 +0200

    Improve export to CSV functionality

     - added`callback`option so we can get CSV data in case we do not want
    to download
     - added options:
        - `quoted` for cases when we have line breaks in content
        - `separator` for cases when we have commas in content

commit 3c6d8ea
Author: 梁灏 <admin@aresn.com>
Date:   Tue Oct 17 16:09:11 2017 +0800

    release 2.5.0

commit 61d1637
Author: 梁灏 <admin@aresn.com>
Date:   Mon Oct 16 20:45:46 2017 +0800

    publish 2.5.0-beta.2

commit 78b46fa
Author: 梁灏 <admin@aresn.com>
Date:   Mon Oct 16 20:41:13 2017 +0800

    Scroll add local loading-text

commit 109465d
Author: 梁灏 <admin@aresn.com>
Date:   Mon Oct 16 20:10:21 2017 +0800

    optimize  Scroll scroll behavior

commit 6850c1d
Author: 梁灏 <admin@aresn.com>
Date:   Mon Oct 16 18:32:47 2017 +0800

    Scroll add `height` prop

commit 7462478
Author: 梁灏 <admin@aresn.com>
Date:   Mon Oct 16 16:05:06 2017 +0800

    publish 2.5.0-beta.1

commit 8c2e53e
Merge: f180098 af6a7c4
Author: Aresn <admin@aresn.com>
Date:   Mon Oct 16 02:54:57 2017 -0500

    Merge pull request iview#2069 from dspangenberg/2.0

    DatePicker: weekStartDay did not influence the order of the weekdays in the header

commit af6a7c4
Author: Danny Spangenberg <danny.spangenberg@twiceware.de>
Date:   Wed Oct 11 17:38:03 2017 +0200

    weekStartDay did not influence the order of the weekdays in the header
krislavten added a commit to baishancloud/iview-bsc that referenced this pull request Nov 2, 2017
commit 427dd34
Author: 梁灏 <admin@aresn.com>
Date:   Thu Nov 2 18:23:10 2017 +0800

    update issue guide

commit 0819648
Merge: 470930e d1f698c
Author: Aresn <admin@aresn.com>
Date:   Wed Nov 1 04:03:17 2017 -0500

    Merge pull request iview#2274 from yangdan8/patch-2

    Modal弹窗请添加on-visible-change给外部api访问

commit d1f698c
Author: yangdan8 <13532023084@139.com>
Date:   Wed Nov 1 15:12:12 2017 +0800

    Modal弹窗请添加on-visible-change给外部api访问

    Modal弹窗请添加on-visible-change给外部api访问

commit 470930e
Author: 梁灏 <admin@aresn.com>
Date:   Tue Oct 31 14:15:00 2017 +0800

    update issue template

commit d44e817
Author: 梁灏 <admin@aresn.com>
Date:   Tue Oct 31 10:33:50 2017 +0800

    update Readme

commit 1a1f7c3
Merge: 75fa706 915e06d
Author: 梁灏 <admin@aresn.com>
Date:   Mon Oct 30 16:09:25 2017 +0800

    Merge branch '2.0' of https://github.com/iview/iview into 2.0

commit 75fa706
Author: 梁灏 <admin@aresn.com>
Date:   Mon Oct 30 16:01:18 2017 +0800

    update tabs demo

commit 915e06d
Merge: 1231c1a 3be0aa1
Author: Aresn <admin@aresn.com>
Date:   Mon Oct 30 03:01:06 2017 -0500

    Merge pull request iview#2230 from cheng-kang/2.0

    fix issue iview#1846

commit 1231c1a
Merge: 5a83c4a 0c0683e
Author: Aresn <admin@aresn.com>
Date:   Mon Oct 30 02:46:05 2017 -0500

    Merge pull request iview#2018 from Baoyx007/patch-1

    feat(form) : support promise for validate method iview#1857

commit 3be0aa1
Author: Kang Cheng <me@chengkang.pw>
Date:   Mon Oct 30 00:33:31 2017 -0700

    Import custom MutationObserver; remove mutation observer before component get destroyed

commit 5a83c4a
Merge: 7a9f6b2 b30250a
Author: Aresn <admin@aresn.com>
Date:   Mon Oct 30 01:40:31 2017 -0500

    Merge pull request iview#2223 from chavyleung/2.0

    fixed: iview#2219 & ColorPicker icon position

commit 7988575
Author: Kang Cheng <me@chengkang.pw>
Date:   Sun Oct 29 15:39:45 2017 -0700

    fix issue iview#1846

commit b30250a
Author: Chavy <chavyleung@163.com>
Date:   Sat Oct 28 11:57:38 2017 +0800

    fixed: iview#2219 & ColorPicker icon position

commit 7a9f6b2
Merge: 7d25930 a892ba6
Author: Aresn <admin@aresn.com>
Date:   Fri Oct 27 02:22:16 2017 -0500

    Merge pull request iview#2213 from SergioCrisostomo/fix-number-input

    prevent firing change when typing numbers < min

commit a892ba6
Author: Sergio Crisostomo <sergiosbox@gmail.com>
Date:   Fri Oct 27 08:40:11 2017 +0200

    prevent firing change when typing numbers < min

commit 7d25930
Author: 梁灏 <admin@aresn.com>
Date:   Thu Oct 26 14:47:54 2017 +0800

    release 2.6.0

commit f673ca4
Author: 梁灏 <admin@aresn.com>
Date:   Thu Oct 26 14:18:07 2017 +0800

    publish 2.6.0 beta

commit 86cdfb8
Merge: 252717e 19ad5f4
Author: Aresn <admin@aresn.com>
Date:   Thu Oct 26 00:14:52 2017 -0500

    Merge pull request iview#2194 from SergioCrisostomo/add-scroll-distance-to-edge

    add distance-to-edge property

commit 19ad5f4
Author: Aresn <admin@aresn.com>
Date:   Thu Oct 26 00:14:36 2017 -0500

    Update scroll.vue

commit 252717e
Merge: 9147e63 dfae43a
Author: Aresn <admin@aresn.com>
Date:   Thu Oct 26 00:13:02 2017 -0500

    Merge pull request iview#2193 from SergioCrisostomo/fix-2191

    correct input value in filterable mode

commit 9147e63
Merge: 51939f8 cbdac01
Author: Aresn <admin@aresn.com>
Date:   Thu Oct 26 00:10:44 2017 -0500

    Merge pull request iview#2195 from yangdan8/patch-4

    Update table.vue  解决tabs切换时,tab中的table调试时控制台报$el undefined的问题

commit cbdac01
Author: Aresn <admin@aresn.com>
Date:   Thu Oct 26 00:09:42 2017 -0500

    Update table.vue

commit 51939f8
Author: 梁灏 <admin@aresn.com>
Date:   Thu Oct 26 12:55:18 2017 +0800

    update Select tag

commit 2079c47
Author: 梁灏 <admin@aresn.com>
Date:   Thu Oct 26 11:57:24 2017 +0800

    update Tag

commit 2993f4e
Author: 梁灏 <admin@aresn.com>
Date:   Thu Oct 26 11:26:05 2017 +0800

    update Tab

commit f6a787f
Author: yangdan8 <13532023084@139.com>
Date:   Thu Oct 26 09:48:47 2017 +0800

    Update table.vue

commit 72ba666
Author: Sergio Crisostomo <sergiosbox@gmail.com>
Date:   Wed Oct 25 21:21:35 2017 +0200

    add distance-to-edge property

commit dfae43a
Author: Sergio Crisostomo <sergiosbox@gmail.com>
Date:   Wed Oct 25 20:49:38 2017 +0200

    correct input value in filterable mode

commit af7d72b
Author: 梁灏 <admin@aresn.com>
Date:   Wed Oct 25 22:34:58 2017 +0800

    update Tree selected

commit 6ff0e34
Author: 梁灏 <admin@aresn.com>
Date:   Wed Oct 25 21:10:29 2017 +0800

    update Tree Render function

commit 97098fc
Author: 梁灏 <admin@aresn.com>
Date:   Wed Oct 25 19:12:14 2017 +0800

    update Tree example

commit b64204f
Author: 梁灏 <admin@aresn.com>
Date:   Wed Oct 25 17:41:37 2017 +0800

    update Tree demo

commit 174836c
Author: 梁灏 <admin@aresn.com>
Date:   Wed Oct 25 16:45:42 2017 +0800

    update Tree Render function use

commit 3ea2461
Author: 梁灏 <admin@aresn.com>
Date:   Wed Oct 25 14:33:22 2017 +0800

    update checkbox style

commit 69460a5
Merge: 8711920 610fd3a
Author: Aresn <admin@aresn.com>
Date:   Tue Oct 24 21:44:41 2017 -0500

    Merge pull request iview#2181 from lisafra/update-carousel

    Update carousel component: add loop and radiusDot property

commit 610fd3a
Author: houyl <houyl@okooo.net>
Date:   Wed Oct 25 09:30:46 2017 +0800

    [fix bug]  carousel component: remove no use code

commit 8711920
Merge: 2be2b97 692be62
Author: Aresn <admin@aresn.com>
Date:   Tue Oct 24 19:14:01 2017 -0500

    Merge pull request iview#2185 from md678685/patch-1

    Fix some English grammar in README

commit 692be62
Author: md678685 <mathew678@hotmail.co.uk>
Date:   Tue Oct 24 21:06:04 2017 +0100

    Fix some English grammar in README

    This PR changes some of the English sentences in the `README.md` to sound more natural. I have tried to keep the structure as close as possible to the original. If anything sounds confusing, please reply below.

    这个PR改变了`README.md`中的一些英文句子,使其听起来更自然。 我试图保持结构尽可能接近原来。 如有任何疑问,请在下面回覆。

commit 2be2b97
Merge: b31aab7 da76a83
Author: Aresn <admin@aresn.com>
Date:   Tue Oct 24 07:46:14 2017 -0500

    Merge pull request iview#2184 from SergioCrisostomo/fix-tree-examples

    fix dom rendering when adding new nodes in example

commit da76a83
Author: Sergio Crisostomo <sergiosbox@gmail.com>
Date:   Tue Oct 24 14:08:52 2017 +0200

    fix dom rendering problems

commit b31aab7
Author: 梁灏 <admin@aresn.com>
Date:   Tue Oct 24 18:14:22 2017 +0800

    Tree add async loading

commit 76a4781
Author: 梁灏 <admin@aresn.com>
Date:   Tue Oct 24 16:48:28 2017 +0800

    fixed iview#2128

commit ccf544d
Author: houyl <houyl@okooo.net>
Date:   Tue Oct 24 16:47:12 2017 +0800

    Merge branch 'master' of https://github.com/iview/iview into 2.0
    Update carousel component: add loop and radiusDot property
    # Conflicts:
    #	package.json
    #	src/components/date-picker/picker.vue
    #	src/components/select/select.vue

commit 9b24f1a
Author: 梁灏 <admin@aresn.com>
Date:   Tue Oct 24 16:20:09 2017 +0800

    Tree add Render function

    fixed iview#2133
    fixed iview#1784
    fixed iview#1333
    fixed iview#1362

commit ecf6c2f
Author: 梁灏 <admin@aresn.com>
Date:   Tue Oct 24 15:47:07 2017 +0800

    update dependence

commit c89e0e1
Merge: 7053de4 0a8f9b4
Author: Aresn <admin@aresn.com>
Date:   Tue Oct 24 02:44:19 2017 -0500

    Merge pull request iview#2090 from SergioCrisostomo/refactor-tree

    Refactor tree

commit 0a8f9b4
Author: Sergio Crisostomo <sergiosbox@gmail.com>
Date:   Tue Oct 24 09:30:09 2017 +0200

    Keep original data pointers and correct if clause

commit d44420b
Author: Sergio Crisostomo <sergiosbox@gmail.com>
Date:   Sat Oct 14 09:49:13 2017 +0200

    refactor and make indeterminate accessible outside tree

commit 94d177c
Author: Sergio Crisostomo <sergiosbox@gmail.com>
Date:   Sat Oct 14 09:47:33 2017 +0200

    add width to expand icon so we can click on it easier

commit 7053de4
Author: 梁灏 <admin@aresn.com>
Date:   Tue Oct 24 09:52:42 2017 +0800

    update demo

commit c61015d
Merge: a5f4a1d 65255c9
Author: Aresn <admin@aresn.com>
Date:   Mon Oct 23 20:22:51 2017 -0500

    Merge pull request iview#2172 from SergioCrisostomo/fix-2164

    format string dates in daterange also

commit a5f4a1d
Author: 梁灏 <admin@aresn.com>
Date:   Mon Oct 23 23:08:40 2017 +0800

    fixed iview#1922

commit 65255c9
Author: Sergio Crisostomo <sergiosbox@gmail.com>
Date:   Mon Oct 23 15:53:12 2017 +0200

    fix date formatting when strings are supplied to DatePicker

commit 6c634aa
Author: 梁灏 <admin@aresn.com>
Date:   Mon Oct 23 19:01:47 2017 +0800

    fixed iview#2078

commit c2d74ec
Author: 梁灏 <admin@aresn.com>
Date:   Mon Oct 23 18:26:42 2017 +0800

    fixed iview#2100

commit b92a1b5
Merge: 6261a49 3ed12b4
Author: Aresn <admin@aresn.com>
Date:   Mon Oct 23 04:22:44 2017 -0500

    Merge pull request iview#2170 from SergioCrisostomo/use-locale-formated-year-month

    Correct month calculation and add specs for date-picker labels

commit 6261a49
Merge: a1553a9 7afb406
Author: Aresn <admin@aresn.com>
Date:   Mon Oct 23 04:19:11 2017 -0500

    Merge pull request iview#2171 from iview/pr/2124

    update Tag style for check

commit a1553a9
Merge: 5064c7b fd79f10
Author: Aresn <admin@aresn.com>
Date:   Mon Oct 23 04:17:50 2017 -0500

    Merge pull request iview#2124 from daiyanze/feature/checkable_tag

    Feature/checkable tag (追加功能:可选标签)

commit 7afb406
Author: 梁灏 <admin@aresn.com>
Date:   Mon Oct 23 17:14:29 2017 +0800

    update Tag style for check

commit 3ed12b4
Author: Sergio Crisostomo <sergiosbox@gmail.com>
Date:   Mon Oct 23 11:13:06 2017 +0200

    Correct month calculation and add specs for date-picker labels

commit fd79f10
Author: Aresn <admin@aresn.com>
Date:   Mon Oct 23 03:57:05 2017 -0500

    Update tag.vue

commit 5064c7b
Author: 梁灏 <admin@aresn.com>
Date:   Mon Oct 23 16:52:30 2017 +0800

    update ja-JP

commit 4c6d996
Author: Aresn <admin@aresn.com>
Date:   Mon Oct 23 03:40:39 2017 -0500

    Update tag.vue

commit b75ad4a
Author: 梁灏 <admin@aresn.com>
Date:   Mon Oct 23 14:12:02 2017 +0800

    fixed iview#1700

commit 6ed0cd7
Author: 梁灏 <admin@aresn.com>
Date:   Mon Oct 23 11:55:35 2017 +0800

    update Tree demo

commit 0e31618
Author: 梁灏 <admin@aresn.com>
Date:   Mon Oct 23 11:00:20 2017 +0800

    update demo

commit ba1422c
Author: 梁灏 <admin@aresn.com>
Date:   Mon Oct 23 09:52:56 2017 +0800

    update zh-TW

commit f672ae0
Merge: 0f65109 2537c26
Author: Aresn <admin@aresn.com>
Date:   Sun Oct 22 20:29:51 2017 -0500

    Merge pull request iview#2097 from SergioCrisostomo/use-locale-formated-year-month

    use date.toLocaleDateString to format year/month

commit 0f65109
Author: 梁灏 <admin@aresn.com>
Date:   Mon Oct 23 09:26:41 2017 +0800

    update

commit a730a84
Author: 梁灏 <admin@aresn.com>
Date:   Fri Oct 20 17:44:58 2017 +0800

    update Tabs

commit ec1a5e2
Merge: 758bd76 be3fbd2
Author: Aresn <admin@aresn.com>
Date:   Fri Oct 20 04:38:28 2017 -0500

    Merge pull request iview#2156 from marxy/tabs-scroll

    Tabs add scroll

commit 758bd76
Merge: 45103ca e15746f
Author: 梁灏 <admin@aresn.com>
Date:   Fri Oct 20 16:56:33 2017 +0800

    Merge branch '2.0' of https://github.com/iview/iview into 2.0

commit 45103ca
Author: 梁灏 <admin@aresn.com>
Date:   Fri Oct 20 16:53:59 2017 +0800

    fixed iview#2066

commit be3fbd2
Author: marxy <334905044@qq.com>
Date:   Fri Oct 20 16:30:44 2017 +0800

    Tabs add scroll

commit e15746f
Author: Aresn <admin@aresn.com>
Date:   Fri Oct 20 03:18:08 2017 -0500

    update dependence

commit 485a903
Author: 梁灏 <admin@aresn.com>
Date:   Fri Oct 20 15:36:43 2017 +0800

    fixed iview#2149

commit cbe5ccf
Merge: 11baa9a 437b805
Author: Aresn <admin@aresn.com>
Date:   Thu Oct 19 22:47:33 2017 -0500

    Merge pull request iview#2114 from SergioCrisostomo/improve-csv

    Improve export to CSV functionality

commit 11baa9a
Merge: 2e8add2 a3336b3
Author: Aresn <admin@aresn.com>
Date:   Thu Oct 19 05:45:31 2017 -0500

    Merge pull request iview#2136 from SergioCrisostomo/fix-scroll-event

    add missing event in callback

commit a3336b3
Author: Sergio Crisostomo <sergiosbox@gmail.com>
Date:   Thu Oct 19 10:41:19 2017 +0200

    add missing event in callback

commit 62bf2b3
Author: daiyanze <ginoalex8964@yahoo.com>
Date:   Wed Oct 18 17:21:52 2017 +0900

    Modify: example of tags

commit dc39cc3
Author: daiyanze <ginoalex8964@yahoo.com>
Date:   Wed Oct 18 17:13:06 2017 +0900

    Feature: Checkable tag

commit 2e8add2
Author: 梁灏 <admin@aresn.com>
Date:   Wed Oct 18 08:58:16 2017 +0800

    release 2.5.1

commit 95dfbe1
Merge: 3c6d8ea 5d1c24c
Author: Aresn <admin@aresn.com>
Date:   Tue Oct 17 19:52:02 2017 -0500

    Merge pull request iview#2120 from SergioCrisostomo/fix-2119

    correct behaviour when initialising date-picker with a empty string

commit 5d1c24c
Author: Sergio Crisostomo <sergiosbox@gmail.com>
Date:   Tue Oct 17 15:13:42 2017 +0200

    correct behaviour when initialising date-picker with a empty string

commit 2537c26
Author: Sergio Crisostomo <sergiosbox@gmail.com>
Date:   Tue Oct 17 14:26:12 2017 +0200

    add dateLabel to time panel

commit b27858d
Author: Sergio Crisostomo <sergiosbox@gmail.com>
Date:   Tue Oct 17 13:09:04 2017 +0200

    add date panel label format logic

commit 3d50db5
Author: Sergio Crisostomo <sergiosbox@gmail.com>
Date:   Tue Oct 17 12:25:36 2017 +0200

    add datePanelLabel format in locale files

commit 437b805
Author: Sergio Crisostomo <sergiosbox@gmail.com>
Date:   Tue Oct 17 10:14:10 2017 +0200

    Added Table to CSV example and tests

commit fb84799
Author: Sergio Crisostomo <sergiosbox@gmail.com>
Date:   Tue Oct 17 10:13:54 2017 +0200

    Improve export to CSV functionality

     - added`callback`option so we can get CSV data in case we do not want
    to download
     - added options:
        - `quoted` for cases when we have line breaks in content
        - `separator` for cases when we have commas in content

commit 3c6d8ea
Author: 梁灏 <admin@aresn.com>
Date:   Tue Oct 17 16:09:11 2017 +0800

    release 2.5.0

commit 61d1637
Author: 梁灏 <admin@aresn.com>
Date:   Mon Oct 16 20:45:46 2017 +0800

    publish 2.5.0-beta.2

commit 78b46fa
Author: 梁灏 <admin@aresn.com>
Date:   Mon Oct 16 20:41:13 2017 +0800

    Scroll add local loading-text

commit 109465d
Author: 梁灏 <admin@aresn.com>
Date:   Mon Oct 16 20:10:21 2017 +0800

    optimize  Scroll scroll behavior

commit 6850c1d
Author: 梁灏 <admin@aresn.com>
Date:   Mon Oct 16 18:32:47 2017 +0800

    Scroll add `height` prop

commit 7462478
Author: 梁灏 <admin@aresn.com>
Date:   Mon Oct 16 16:05:06 2017 +0800

    publish 2.5.0-beta.1

commit 8c2e53e
Merge: f180098 af6a7c4
Author: Aresn <admin@aresn.com>
Date:   Mon Oct 16 02:54:57 2017 -0500

    Merge pull request iview#2069 from dspangenberg/2.0

    DatePicker: weekStartDay did not influence the order of the weekdays in the header

commit af6a7c4
Author: Danny Spangenberg <danny.spangenberg@twiceware.de>
Date:   Wed Oct 11 17:38:03 2017 +0200

    weekStartDay did not influence the order of the weekdays in the header

commit 0c0683e
Author: Haven <baoyx007@gmail.com>
Date:   Thu Sep 28 00:40:16 2017 -0500

    feat(form) : support promise for validate method iview#1857
krislavten added a commit to baishancloud/iview-bsc that referenced this pull request Nov 6, 2017
commit 9af3d87
Author: lan <adwerrd@hotmail.com>
Date:   Mon Nov 6 10:40:32 2017 +0800

    radio adn switch dark

commit 914a145
Author: xiaoyu <852483353@qq.com>
Date:   Sat Nov 4 17:27:07 2017 +0800

    slider dark

commit 83c7b53
Author: xiaoyu <852483353@qq.com>
Date:   Sat Nov 4 17:03:22 2017 +0800

    progress dark

commit 85c812f
Author: xiaoyu <852483353@qq.com>
Date:   Sat Nov 4 13:58:21 2017 +0800

    tooltip dark

commit 664d022
Author: xiaoyu <852483353@qq.com>
Date:   Sat Nov 4 11:48:41 2017 +0800

    poptip dark

commit d02a4fa
Author: xiaoyu <852483353@qq.com>
Date:   Fri Nov 3 20:28:18 2017 +0800

    spin dark

commit bb38adf
Author: xiaoyu <852483353@qq.com>
Date:   Fri Nov 3 19:19:17 2017 +0800

    tabs dark

commit 90713f1
Author: xiaoyu <852483353@qq.com>
Date:   Fri Nov 3 16:55:08 2017 +0800

    tag dark

commit ba22112
Author: xiaoyu <852483353@qq.com>
Date:   Fri Nov 3 16:18:17 2017 +0800

    input-number dark

commit ef06cf2
Author: xiaoyu <852483353@qq.com>
Date:   Fri Nov 3 15:18:32 2017 +0800

    input dark

commit bbc598f
Author: lan <adwerrd@hotmail.com>
Date:   Thu Nov 2 19:44:57 2017 +0800

    version change

commit 4f84332
Author: lan <adwerrd@hotmail.com>
Date:   Thu Nov 2 19:43:52 2017 +0800

    switch bugfix

commit 99d0b55
Author: lan <adwerrd@hotmail.com>
Date:   Thu Nov 2 19:43:16 2017 +0800

    Squashed commit of the following:

    commit 427dd34
    Author: 梁灏 <admin@aresn.com>
    Date:   Thu Nov 2 18:23:10 2017 +0800

        update issue guide

    commit 0819648
    Merge: 470930e d1f698c
    Author: Aresn <admin@aresn.com>
    Date:   Wed Nov 1 04:03:17 2017 -0500

        Merge pull request iview#2274 from yangdan8/patch-2

        Modal弹窗请添加on-visible-change给外部api访问

    commit d1f698c
    Author: yangdan8 <13532023084@139.com>
    Date:   Wed Nov 1 15:12:12 2017 +0800

        Modal弹窗请添加on-visible-change给外部api访问

        Modal弹窗请添加on-visible-change给外部api访问

    commit 470930e
    Author: 梁灏 <admin@aresn.com>
    Date:   Tue Oct 31 14:15:00 2017 +0800

        update issue template

    commit d44e817
    Author: 梁灏 <admin@aresn.com>
    Date:   Tue Oct 31 10:33:50 2017 +0800

        update Readme

    commit 1a1f7c3
    Merge: 75fa706 915e06d
    Author: 梁灏 <admin@aresn.com>
    Date:   Mon Oct 30 16:09:25 2017 +0800

        Merge branch '2.0' of https://github.com/iview/iview into 2.0

    commit 75fa706
    Author: 梁灏 <admin@aresn.com>
    Date:   Mon Oct 30 16:01:18 2017 +0800

        update tabs demo

    commit 915e06d
    Merge: 1231c1a 3be0aa1
    Author: Aresn <admin@aresn.com>
    Date:   Mon Oct 30 03:01:06 2017 -0500

        Merge pull request iview#2230 from cheng-kang/2.0

        fix issue iview#1846

    commit 1231c1a
    Merge: 5a83c4a 0c0683e
    Author: Aresn <admin@aresn.com>
    Date:   Mon Oct 30 02:46:05 2017 -0500

        Merge pull request iview#2018 from Baoyx007/patch-1

        feat(form) : support promise for validate method iview#1857

    commit 3be0aa1
    Author: Kang Cheng <me@chengkang.pw>
    Date:   Mon Oct 30 00:33:31 2017 -0700

        Import custom MutationObserver; remove mutation observer before component get destroyed

    commit 5a83c4a
    Merge: 7a9f6b2 b30250a
    Author: Aresn <admin@aresn.com>
    Date:   Mon Oct 30 01:40:31 2017 -0500

        Merge pull request iview#2223 from chavyleung/2.0

        fixed: iview#2219 & ColorPicker icon position

    commit 7988575
    Author: Kang Cheng <me@chengkang.pw>
    Date:   Sun Oct 29 15:39:45 2017 -0700

        fix issue iview#1846

    commit b30250a
    Author: Chavy <chavyleung@163.com>
    Date:   Sat Oct 28 11:57:38 2017 +0800

        fixed: iview#2219 & ColorPicker icon position

    commit 7a9f6b2
    Merge: 7d25930 a892ba6
    Author: Aresn <admin@aresn.com>
    Date:   Fri Oct 27 02:22:16 2017 -0500

        Merge pull request iview#2213 from SergioCrisostomo/fix-number-input

        prevent firing change when typing numbers < min

    commit a892ba6
    Author: Sergio Crisostomo <sergiosbox@gmail.com>
    Date:   Fri Oct 27 08:40:11 2017 +0200

        prevent firing change when typing numbers < min

    commit 7d25930
    Author: 梁灏 <admin@aresn.com>
    Date:   Thu Oct 26 14:47:54 2017 +0800

        release 2.6.0

    commit f673ca4
    Author: 梁灏 <admin@aresn.com>
    Date:   Thu Oct 26 14:18:07 2017 +0800

        publish 2.6.0 beta

    commit 86cdfb8
    Merge: 252717e 19ad5f4
    Author: Aresn <admin@aresn.com>
    Date:   Thu Oct 26 00:14:52 2017 -0500

        Merge pull request iview#2194 from SergioCrisostomo/add-scroll-distance-to-edge

        add distance-to-edge property

    commit 19ad5f4
    Author: Aresn <admin@aresn.com>
    Date:   Thu Oct 26 00:14:36 2017 -0500

        Update scroll.vue

    commit 252717e
    Merge: 9147e63 dfae43a
    Author: Aresn <admin@aresn.com>
    Date:   Thu Oct 26 00:13:02 2017 -0500

        Merge pull request iview#2193 from SergioCrisostomo/fix-2191

        correct input value in filterable mode

    commit 9147e63
    Merge: 51939f8 cbdac01
    Author: Aresn <admin@aresn.com>
    Date:   Thu Oct 26 00:10:44 2017 -0500

        Merge pull request iview#2195 from yangdan8/patch-4

        Update table.vue  解决tabs切换时,tab中的table调试时控制台报$el undefined的问题

    commit cbdac01
    Author: Aresn <admin@aresn.com>
    Date:   Thu Oct 26 00:09:42 2017 -0500

        Update table.vue

    commit 51939f8
    Author: 梁灏 <admin@aresn.com>
    Date:   Thu Oct 26 12:55:18 2017 +0800

        update Select tag

    commit 2079c47
    Author: 梁灏 <admin@aresn.com>
    Date:   Thu Oct 26 11:57:24 2017 +0800

        update Tag

    commit 2993f4e
    Author: 梁灏 <admin@aresn.com>
    Date:   Thu Oct 26 11:26:05 2017 +0800

        update Tab

    commit f6a787f
    Author: yangdan8 <13532023084@139.com>
    Date:   Thu Oct 26 09:48:47 2017 +0800

        Update table.vue

    commit 72ba666
    Author: Sergio Crisostomo <sergiosbox@gmail.com>
    Date:   Wed Oct 25 21:21:35 2017 +0200

        add distance-to-edge property

    commit dfae43a
    Author: Sergio Crisostomo <sergiosbox@gmail.com>
    Date:   Wed Oct 25 20:49:38 2017 +0200

        correct input value in filterable mode

    commit af7d72b
    Author: 梁灏 <admin@aresn.com>
    Date:   Wed Oct 25 22:34:58 2017 +0800

        update Tree selected

    commit 6ff0e34
    Author: 梁灏 <admin@aresn.com>
    Date:   Wed Oct 25 21:10:29 2017 +0800

        update Tree Render function

    commit 97098fc
    Author: 梁灏 <admin@aresn.com>
    Date:   Wed Oct 25 19:12:14 2017 +0800

        update Tree example

    commit b64204f
    Author: 梁灏 <admin@aresn.com>
    Date:   Wed Oct 25 17:41:37 2017 +0800

        update Tree demo

    commit 174836c
    Author: 梁灏 <admin@aresn.com>
    Date:   Wed Oct 25 16:45:42 2017 +0800

        update Tree Render function use

    commit 3ea2461
    Author: 梁灏 <admin@aresn.com>
    Date:   Wed Oct 25 14:33:22 2017 +0800

        update checkbox style

    commit 69460a5
    Merge: 8711920 610fd3a
    Author: Aresn <admin@aresn.com>
    Date:   Tue Oct 24 21:44:41 2017 -0500

        Merge pull request iview#2181 from lisafra/update-carousel

        Update carousel component: add loop and radiusDot property

    commit 610fd3a
    Author: houyl <houyl@okooo.net>
    Date:   Wed Oct 25 09:30:46 2017 +0800

        [fix bug]  carousel component: remove no use code

    commit 8711920
    Merge: 2be2b97 692be62
    Author: Aresn <admin@aresn.com>
    Date:   Tue Oct 24 19:14:01 2017 -0500

        Merge pull request iview#2185 from md678685/patch-1

        Fix some English grammar in README

    commit 692be62
    Author: md678685 <mathew678@hotmail.co.uk>
    Date:   Tue Oct 24 21:06:04 2017 +0100

        Fix some English grammar in README

        This PR changes some of the English sentences in the `README.md` to sound more natural. I have tried to keep the structure as close as possible to the original. If anything sounds confusing, please reply below.

        这个PR改变了`README.md`中的一些英文句子,使其听起来更自然。 我试图保持结构尽可能接近原来。 如有任何疑问,请在下面回覆。

    commit 2be2b97
    Merge: b31aab7 da76a83
    Author: Aresn <admin@aresn.com>
    Date:   Tue Oct 24 07:46:14 2017 -0500

        Merge pull request iview#2184 from SergioCrisostomo/fix-tree-examples

        fix dom rendering when adding new nodes in example

    commit da76a83
    Author: Sergio Crisostomo <sergiosbox@gmail.com>
    Date:   Tue Oct 24 14:08:52 2017 +0200

        fix dom rendering problems

    commit b31aab7
    Author: 梁灏 <admin@aresn.com>
    Date:   Tue Oct 24 18:14:22 2017 +0800

        Tree add async loading

    commit 76a4781
    Author: 梁灏 <admin@aresn.com>
    Date:   Tue Oct 24 16:48:28 2017 +0800

        fixed iview#2128

    commit ccf544d
    Author: houyl <houyl@okooo.net>
    Date:   Tue Oct 24 16:47:12 2017 +0800

        Merge branch 'master' of https://github.com/iview/iview into 2.0
        Update carousel component: add loop and radiusDot property
        # Conflicts:
        #	package.json
        #	src/components/date-picker/picker.vue
        #	src/components/select/select.vue

    commit 9b24f1a
    Author: 梁灏 <admin@aresn.com>
    Date:   Tue Oct 24 16:20:09 2017 +0800

        Tree add Render function

        fixed iview#2133
        fixed iview#1784
        fixed iview#1333
        fixed iview#1362

    commit ecf6c2f
    Author: 梁灏 <admin@aresn.com>
    Date:   Tue Oct 24 15:47:07 2017 +0800

        update dependence

    commit c89e0e1
    Merge: 7053de4 0a8f9b4
    Author: Aresn <admin@aresn.com>
    Date:   Tue Oct 24 02:44:19 2017 -0500

        Merge pull request iview#2090 from SergioCrisostomo/refactor-tree

        Refactor tree

    commit 0a8f9b4
    Author: Sergio Crisostomo <sergiosbox@gmail.com>
    Date:   Tue Oct 24 09:30:09 2017 +0200

        Keep original data pointers and correct if clause

    commit d44420b
    Author: Sergio Crisostomo <sergiosbox@gmail.com>
    Date:   Sat Oct 14 09:49:13 2017 +0200

        refactor and make indeterminate accessible outside tree

    commit 94d177c
    Author: Sergio Crisostomo <sergiosbox@gmail.com>
    Date:   Sat Oct 14 09:47:33 2017 +0200

        add width to expand icon so we can click on it easier

    commit 7053de4
    Author: 梁灏 <admin@aresn.com>
    Date:   Tue Oct 24 09:52:42 2017 +0800

        update demo

    commit c61015d
    Merge: a5f4a1d 65255c9
    Author: Aresn <admin@aresn.com>
    Date:   Mon Oct 23 20:22:51 2017 -0500

        Merge pull request iview#2172 from SergioCrisostomo/fix-2164

        format string dates in daterange also

    commit a5f4a1d
    Author: 梁灏 <admin@aresn.com>
    Date:   Mon Oct 23 23:08:40 2017 +0800

        fixed iview#1922

    commit 65255c9
    Author: Sergio Crisostomo <sergiosbox@gmail.com>
    Date:   Mon Oct 23 15:53:12 2017 +0200

        fix date formatting when strings are supplied to DatePicker

    commit 6c634aa
    Author: 梁灏 <admin@aresn.com>
    Date:   Mon Oct 23 19:01:47 2017 +0800

        fixed iview#2078

    commit c2d74ec
    Author: 梁灏 <admin@aresn.com>
    Date:   Mon Oct 23 18:26:42 2017 +0800

        fixed iview#2100

    commit b92a1b5
    Merge: 6261a49 3ed12b4
    Author: Aresn <admin@aresn.com>
    Date:   Mon Oct 23 04:22:44 2017 -0500

        Merge pull request iview#2170 from SergioCrisostomo/use-locale-formated-year-month

        Correct month calculation and add specs for date-picker labels

    commit 6261a49
    Merge: a1553a9 7afb406
    Author: Aresn <admin@aresn.com>
    Date:   Mon Oct 23 04:19:11 2017 -0500

        Merge pull request iview#2171 from iview/pr/2124

        update Tag style for check

    commit a1553a9
    Merge: 5064c7b fd79f10
    Author: Aresn <admin@aresn.com>
    Date:   Mon Oct 23 04:17:50 2017 -0500

        Merge pull request iview#2124 from daiyanze/feature/checkable_tag

        Feature/checkable tag (追加功能:可选标签)

    commit 7afb406
    Author: 梁灏 <admin@aresn.com>
    Date:   Mon Oct 23 17:14:29 2017 +0800

        update Tag style for check

    commit 3ed12b4
    Author: Sergio Crisostomo <sergiosbox@gmail.com>
    Date:   Mon Oct 23 11:13:06 2017 +0200

        Correct month calculation and add specs for date-picker labels

    commit fd79f10
    Author: Aresn <admin@aresn.com>
    Date:   Mon Oct 23 03:57:05 2017 -0500

        Update tag.vue

    commit 5064c7b
    Author: 梁灏 <admin@aresn.com>
    Date:   Mon Oct 23 16:52:30 2017 +0800

        update ja-JP

    commit 4c6d996
    Author: Aresn <admin@aresn.com>
    Date:   Mon Oct 23 03:40:39 2017 -0500

        Update tag.vue

    commit b75ad4a
    Author: 梁灏 <admin@aresn.com>
    Date:   Mon Oct 23 14:12:02 2017 +0800

        fixed iview#1700

    commit 6ed0cd7
    Author: 梁灏 <admin@aresn.com>
    Date:   Mon Oct 23 11:55:35 2017 +0800

        update Tree demo

    commit 0e31618
    Author: 梁灏 <admin@aresn.com>
    Date:   Mon Oct 23 11:00:20 2017 +0800

        update demo

    commit ba1422c
    Author: 梁灏 <admin@aresn.com>
    Date:   Mon Oct 23 09:52:56 2017 +0800

        update zh-TW

    commit f672ae0
    Merge: 0f65109 2537c26
    Author: Aresn <admin@aresn.com>
    Date:   Sun Oct 22 20:29:51 2017 -0500

        Merge pull request iview#2097 from SergioCrisostomo/use-locale-formated-year-month

        use date.toLocaleDateString to format year/month

    commit 0f65109
    Author: 梁灏 <admin@aresn.com>
    Date:   Mon Oct 23 09:26:41 2017 +0800

        update

    commit a730a84
    Author: 梁灏 <admin@aresn.com>
    Date:   Fri Oct 20 17:44:58 2017 +0800

        update Tabs

    commit ec1a5e2
    Merge: 758bd76 be3fbd2
    Author: Aresn <admin@aresn.com>
    Date:   Fri Oct 20 04:38:28 2017 -0500

        Merge pull request iview#2156 from marxy/tabs-scroll

        Tabs add scroll

    commit 758bd76
    Merge: 45103ca e15746f
    Author: 梁灏 <admin@aresn.com>
    Date:   Fri Oct 20 16:56:33 2017 +0800

        Merge branch '2.0' of https://github.com/iview/iview into 2.0

    commit 45103ca
    Author: 梁灏 <admin@aresn.com>
    Date:   Fri Oct 20 16:53:59 2017 +0800

        fixed iview#2066

    commit be3fbd2
    Author: marxy <334905044@qq.com>
    Date:   Fri Oct 20 16:30:44 2017 +0800

        Tabs add scroll

    commit e15746f
    Author: Aresn <admin@aresn.com>
    Date:   Fri Oct 20 03:18:08 2017 -0500

        update dependence

    commit 485a903
    Author: 梁灏 <admin@aresn.com>
    Date:   Fri Oct 20 15:36:43 2017 +0800

        fixed iview#2149

    commit cbe5ccf
    Merge: 11baa9a 437b805
    Author: Aresn <admin@aresn.com>
    Date:   Thu Oct 19 22:47:33 2017 -0500

        Merge pull request iview#2114 from SergioCrisostomo/improve-csv

        Improve export to CSV functionality

    commit 11baa9a
    Merge: 2e8add2 a3336b3
    Author: Aresn <admin@aresn.com>
    Date:   Thu Oct 19 05:45:31 2017 -0500

        Merge pull request iview#2136 from SergioCrisostomo/fix-scroll-event

        add missing event in callback

    commit a3336b3
    Author: Sergio Crisostomo <sergiosbox@gmail.com>
    Date:   Thu Oct 19 10:41:19 2017 +0200

        add missing event in callback

    commit 62bf2b3
    Author: daiyanze <ginoalex8964@yahoo.com>
    Date:   Wed Oct 18 17:21:52 2017 +0900

        Modify: example of tags

    commit dc39cc3
    Author: daiyanze <ginoalex8964@yahoo.com>
    Date:   Wed Oct 18 17:13:06 2017 +0900

        Feature: Checkable tag

    commit 2e8add2
    Author: 梁灏 <admin@aresn.com>
    Date:   Wed Oct 18 08:58:16 2017 +0800

        release 2.5.1

    commit 95dfbe1
    Merge: 3c6d8ea 5d1c24c
    Author: Aresn <admin@aresn.com>
    Date:   Tue Oct 17 19:52:02 2017 -0500

        Merge pull request iview#2120 from SergioCrisostomo/fix-2119

        correct behaviour when initialising date-picker with a empty string

    commit 5d1c24c
    Author: Sergio Crisostomo <sergiosbox@gmail.com>
    Date:   Tue Oct 17 15:13:42 2017 +0200

        correct behaviour when initialising date-picker with a empty string

    commit 2537c26
    Author: Sergio Crisostomo <sergiosbox@gmail.com>
    Date:   Tue Oct 17 14:26:12 2017 +0200

        add dateLabel to time panel

    commit b27858d
    Author: Sergio Crisostomo <sergiosbox@gmail.com>
    Date:   Tue Oct 17 13:09:04 2017 +0200

        add date panel label format logic

    commit 3d50db5
    Author: Sergio Crisostomo <sergiosbox@gmail.com>
    Date:   Tue Oct 17 12:25:36 2017 +0200

        add datePanelLabel format in locale files

    commit 437b805
    Author: Sergio Crisostomo <sergiosbox@gmail.com>
    Date:   Tue Oct 17 10:14:10 2017 +0200

        Added Table to CSV example and tests

    commit fb84799
    Author: Sergio Crisostomo <sergiosbox@gmail.com>
    Date:   Tue Oct 17 10:13:54 2017 +0200

        Improve export to CSV functionality

         - added`callback`option so we can get CSV data in case we do not want
        to download
         - added options:
            - `quoted` for cases when we have line breaks in content
            - `separator` for cases when we have commas in content

    commit 3c6d8ea
    Author: 梁灏 <admin@aresn.com>
    Date:   Tue Oct 17 16:09:11 2017 +0800

        release 2.5.0

    commit 61d1637
    Author: 梁灏 <admin@aresn.com>
    Date:   Mon Oct 16 20:45:46 2017 +0800

        publish 2.5.0-beta.2

    commit 78b46fa
    Author: 梁灏 <admin@aresn.com>
    Date:   Mon Oct 16 20:41:13 2017 +0800

        Scroll add local loading-text

    commit 109465d
    Author: 梁灏 <admin@aresn.com>
    Date:   Mon Oct 16 20:10:21 2017 +0800

        optimize  Scroll scroll behavior

    commit 6850c1d
    Author: 梁灏 <admin@aresn.com>
    Date:   Mon Oct 16 18:32:47 2017 +0800

        Scroll add `height` prop

    commit 7462478
    Author: 梁灏 <admin@aresn.com>
    Date:   Mon Oct 16 16:05:06 2017 +0800

        publish 2.5.0-beta.1

    commit 8c2e53e
    Merge: f180098 af6a7c4
    Author: Aresn <admin@aresn.com>
    Date:   Mon Oct 16 02:54:57 2017 -0500

        Merge pull request iview#2069 from dspangenberg/2.0

        DatePicker: weekStartDay did not influence the order of the weekdays in the header

    commit af6a7c4
    Author: Danny Spangenberg <danny.spangenberg@twiceware.de>
    Date:   Wed Oct 11 17:38:03 2017 +0200

        weekStartDay did not influence the order of the weekdays in the header

    commit 0c0683e
    Author: Haven <baoyx007@gmail.com>
    Date:   Thu Sep 28 00:40:16 2017 -0500

        feat(form) : support promise for validate method iview#1857

commit d545cc6
Author: xiaoyu <852483353@qq.com>
Date:   Thu Nov 2 17:35:44 2017 +0800

    dark bugfix

commit 2995faf
Author: xiaoyu <852483353@qq.com>
Date:   Thu Nov 2 16:50:39 2017 +0800

    date-picker dark

commit d8dc76f
Author: lan <adwerrd@hotmail.com>
Date:   Wed Nov 1 16:52:46 2017 +0800

    remove css-dark

commit c4789cd
Author: xiaoyu <852483353@qq.com>
Date:   Thu Nov 2 10:40:41 2017 +0800

    select dark

commit 5ae38e2
Author: xiaoyu <852483353@qq.com>
Date:   Wed Nov 1 17:11:50 2017 +0800

    checkbox dark

commit 706736c
Author: xiaoyu <852483353@qq.com>
Date:   Wed Nov 1 16:19:36 2017 +0800

    modify modal dark

commit 363dc6f
Author: xiaoyu <852483353@qq.com>
Date:   Wed Nov 1 14:52:21 2017 +0800

    simplify table dark

commit e5efbcb
Author: lan <adwerrd@hotmail.com>
Date:   Wed Nov 1 15:15:49 2017 +0800

    button dark

commit 4ccbf8e
Author: lan <adwerrd@hotmail.com>
Date:   Tue Oct 31 15:51:13 2017 +0800

    button dark

commit 4ba897d
Author: xiaoyu <852483353@qq.com>
Date:   Wed Nov 1 12:01:47 2017 +0800

    modify -dark in custom.less

commit 94151fc
Author: xiaoyu <852483353@qq.com>
Date:   Wed Nov 1 11:12:45 2017 +0800

    add -dark in custom.less

commit a361f59
Author: xiaoyu <852483353@qq.com>
Date:   Tue Oct 31 19:35:00 2017 +0800

    checkbox dark

commit 023454d
Author: xiaoyu <852483353@qq.com>
Date:   Tue Oct 31 17:32:37 2017 +0800

    dark table sort  bugfix

commit 25e3758
Author: zyl <949472497@qq.com>
Date:   Tue Oct 31 16:49:30 2017 +0800

    switch black bugfix

commit e08998c
Author: zyl <949472497@qq.com>
Date:   Tue Oct 31 16:05:36 2017 +0800

    switch black

commit 71a091b
Author: zyl <949472497@qq.com>
Date:   Tue Oct 31 15:00:47 2017 +0800

    tag black

commit 62587b6
Author: zyl <949472497@qq.com>
Date:   Wed Oct 25 19:17:36 2017 +0800

    input black

commit 8795f12
Author: zyl <949472497@qq.com>
Date:   Wed Oct 25 19:34:24 2017 +0800

    input-number black

commit eee42f9
Author: zyl <949472497@qq.com>
Date:   Wed Oct 25 19:28:46 2017 +0800

    radio black

commit 8109034
Author: zyl <949472497@qq.com>
Date:   Wed Oct 25 19:17:36 2017 +0800

    input black

commit 8d78de9
Author: xiaoyu <852483353@qq.com>
Date:   Tue Oct 31 16:25:58 2017 +0800

    date-picker dark

commit dc01707
Author: xiaoyu <852483353@qq.com>
Date:   Wed Oct 25 18:56:38 2017 +0800

    modal-dark  and  select-dark

commit f54459a
Author: xiaoyu <852483353@qq.com>
Date:   Wed Oct 25 11:58:57 2017 +0800

    table dark

commit 2fab71a
Author: lan <adwerrd@hotmail.com>
Date:   Tue Oct 24 20:56:44 2017 +0800

    add dark less

commit ed4e493
Author: lan <adwerrd@hotmail.com>
Date:   Tue Oct 24 20:56:34 2017 +0800

    add dark less 2

commit 5060fc8
Author: lan <adwerrd@hotmail.com>
Date:   Tue Oct 24 19:34:26 2017 +0800

    add dark less

commit b51c7cb
Author: xiaoyu <852483353@qq.com>
Date:   Tue Oct 24 17:02:32 2017 +0800

    table black color
krislavten added a commit to baishancloud/iview-bsc that referenced this pull request Nov 13, 2017
commit 240bb21
Author: 梁灏 <admin@aresn.com>
Date:   Mon Nov 13 11:35:19 2017 +0800

    release 2.7.0

commit f2212c3
Author: 梁灏 <admin@aresn.com>
Date:   Mon Nov 13 10:07:45 2017 +0800

    publish 2.7.0-beta.1

commit 5bd0f52
Author: 梁灏 <admin@aresn.com>
Date:   Mon Nov 13 09:44:56 2017 +0800

    fixed

    iview#1090 iview#2387 iview#2379

commit d63a378
Author: 梁灏 <admin@aresn.com>
Date:   Mon Nov 13 09:27:54 2017 +0800

    fixed

    iview#1090 iview#2387 iview#379

commit a5dad1a
Author: 梁灏 <admin@aresn.com>
Date:   Mon Nov 13 09:14:03 2017 +0800

    fixed iview#1090 & close iview#2387 iview#2379

commit 6b2af1b
Merge: 593742a a2a18a4
Author: Aresn <admin@aresn.com>
Date:   Thu Nov 9 20:32:16 2017 -0600

    Merge pull request iview#2377 from btfrankenstein/2.0

    feat($input-number): add events 'on-focus', 'on-blur', 'on-enter' for…

commit a2a18a4
Author: Aresn <admin@aresn.com>
Date:   Thu Nov 9 20:31:47 2017 -0600

    Update input-number.vue

    remove `on-enter` because excessive and inflexible

commit c21a814
Author: btfrankenstein <btfrankenstein@gmail.com>
Date:   Thu Nov 9 17:56:33 2017 +0800

    feat($input-number): add events 'on-focus', 'on-blur', 'on-enter' for input-number component

commit 593742a
Author: 梁灏 <admin@aresn.com>
Date:   Thu Nov 9 17:06:49 2017 +0800

    update locale build file

commit b355578
Merge: 9d1add4 0c0d2c7
Author: Aresn <admin@aresn.com>
Date:   Thu Nov 9 00:47:25 2017 -0600

    Merge pull request iview#2354 from SergioCrisostomo/dry-exports

    reorganize and DRY components list

commit 9d1add4
Author: 梁灏 <admin@aresn.com>
Date:   Thu Nov 9 14:38:26 2017 +0800

    update Date example

commit 2df70eb
Merge: b91fd49 40aa935
Author: Aresn <admin@aresn.com>
Date:   Thu Nov 9 00:37:27 2017 -0600

    Merge pull request iview#2356 from SergioCrisostomo/fix-2122

    Patch Chromium bug

commit b91fd49
Merge: 4b33839 7f8d334
Author: Aresn <admin@aresn.com>
Date:   Thu Nov 9 00:18:47 2017 -0600

    Merge pull request iview#2368 from SergioCrisostomo/fix-datepicker-test

    fix date picker callback test

commit 7f8d334
Author: Sergio Crisostomo <sergiosbox@gmail.com>
Date:   Thu Nov 9 05:58:25 2017 +0100

    fix date picker callback test

commit 0c0d2c7
Author: Sergio Crisostomo <sergiosbox@gmail.com>
Date:   Thu Nov 9 05:50:30 2017 +0100

    reorganize and DRY components list

commit 4b33839
Author: 梁灏 <admin@aresn.com>
Date:   Thu Nov 9 11:11:54 2017 +0800

    update Select example

commit 67a9c1c
Author: 梁灏 <admin@aresn.com>
Date:   Thu Nov 9 09:48:56 2017 +0800

    update Tabs

commit bff9081
Merge: 4ab1ac5 5fbe80f
Author: Aresn <admin@aresn.com>
Date:   Wed Nov 8 19:19:51 2017 -0600

    Merge pull request iview#2351 from SergioCrisostomo/i18n

    use dist's locale

commit 4ab1ac5
Merge: 37fe6bb 236e0bf
Author: Aresn <admin@aresn.com>
Date:   Wed Nov 8 19:17:32 2017 -0600

    Merge pull request iview#2358 from SergioCrisostomo/ie-fix-2330

    Don't use includes to make IE happy and avoid Polyfill

commit 37fe6bb
Merge: 22c27b7 b1d124f
Author: Aresn <admin@aresn.com>
Date:   Wed Nov 8 19:15:00 2017 -0600

    Merge pull request iview#2361 from SergioCrisostomo/fix-2215

    add test for iview#2215

commit b1d124f
Author: Sergio Crisostomo <sergiosbox@gmail.com>
Date:   Wed Nov 8 16:07:23 2017 +0100

    add test for iview#2215

commit 22c27b7
Author: 梁灏 <admin@aresn.com>
Date:   Wed Nov 8 20:44:35 2017 +0800

    fixed iview#2215

commit 236e0bf
Author: Sergio Crisostomo <sergiosbox@gmail.com>
Date:   Wed Nov 8 10:14:08 2017 +0100

    DOn't use includes to make IE happy and avoid Polyfill

commit 5fbe80f
Author: Sergio Crisostomo <sergiosbox@gmail.com>
Date:   Wed Nov 8 09:59:45 2017 +0100

    use dist's locale

commit 40aa935
Author: Sergio Crisostomo <sergiosbox@gmail.com>
Date:   Wed Nov 8 09:54:14 2017 +0100

    patch chromium bug

commit b142865
Author: 梁灏 <admin@aresn.com>
Date:   Wed Nov 8 16:11:04 2017 +0800

    fixed iview#2102

commit 55f90d8
Author: 梁灏 <admin@aresn.com>
Date:   Wed Nov 8 14:39:39 2017 +0800

    fixed iview#1648

commit 6319935
Merge: cd92d87 297d1f1
Author: Aresn <admin@aresn.com>
Date:   Tue Nov 7 20:14:16 2017 -0600

    Merge pull request iview#2341 from f3man/2.0

    add uk_UA locale

commit cd92d87
Author: 梁灏 <admin@aresn.com>
Date:   Tue Nov 7 18:09:01 2017 +0800

    fixed iview#1482

commit 9f5a643
Author: 梁灏 <admin@aresn.com>
Date:   Tue Nov 7 17:54:36 2017 +0800

    fixed iview#2019

commit 84a4a95
Author: 梁灏 <admin@aresn.com>
Date:   Tue Nov 7 17:36:26 2017 +0800

    fixed iview#1926

commit 05265be
Author: 梁灏 <admin@aresn.com>
Date:   Tue Nov 7 17:28:20 2017 +0800

    fixed iview#2214

commit 6d2b7bc
Author: 梁灏 <admin@aresn.com>
Date:   Tue Nov 7 17:07:03 2017 +0800

    fixed iview#1575

commit 8869b70
Author: 梁灏 <admin@aresn.com>
Date:   Tue Nov 7 16:59:20 2017 +0800

    update

commit c7e432f
Author: 梁灏 <admin@aresn.com>
Date:   Tue Nov 7 16:43:23 2017 +0800

    update export & i18n

commit 297d1f1
Author: f3man <stepan7box@gmail.com>
Date:   Tue Nov 7 10:19:12 2017 +0200

    add uk_UA locale

    added ukranian language

commit 32e8393
Merge: bceb3c5 c17c5ad
Author: Aresn <admin@aresn.com>
Date:   Mon Nov 6 19:11:37 2017 -0600

    Merge pull request iview#2324 from SergioCrisostomo/auto-complete

    normalize autocomplete and spellcheck

commit bceb3c5
Merge: 427dd34 b9c1fe7
Author: Aresn <admin@aresn.com>
Date:   Mon Nov 6 19:02:53 2017 -0600

    Merge pull request iview#2322 from SergioCrisostomo/export-locales

    export locale objects

commit c17c5ad
Author: Sergio Crisostomo <sergiosbox@gmail.com>
Date:   Sat Nov 4 16:37:29 2017 +0100

    normalize autocomplete and spellcheck

commit b9c1fe7
Author: Sergio Crisostomo <sergiosbox@gmail.com>
Date:   Sat Nov 4 15:21:26 2017 +0100

    export locale objects

commit 427dd34
Author: 梁灏 <admin@aresn.com>
Date:   Thu Nov 2 18:23:10 2017 +0800

    update issue guide

commit 0819648
Merge: 470930e d1f698c
Author: Aresn <admin@aresn.com>
Date:   Wed Nov 1 04:03:17 2017 -0500

    Merge pull request iview#2274 from yangdan8/patch-2

    Modal弹窗请添加on-visible-change给外部api访问

commit d1f698c
Author: yangdan8 <13532023084@139.com>
Date:   Wed Nov 1 15:12:12 2017 +0800

    Modal弹窗请添加on-visible-change给外部api访问

    Modal弹窗请添加on-visible-change给外部api访问

commit 470930e
Author: 梁灏 <admin@aresn.com>
Date:   Tue Oct 31 14:15:00 2017 +0800

    update issue template

commit d44e817
Author: 梁灏 <admin@aresn.com>
Date:   Tue Oct 31 10:33:50 2017 +0800

    update Readme

commit 1a1f7c3
Merge: 75fa706 915e06d
Author: 梁灏 <admin@aresn.com>
Date:   Mon Oct 30 16:09:25 2017 +0800

    Merge branch '2.0' of https://github.com/iview/iview into 2.0

commit 75fa706
Author: 梁灏 <admin@aresn.com>
Date:   Mon Oct 30 16:01:18 2017 +0800

    update tabs demo

commit 915e06d
Merge: 1231c1a 3be0aa1
Author: Aresn <admin@aresn.com>
Date:   Mon Oct 30 03:01:06 2017 -0500

    Merge pull request iview#2230 from cheng-kang/2.0

    fix issue iview#1846

commit 1231c1a
Merge: 5a83c4a 0c0683e
Author: Aresn <admin@aresn.com>
Date:   Mon Oct 30 02:46:05 2017 -0500

    Merge pull request iview#2018 from Baoyx007/patch-1

    feat(form) : support promise for validate method iview#1857

commit 3be0aa1
Author: Kang Cheng <me@chengkang.pw>
Date:   Mon Oct 30 00:33:31 2017 -0700

    Import custom MutationObserver; remove mutation observer before component get destroyed

commit 5a83c4a
Merge: 7a9f6b2 b30250a
Author: Aresn <admin@aresn.com>
Date:   Mon Oct 30 01:40:31 2017 -0500

    Merge pull request iview#2223 from chavyleung/2.0

    fixed: iview#2219 & ColorPicker icon position

commit 7988575
Author: Kang Cheng <me@chengkang.pw>
Date:   Sun Oct 29 15:39:45 2017 -0700

    fix issue iview#1846

commit b30250a
Author: Chavy <chavyleung@163.com>
Date:   Sat Oct 28 11:57:38 2017 +0800

    fixed: iview#2219 & ColorPicker icon position

commit 7a9f6b2
Merge: 7d25930 a892ba6
Author: Aresn <admin@aresn.com>
Date:   Fri Oct 27 02:22:16 2017 -0500

    Merge pull request iview#2213 from SergioCrisostomo/fix-number-input

    prevent firing change when typing numbers < min

commit a892ba6
Author: Sergio Crisostomo <sergiosbox@gmail.com>
Date:   Fri Oct 27 08:40:11 2017 +0200

    prevent firing change when typing numbers < min

commit 7d25930
Author: 梁灏 <admin@aresn.com>
Date:   Thu Oct 26 14:47:54 2017 +0800

    release 2.6.0

commit f673ca4
Author: 梁灏 <admin@aresn.com>
Date:   Thu Oct 26 14:18:07 2017 +0800

    publish 2.6.0 beta

commit 86cdfb8
Merge: 252717e 19ad5f4
Author: Aresn <admin@aresn.com>
Date:   Thu Oct 26 00:14:52 2017 -0500

    Merge pull request iview#2194 from SergioCrisostomo/add-scroll-distance-to-edge

    add distance-to-edge property

commit 19ad5f4
Author: Aresn <admin@aresn.com>
Date:   Thu Oct 26 00:14:36 2017 -0500

    Update scroll.vue

commit 252717e
Merge: 9147e63 dfae43a
Author: Aresn <admin@aresn.com>
Date:   Thu Oct 26 00:13:02 2017 -0500

    Merge pull request iview#2193 from SergioCrisostomo/fix-2191

    correct input value in filterable mode

commit 9147e63
Merge: 51939f8 cbdac01
Author: Aresn <admin@aresn.com>
Date:   Thu Oct 26 00:10:44 2017 -0500

    Merge pull request iview#2195 from yangdan8/patch-4

    Update table.vue  解决tabs切换时,tab中的table调试时控制台报$el undefined的问题

commit cbdac01
Author: Aresn <admin@aresn.com>
Date:   Thu Oct 26 00:09:42 2017 -0500

    Update table.vue

commit 51939f8
Author: 梁灏 <admin@aresn.com>
Date:   Thu Oct 26 12:55:18 2017 +0800

    update Select tag

commit 2079c47
Author: 梁灏 <admin@aresn.com>
Date:   Thu Oct 26 11:57:24 2017 +0800

    update Tag

commit 2993f4e
Author: 梁灏 <admin@aresn.com>
Date:   Thu Oct 26 11:26:05 2017 +0800

    update Tab

commit f6a787f
Author: yangdan8 <13532023084@139.com>
Date:   Thu Oct 26 09:48:47 2017 +0800

    Update table.vue

commit 72ba666
Author: Sergio Crisostomo <sergiosbox@gmail.com>
Date:   Wed Oct 25 21:21:35 2017 +0200

    add distance-to-edge property

commit dfae43a
Author: Sergio Crisostomo <sergiosbox@gmail.com>
Date:   Wed Oct 25 20:49:38 2017 +0200

    correct input value in filterable mode

commit af7d72b
Author: 梁灏 <admin@aresn.com>
Date:   Wed Oct 25 22:34:58 2017 +0800

    update Tree selected

commit 6ff0e34
Author: 梁灏 <admin@aresn.com>
Date:   Wed Oct 25 21:10:29 2017 +0800

    update Tree Render function

commit 97098fc
Author: 梁灏 <admin@aresn.com>
Date:   Wed Oct 25 19:12:14 2017 +0800

    update Tree example

commit b64204f
Author: 梁灏 <admin@aresn.com>
Date:   Wed Oct 25 17:41:37 2017 +0800

    update Tree demo

commit 174836c
Author: 梁灏 <admin@aresn.com>
Date:   Wed Oct 25 16:45:42 2017 +0800

    update Tree Render function use

commit 3ea2461
Author: 梁灏 <admin@aresn.com>
Date:   Wed Oct 25 14:33:22 2017 +0800

    update checkbox style

commit 69460a5
Merge: 8711920 610fd3a
Author: Aresn <admin@aresn.com>
Date:   Tue Oct 24 21:44:41 2017 -0500

    Merge pull request iview#2181 from lisafra/update-carousel

    Update carousel component: add loop and radiusDot property

commit 610fd3a
Author: houyl <houyl@okooo.net>
Date:   Wed Oct 25 09:30:46 2017 +0800

    [fix bug]  carousel component: remove no use code

commit 8711920
Merge: 2be2b97 692be62
Author: Aresn <admin@aresn.com>
Date:   Tue Oct 24 19:14:01 2017 -0500

    Merge pull request iview#2185 from md678685/patch-1

    Fix some English grammar in README

commit 692be62
Author: md678685 <mathew678@hotmail.co.uk>
Date:   Tue Oct 24 21:06:04 2017 +0100

    Fix some English grammar in README

    This PR changes some of the English sentences in the `README.md` to sound more natural. I have tried to keep the structure as close as possible to the original. If anything sounds confusing, please reply below.

    这个PR改变了`README.md`中的一些英文句子,使其听起来更自然。 我试图保持结构尽可能接近原来。 如有任何疑问,请在下面回覆。

commit 2be2b97
Merge: b31aab7 da76a83
Author: Aresn <admin@aresn.com>
Date:   Tue Oct 24 07:46:14 2017 -0500

    Merge pull request iview#2184 from SergioCrisostomo/fix-tree-examples

    fix dom rendering when adding new nodes in example

commit da76a83
Author: Sergio Crisostomo <sergiosbox@gmail.com>
Date:   Tue Oct 24 14:08:52 2017 +0200

    fix dom rendering problems

commit b31aab7
Author: 梁灏 <admin@aresn.com>
Date:   Tue Oct 24 18:14:22 2017 +0800

    Tree add async loading

commit 76a4781
Author: 梁灏 <admin@aresn.com>
Date:   Tue Oct 24 16:48:28 2017 +0800

    fixed iview#2128

commit ccf544d
Author: houyl <houyl@okooo.net>
Date:   Tue Oct 24 16:47:12 2017 +0800

    Merge branch 'master' of https://github.com/iview/iview into 2.0
    Update carousel component: add loop and radiusDot property
    # Conflicts:
    #	package.json
    #	src/components/date-picker/picker.vue
    #	src/components/select/select.vue

commit 9b24f1a
Author: 梁灏 <admin@aresn.com>
Date:   Tue Oct 24 16:20:09 2017 +0800

    Tree add Render function

    fixed iview#2133
    fixed iview#1784
    fixed iview#1333
    fixed iview#1362

commit ecf6c2f
Author: 梁灏 <admin@aresn.com>
Date:   Tue Oct 24 15:47:07 2017 +0800

    update dependence

commit c89e0e1
Merge: 7053de4 0a8f9b4
Author: Aresn <admin@aresn.com>
Date:   Tue Oct 24 02:44:19 2017 -0500

    Merge pull request iview#2090 from SergioCrisostomo/refactor-tree

    Refactor tree

commit 0a8f9b4
Author: Sergio Crisostomo <sergiosbox@gmail.com>
Date:   Tue Oct 24 09:30:09 2017 +0200

    Keep original data pointers and correct if clause

commit d44420b
Author: Sergio Crisostomo <sergiosbox@gmail.com>
Date:   Sat Oct 14 09:49:13 2017 +0200

    refactor and make indeterminate accessible outside tree

commit 94d177c
Author: Sergio Crisostomo <sergiosbox@gmail.com>
Date:   Sat Oct 14 09:47:33 2017 +0200

    add width to expand icon so we can click on it easier

commit 7053de4
Author: 梁灏 <admin@aresn.com>
Date:   Tue Oct 24 09:52:42 2017 +0800

    update demo

commit c61015d
Merge: a5f4a1d 65255c9
Author: Aresn <admin@aresn.com>
Date:   Mon Oct 23 20:22:51 2017 -0500

    Merge pull request iview#2172 from SergioCrisostomo/fix-2164

    format string dates in daterange also

commit a5f4a1d
Author: 梁灏 <admin@aresn.com>
Date:   Mon Oct 23 23:08:40 2017 +0800

    fixed iview#1922

commit 65255c9
Author: Sergio Crisostomo <sergiosbox@gmail.com>
Date:   Mon Oct 23 15:53:12 2017 +0200

    fix date formatting when strings are supplied to DatePicker

commit 6c634aa
Author: 梁灏 <admin@aresn.com>
Date:   Mon Oct 23 19:01:47 2017 +0800

    fixed iview#2078

commit c2d74ec
Author: 梁灏 <admin@aresn.com>
Date:   Mon Oct 23 18:26:42 2017 +0800

    fixed iview#2100

commit b92a1b5
Merge: 6261a49 3ed12b4
Author: Aresn <admin@aresn.com>
Date:   Mon Oct 23 04:22:44 2017 -0500

    Merge pull request iview#2170 from SergioCrisostomo/use-locale-formated-year-month

    Correct month calculation and add specs for date-picker labels

commit 6261a49
Merge: a1553a9 7afb406
Author: Aresn <admin@aresn.com>
Date:   Mon Oct 23 04:19:11 2017 -0500

    Merge pull request iview#2171 from iview/pr/2124

    update Tag style for check

commit a1553a9
Merge: 5064c7b fd79f10
Author: Aresn <admin@aresn.com>
Date:   Mon Oct 23 04:17:50 2017 -0500

    Merge pull request iview#2124 from daiyanze/feature/checkable_tag

    Feature/checkable tag (追加功能:可选标签)

commit 7afb406
Author: 梁灏 <admin@aresn.com>
Date:   Mon Oct 23 17:14:29 2017 +0800

    update Tag style for check

commit 3ed12b4
Author: Sergio Crisostomo <sergiosbox@gmail.com>
Date:   Mon Oct 23 11:13:06 2017 +0200

    Correct month calculation and add specs for date-picker labels

commit fd79f10
Author: Aresn <admin@aresn.com>
Date:   Mon Oct 23 03:57:05 2017 -0500

    Update tag.vue

commit 5064c7b
Author: 梁灏 <admin@aresn.com>
Date:   Mon Oct 23 16:52:30 2017 +0800

    update ja-JP

commit 4c6d996
Author: Aresn <admin@aresn.com>
Date:   Mon Oct 23 03:40:39 2017 -0500

    Update tag.vue

commit b75ad4a
Author: 梁灏 <admin@aresn.com>
Date:   Mon Oct 23 14:12:02 2017 +0800

    fixed iview#1700

commit 6ed0cd7
Author: 梁灏 <admin@aresn.com>
Date:   Mon Oct 23 11:55:35 2017 +0800

    update Tree demo

commit 0e31618
Author: 梁灏 <admin@aresn.com>
Date:   Mon Oct 23 11:00:20 2017 +0800

    update demo

commit ba1422c
Author: 梁灏 <admin@aresn.com>
Date:   Mon Oct 23 09:52:56 2017 +0800

    update zh-TW

commit f672ae0
Merge: 0f65109 2537c26
Author: Aresn <admin@aresn.com>
Date:   Sun Oct 22 20:29:51 2017 -0500

    Merge pull request iview#2097 from SergioCrisostomo/use-locale-formated-year-month

    use date.toLocaleDateString to format year/month

commit 0f65109
Author: 梁灏 <admin@aresn.com>
Date:   Mon Oct 23 09:26:41 2017 +0800

    update

commit a730a84
Author: 梁灏 <admin@aresn.com>
Date:   Fri Oct 20 17:44:58 2017 +0800

    update Tabs

commit ec1a5e2
Merge: 758bd76 be3fbd2
Author: Aresn <admin@aresn.com>
Date:   Fri Oct 20 04:38:28 2017 -0500

    Merge pull request iview#2156 from marxy/tabs-scroll

    Tabs add scroll

commit 758bd76
Merge: 45103ca e15746f
Author: 梁灏 <admin@aresn.com>
Date:   Fri Oct 20 16:56:33 2017 +0800

    Merge branch '2.0' of https://github.com/iview/iview into 2.0

commit 45103ca
Author: 梁灏 <admin@aresn.com>
Date:   Fri Oct 20 16:53:59 2017 +0800

    fixed iview#2066

commit be3fbd2
Author: marxy <334905044@qq.com>
Date:   Fri Oct 20 16:30:44 2017 +0800

    Tabs add scroll

commit e15746f
Author: Aresn <admin@aresn.com>
Date:   Fri Oct 20 03:18:08 2017 -0500

    update dependence

commit 485a903
Author: 梁灏 <admin@aresn.com>
Date:   Fri Oct 20 15:36:43 2017 +0800

    fixed iview#2149

commit cbe5ccf
Merge: 11baa9a 437b805
Author: Aresn <admin@aresn.com>
Date:   Thu Oct 19 22:47:33 2017 -0500

    Merge pull request iview#2114 from SergioCrisostomo/improve-csv

    Improve export to CSV functionality

commit 11baa9a
Merge: 2e8add2 a3336b3
Author: Aresn <admin@aresn.com>
Date:   Thu Oct 19 05:45:31 2017 -0500

    Merge pull request iview#2136 from SergioCrisostomo/fix-scroll-event

    add missing event in callback

commit a3336b3
Author: Sergio Crisostomo <sergiosbox@gmail.com>
Date:   Thu Oct 19 10:41:19 2017 +0200

    add missing event in callback

commit 62bf2b3
Author: daiyanze <ginoalex8964@yahoo.com>
Date:   Wed Oct 18 17:21:52 2017 +0900

    Modify: example of tags

commit dc39cc3
Author: daiyanze <ginoalex8964@yahoo.com>
Date:   Wed Oct 18 17:13:06 2017 +0900

    Feature: Checkable tag

commit 2e8add2
Author: 梁灏 <admin@aresn.com>
Date:   Wed Oct 18 08:58:16 2017 +0800

    release 2.5.1

commit 95dfbe1
Merge: 3c6d8ea 5d1c24c
Author: Aresn <admin@aresn.com>
Date:   Tue Oct 17 19:52:02 2017 -0500

    Merge pull request iview#2120 from SergioCrisostomo/fix-2119

    correct behaviour when initialising date-picker with a empty string

commit 5d1c24c
Author: Sergio Crisostomo <sergiosbox@gmail.com>
Date:   Tue Oct 17 15:13:42 2017 +0200

    correct behaviour when initialising date-picker with a empty string

commit 2537c26
Author: Sergio Crisostomo <sergiosbox@gmail.com>
Date:   Tue Oct 17 14:26:12 2017 +0200

    add dateLabel to time panel

commit b27858d
Author: Sergio Crisostomo <sergiosbox@gmail.com>
Date:   Tue Oct 17 13:09:04 2017 +0200

    add date panel label format logic

commit 3d50db5
Author: Sergio Crisostomo <sergiosbox@gmail.com>
Date:   Tue Oct 17 12:25:36 2017 +0200

    add datePanelLabel format in locale files

commit 437b805
Author: Sergio Crisostomo <sergiosbox@gmail.com>
Date:   Tue Oct 17 10:14:10 2017 +0200

    Added Table to CSV example and tests

commit fb84799
Author: Sergio Crisostomo <sergiosbox@gmail.com>
Date:   Tue Oct 17 10:13:54 2017 +0200

    Improve export to CSV functionality

     - added`callback`option so we can get CSV data in case we do not want
    to download
     - added options:
        - `quoted` for cases when we have line breaks in content
        - `separator` for cases when we have commas in content

commit 3c6d8ea
Author: 梁灏 <admin@aresn.com>
Date:   Tue Oct 17 16:09:11 2017 +0800

    release 2.5.0

commit 61d1637
Author: 梁灏 <admin@aresn.com>
Date:   Mon Oct 16 20:45:46 2017 +0800

    publish 2.5.0-beta.2

commit 78b46fa
Author: 梁灏 <admin@aresn.com>
Date:   Mon Oct 16 20:41:13 2017 +0800

    Scroll add local loading-text

commit 109465d
Author: 梁灏 <admin@aresn.com>
Date:   Mon Oct 16 20:10:21 2017 +0800

    optimize  Scroll scroll behavior

commit 6850c1d
Author: 梁灏 <admin@aresn.com>
Date:   Mon Oct 16 18:32:47 2017 +0800

    Scroll add `height` prop

commit 7462478
Author: 梁灏 <admin@aresn.com>
Date:   Mon Oct 16 16:05:06 2017 +0800

    publish 2.5.0-beta.1

commit 8c2e53e
Merge: f180098 af6a7c4
Author: Aresn <admin@aresn.com>
Date:   Mon Oct 16 02:54:57 2017 -0500

    Merge pull request iview#2069 from dspangenberg/2.0

    DatePicker: weekStartDay did not influence the order of the weekdays in the header

commit af6a7c4
Author: Danny Spangenberg <danny.spangenberg@twiceware.de>
Date:   Wed Oct 11 17:38:03 2017 +0200

    weekStartDay did not influence the order of the weekdays in the header

commit 0c0683e
Author: Haven <baoyx007@gmail.com>
Date:   Thu Sep 28 00:40:16 2017 -0500

    feat(form) : support promise for validate method iview#1857
krislavten added a commit to baishancloud/iview-bsc that referenced this pull request Nov 20, 2017
commit 916f3a6
Author: 梁灏 <admin@aresn.com>
Date:   Fri Nov 17 15:42:57 2017 +0800

    update readme

commit 5e70fad
Author: 梁灏 <admin@aresn.com>
Date:   Thu Nov 16 11:16:43 2017 +0800

    release 2.7.3

commit 54f510c
Author: 梁灏 <admin@aresn.com>
Date:   Thu Nov 16 11:02:01 2017 +0800

    fixed not support Nuxt.js

commit 1cbdb61
Merge: 82636f7 4543502
Author: Aresn <admin@aresn.com>
Date:   Wed Nov 15 20:45:44 2017 -0600

    Merge pull request iview#2429 from pbarros78/patch-2

    Long weekdays name to short weekdays name

commit 82636f7
Merge: 1ec1efa a14d6dd
Author: Aresn <admin@aresn.com>
Date:   Wed Nov 15 20:45:13 2017 -0600

    Merge pull request iview#2420 from SergioCrisostomo/input-number-fixes

    fix checking when temp number is invalid

commit 1ec1efa
Merge: d291e81 d962c7f
Author: Aresn <admin@aresn.com>
Date:   Wed Nov 15 20:27:51 2017 -0600

    Merge pull request iview#2421 from SergioCrisostomo/use-packagejson-version

    use version from package.json

commit 4543502
Author: Patricio Barros <patricio.barros@gmail.com>
Date:   Wed Nov 15 11:26:50 2017 -0300

    Long weekdays name to short weekdays name

    Change of name of long weekdays to short weekdays name, for use in datepicker

commit d962c7f
Author: Sergio Crisostomo <sergiosbox@gmail.com>
Date:   Tue Nov 14 17:46:52 2017 +0100

    use version from package.json

commit a14d6dd
Author: Sergio Crisostomo <sergiosbox@gmail.com>
Date:   Tue Nov 14 14:35:42 2017 +0100

    fix checking when temp number is invalid and should be rechecked in "change" event

commit d291e81
Author: 梁灏 <admin@aresn.com>
Date:   Tue Nov 14 09:54:44 2017 +0800

    release 2.7.2

commit 9b6f316
Author: 梁灏 <admin@aresn.com>
Date:   Tue Nov 14 09:53:58 2017 +0800

    fixed Tabs bug

commit 7b0fb4e
Author: 梁灏 <admin@aresn.com>
Date:   Tue Nov 14 09:31:48 2017 +0800

    release 2.7.1

commit 1d15cbb
Merge: 240bb21 a74be22
Author: Aresn <admin@aresn.com>
Date:   Mon Nov 13 19:24:20 2017 -0600

    Merge pull request iview#2407 from SergioCrisostomo/fix-look-for-parent

    don't check past document.body when moving up DOM tree

commit a74be22
Author: Sergio Crisostomo <sergiosbox@gmail.com>
Date:   Mon Nov 13 16:57:43 2017 +0100

    don't check DOM tree past document.body

commit 240bb21
Author: 梁灏 <admin@aresn.com>
Date:   Mon Nov 13 11:35:19 2017 +0800

    release 2.7.0

commit f2212c3
Author: 梁灏 <admin@aresn.com>
Date:   Mon Nov 13 10:07:45 2017 +0800

    publish 2.7.0-beta.1

commit 5bd0f52
Author: 梁灏 <admin@aresn.com>
Date:   Mon Nov 13 09:44:56 2017 +0800

    fixed

    iview#1090 iview#2387 iview#2379

commit d63a378
Author: 梁灏 <admin@aresn.com>
Date:   Mon Nov 13 09:27:54 2017 +0800

    fixed

    iview#1090 iview#2387 iview#379

commit a5dad1a
Author: 梁灏 <admin@aresn.com>
Date:   Mon Nov 13 09:14:03 2017 +0800

    fixed iview#1090 & close iview#2387 iview#2379

commit 6b2af1b
Merge: 593742a a2a18a4
Author: Aresn <admin@aresn.com>
Date:   Thu Nov 9 20:32:16 2017 -0600

    Merge pull request iview#2377 from btfrankenstein/2.0

    feat($input-number): add events 'on-focus', 'on-blur', 'on-enter' for…

commit a2a18a4
Author: Aresn <admin@aresn.com>
Date:   Thu Nov 9 20:31:47 2017 -0600

    Update input-number.vue

    remove `on-enter` because excessive and inflexible

commit c21a814
Author: btfrankenstein <btfrankenstein@gmail.com>
Date:   Thu Nov 9 17:56:33 2017 +0800

    feat($input-number): add events 'on-focus', 'on-blur', 'on-enter' for input-number component

commit 593742a
Author: 梁灏 <admin@aresn.com>
Date:   Thu Nov 9 17:06:49 2017 +0800

    update locale build file

commit b355578
Merge: 9d1add4 0c0d2c7
Author: Aresn <admin@aresn.com>
Date:   Thu Nov 9 00:47:25 2017 -0600

    Merge pull request iview#2354 from SergioCrisostomo/dry-exports

    reorganize and DRY components list

commit 9d1add4
Author: 梁灏 <admin@aresn.com>
Date:   Thu Nov 9 14:38:26 2017 +0800

    update Date example

commit 2df70eb
Merge: b91fd49 40aa935
Author: Aresn <admin@aresn.com>
Date:   Thu Nov 9 00:37:27 2017 -0600

    Merge pull request iview#2356 from SergioCrisostomo/fix-2122

    Patch Chromium bug

commit b91fd49
Merge: 4b33839 7f8d334
Author: Aresn <admin@aresn.com>
Date:   Thu Nov 9 00:18:47 2017 -0600

    Merge pull request iview#2368 from SergioCrisostomo/fix-datepicker-test

    fix date picker callback test

commit 7f8d334
Author: Sergio Crisostomo <sergiosbox@gmail.com>
Date:   Thu Nov 9 05:58:25 2017 +0100

    fix date picker callback test

commit 0c0d2c7
Author: Sergio Crisostomo <sergiosbox@gmail.com>
Date:   Thu Nov 9 05:50:30 2017 +0100

    reorganize and DRY components list

commit 4b33839
Author: 梁灏 <admin@aresn.com>
Date:   Thu Nov 9 11:11:54 2017 +0800

    update Select example

commit 67a9c1c
Author: 梁灏 <admin@aresn.com>
Date:   Thu Nov 9 09:48:56 2017 +0800

    update Tabs

commit bff9081
Merge: 4ab1ac5 5fbe80f
Author: Aresn <admin@aresn.com>
Date:   Wed Nov 8 19:19:51 2017 -0600

    Merge pull request iview#2351 from SergioCrisostomo/i18n

    use dist's locale

commit 4ab1ac5
Merge: 37fe6bb 236e0bf
Author: Aresn <admin@aresn.com>
Date:   Wed Nov 8 19:17:32 2017 -0600

    Merge pull request iview#2358 from SergioCrisostomo/ie-fix-2330

    Don't use includes to make IE happy and avoid Polyfill

commit 37fe6bb
Merge: 22c27b7 b1d124f
Author: Aresn <admin@aresn.com>
Date:   Wed Nov 8 19:15:00 2017 -0600

    Merge pull request iview#2361 from SergioCrisostomo/fix-2215

    add test for iview#2215

commit b1d124f
Author: Sergio Crisostomo <sergiosbox@gmail.com>
Date:   Wed Nov 8 16:07:23 2017 +0100

    add test for iview#2215

commit 22c27b7
Author: 梁灏 <admin@aresn.com>
Date:   Wed Nov 8 20:44:35 2017 +0800

    fixed iview#2215

commit 236e0bf
Author: Sergio Crisostomo <sergiosbox@gmail.com>
Date:   Wed Nov 8 10:14:08 2017 +0100

    DOn't use includes to make IE happy and avoid Polyfill

commit 5fbe80f
Author: Sergio Crisostomo <sergiosbox@gmail.com>
Date:   Wed Nov 8 09:59:45 2017 +0100

    use dist's locale

commit 40aa935
Author: Sergio Crisostomo <sergiosbox@gmail.com>
Date:   Wed Nov 8 09:54:14 2017 +0100

    patch chromium bug

commit b142865
Author: 梁灏 <admin@aresn.com>
Date:   Wed Nov 8 16:11:04 2017 +0800

    fixed iview#2102

commit 55f90d8
Author: 梁灏 <admin@aresn.com>
Date:   Wed Nov 8 14:39:39 2017 +0800

    fixed iview#1648

commit 6319935
Merge: cd92d87 297d1f1
Author: Aresn <admin@aresn.com>
Date:   Tue Nov 7 20:14:16 2017 -0600

    Merge pull request iview#2341 from f3man/2.0

    add uk_UA locale

commit cd92d87
Author: 梁灏 <admin@aresn.com>
Date:   Tue Nov 7 18:09:01 2017 +0800

    fixed iview#1482

commit 9f5a643
Author: 梁灏 <admin@aresn.com>
Date:   Tue Nov 7 17:54:36 2017 +0800

    fixed iview#2019

commit 84a4a95
Author: 梁灏 <admin@aresn.com>
Date:   Tue Nov 7 17:36:26 2017 +0800

    fixed iview#1926

commit 05265be
Author: 梁灏 <admin@aresn.com>
Date:   Tue Nov 7 17:28:20 2017 +0800

    fixed iview#2214

commit 6d2b7bc
Author: 梁灏 <admin@aresn.com>
Date:   Tue Nov 7 17:07:03 2017 +0800

    fixed iview#1575

commit 8869b70
Author: 梁灏 <admin@aresn.com>
Date:   Tue Nov 7 16:59:20 2017 +0800

    update

commit c7e432f
Author: 梁灏 <admin@aresn.com>
Date:   Tue Nov 7 16:43:23 2017 +0800

    update export & i18n

commit 297d1f1
Author: f3man <stepan7box@gmail.com>
Date:   Tue Nov 7 10:19:12 2017 +0200

    add uk_UA locale

    added ukranian language

commit 32e8393
Merge: bceb3c5 c17c5ad
Author: Aresn <admin@aresn.com>
Date:   Mon Nov 6 19:11:37 2017 -0600

    Merge pull request iview#2324 from SergioCrisostomo/auto-complete

    normalize autocomplete and spellcheck

commit bceb3c5
Merge: 427dd34 b9c1fe7
Author: Aresn <admin@aresn.com>
Date:   Mon Nov 6 19:02:53 2017 -0600

    Merge pull request iview#2322 from SergioCrisostomo/export-locales

    export locale objects

commit c17c5ad
Author: Sergio Crisostomo <sergiosbox@gmail.com>
Date:   Sat Nov 4 16:37:29 2017 +0100

    normalize autocomplete and spellcheck

commit b9c1fe7
Author: Sergio Crisostomo <sergiosbox@gmail.com>
Date:   Sat Nov 4 15:21:26 2017 +0100

    export locale objects

commit 427dd34
Author: 梁灏 <admin@aresn.com>
Date:   Thu Nov 2 18:23:10 2017 +0800

    update issue guide

commit 0819648
Merge: 470930e d1f698c
Author: Aresn <admin@aresn.com>
Date:   Wed Nov 1 04:03:17 2017 -0500

    Merge pull request iview#2274 from yangdan8/patch-2

    Modal弹窗请添加on-visible-change给外部api访问

commit d1f698c
Author: yangdan8 <13532023084@139.com>
Date:   Wed Nov 1 15:12:12 2017 +0800

    Modal弹窗请添加on-visible-change给外部api访问

    Modal弹窗请添加on-visible-change给外部api访问

commit 470930e
Author: 梁灏 <admin@aresn.com>
Date:   Tue Oct 31 14:15:00 2017 +0800

    update issue template

commit d44e817
Author: 梁灏 <admin@aresn.com>
Date:   Tue Oct 31 10:33:50 2017 +0800

    update Readme

commit 1a1f7c3
Merge: 75fa706 915e06d
Author: 梁灏 <admin@aresn.com>
Date:   Mon Oct 30 16:09:25 2017 +0800

    Merge branch '2.0' of https://github.com/iview/iview into 2.0

commit 75fa706
Author: 梁灏 <admin@aresn.com>
Date:   Mon Oct 30 16:01:18 2017 +0800

    update tabs demo

commit 915e06d
Merge: 1231c1a 3be0aa1
Author: Aresn <admin@aresn.com>
Date:   Mon Oct 30 03:01:06 2017 -0500

    Merge pull request iview#2230 from cheng-kang/2.0

    fix issue iview#1846

commit 1231c1a
Merge: 5a83c4a 0c0683e
Author: Aresn <admin@aresn.com>
Date:   Mon Oct 30 02:46:05 2017 -0500

    Merge pull request iview#2018 from Baoyx007/patch-1

    feat(form) : support promise for validate method iview#1857

commit 3be0aa1
Author: Kang Cheng <me@chengkang.pw>
Date:   Mon Oct 30 00:33:31 2017 -0700

    Import custom MutationObserver; remove mutation observer before component get destroyed

commit 5a83c4a
Merge: 7a9f6b2 b30250a
Author: Aresn <admin@aresn.com>
Date:   Mon Oct 30 01:40:31 2017 -0500

    Merge pull request iview#2223 from chavyleung/2.0

    fixed: iview#2219 & ColorPicker icon position

commit 7988575
Author: Kang Cheng <me@chengkang.pw>
Date:   Sun Oct 29 15:39:45 2017 -0700

    fix issue iview#1846

commit b30250a
Author: Chavy <chavyleung@163.com>
Date:   Sat Oct 28 11:57:38 2017 +0800

    fixed: iview#2219 & ColorPicker icon position

commit 7a9f6b2
Merge: 7d25930 a892ba6
Author: Aresn <admin@aresn.com>
Date:   Fri Oct 27 02:22:16 2017 -0500

    Merge pull request iview#2213 from SergioCrisostomo/fix-number-input

    prevent firing change when typing numbers < min

commit a892ba6
Author: Sergio Crisostomo <sergiosbox@gmail.com>
Date:   Fri Oct 27 08:40:11 2017 +0200

    prevent firing change when typing numbers < min

commit 7d25930
Author: 梁灏 <admin@aresn.com>
Date:   Thu Oct 26 14:47:54 2017 +0800

    release 2.6.0

commit f673ca4
Author: 梁灏 <admin@aresn.com>
Date:   Thu Oct 26 14:18:07 2017 +0800

    publish 2.6.0 beta

commit 86cdfb8
Merge: 252717e 19ad5f4
Author: Aresn <admin@aresn.com>
Date:   Thu Oct 26 00:14:52 2017 -0500

    Merge pull request iview#2194 from SergioCrisostomo/add-scroll-distance-to-edge

    add distance-to-edge property

commit 19ad5f4
Author: Aresn <admin@aresn.com>
Date:   Thu Oct 26 00:14:36 2017 -0500

    Update scroll.vue

commit 252717e
Merge: 9147e63 dfae43a
Author: Aresn <admin@aresn.com>
Date:   Thu Oct 26 00:13:02 2017 -0500

    Merge pull request iview#2193 from SergioCrisostomo/fix-2191

    correct input value in filterable mode

commit 9147e63
Merge: 51939f8 cbdac01
Author: Aresn <admin@aresn.com>
Date:   Thu Oct 26 00:10:44 2017 -0500

    Merge pull request iview#2195 from yangdan8/patch-4

    Update table.vue  解决tabs切换时,tab中的table调试时控制台报$el undefined的问题

commit cbdac01
Author: Aresn <admin@aresn.com>
Date:   Thu Oct 26 00:09:42 2017 -0500

    Update table.vue

commit 51939f8
Author: 梁灏 <admin@aresn.com>
Date:   Thu Oct 26 12:55:18 2017 +0800

    update Select tag

commit 2079c47
Author: 梁灏 <admin@aresn.com>
Date:   Thu Oct 26 11:57:24 2017 +0800

    update Tag

commit 2993f4e
Author: 梁灏 <admin@aresn.com>
Date:   Thu Oct 26 11:26:05 2017 +0800

    update Tab

commit f6a787f
Author: yangdan8 <13532023084@139.com>
Date:   Thu Oct 26 09:48:47 2017 +0800

    Update table.vue

commit 72ba666
Author: Sergio Crisostomo <sergiosbox@gmail.com>
Date:   Wed Oct 25 21:21:35 2017 +0200

    add distance-to-edge property

commit dfae43a
Author: Sergio Crisostomo <sergiosbox@gmail.com>
Date:   Wed Oct 25 20:49:38 2017 +0200

    correct input value in filterable mode

commit af7d72b
Author: 梁灏 <admin@aresn.com>
Date:   Wed Oct 25 22:34:58 2017 +0800

    update Tree selected

commit 6ff0e34
Author: 梁灏 <admin@aresn.com>
Date:   Wed Oct 25 21:10:29 2017 +0800

    update Tree Render function

commit 97098fc
Author: 梁灏 <admin@aresn.com>
Date:   Wed Oct 25 19:12:14 2017 +0800

    update Tree example

commit b64204f
Author: 梁灏 <admin@aresn.com>
Date:   Wed Oct 25 17:41:37 2017 +0800

    update Tree demo

commit 174836c
Author: 梁灏 <admin@aresn.com>
Date:   Wed Oct 25 16:45:42 2017 +0800

    update Tree Render function use

commit 3ea2461
Author: 梁灏 <admin@aresn.com>
Date:   Wed Oct 25 14:33:22 2017 +0800

    update checkbox style

commit 69460a5
Merge: 8711920 610fd3a
Author: Aresn <admin@aresn.com>
Date:   Tue Oct 24 21:44:41 2017 -0500

    Merge pull request iview#2181 from lisafra/update-carousel

    Update carousel component: add loop and radiusDot property

commit 610fd3a
Author: houyl <houyl@okooo.net>
Date:   Wed Oct 25 09:30:46 2017 +0800

    [fix bug]  carousel component: remove no use code

commit 8711920
Merge: 2be2b97 692be62
Author: Aresn <admin@aresn.com>
Date:   Tue Oct 24 19:14:01 2017 -0500

    Merge pull request iview#2185 from md678685/patch-1

    Fix some English grammar in README

commit 692be62
Author: md678685 <mathew678@hotmail.co.uk>
Date:   Tue Oct 24 21:06:04 2017 +0100

    Fix some English grammar in README

    This PR changes some of the English sentences in the `README.md` to sound more natural. I have tried to keep the structure as close as possible to the original. If anything sounds confusing, please reply below.

    这个PR改变了`README.md`中的一些英文句子,使其听起来更自然。 我试图保持结构尽可能接近原来。 如有任何疑问,请在下面回覆。

commit 2be2b97
Merge: b31aab7 da76a83
Author: Aresn <admin@aresn.com>
Date:   Tue Oct 24 07:46:14 2017 -0500

    Merge pull request iview#2184 from SergioCrisostomo/fix-tree-examples

    fix dom rendering when adding new nodes in example

commit da76a83
Author: Sergio Crisostomo <sergiosbox@gmail.com>
Date:   Tue Oct 24 14:08:52 2017 +0200

    fix dom rendering problems

commit b31aab7
Author: 梁灏 <admin@aresn.com>
Date:   Tue Oct 24 18:14:22 2017 +0800

    Tree add async loading

commit 76a4781
Author: 梁灏 <admin@aresn.com>
Date:   Tue Oct 24 16:48:28 2017 +0800

    fixed iview#2128

commit ccf544d
Author: houyl <houyl@okooo.net>
Date:   Tue Oct 24 16:47:12 2017 +0800

    Merge branch 'master' of https://github.com/iview/iview into 2.0
    Update carousel component: add loop and radiusDot property
    # Conflicts:
    #	package.json
    #	src/components/date-picker/picker.vue
    #	src/components/select/select.vue

commit 9b24f1a
Author: 梁灏 <admin@aresn.com>
Date:   Tue Oct 24 16:20:09 2017 +0800

    Tree add Render function

    fixed iview#2133
    fixed iview#1784
    fixed iview#1333
    fixed iview#1362

commit ecf6c2f
Author: 梁灏 <admin@aresn.com>
Date:   Tue Oct 24 15:47:07 2017 +0800

    update dependence

commit c89e0e1
Merge: 7053de4 0a8f9b4
Author: Aresn <admin@aresn.com>
Date:   Tue Oct 24 02:44:19 2017 -0500

    Merge pull request iview#2090 from SergioCrisostomo/refactor-tree

    Refactor tree

commit 0a8f9b4
Author: Sergio Crisostomo <sergiosbox@gmail.com>
Date:   Tue Oct 24 09:30:09 2017 +0200

    Keep original data pointers and correct if clause

commit d44420b
Author: Sergio Crisostomo <sergiosbox@gmail.com>
Date:   Sat Oct 14 09:49:13 2017 +0200

    refactor and make indeterminate accessible outside tree

commit 94d177c
Author: Sergio Crisostomo <sergiosbox@gmail.com>
Date:   Sat Oct 14 09:47:33 2017 +0200

    add width to expand icon so we can click on it easier

commit 7053de4
Author: 梁灏 <admin@aresn.com>
Date:   Tue Oct 24 09:52:42 2017 +0800

    update demo

commit c61015d
Merge: a5f4a1d 65255c9
Author: Aresn <admin@aresn.com>
Date:   Mon Oct 23 20:22:51 2017 -0500

    Merge pull request iview#2172 from SergioCrisostomo/fix-2164

    format string dates in daterange also

commit a5f4a1d
Author: 梁灏 <admin@aresn.com>
Date:   Mon Oct 23 23:08:40 2017 +0800

    fixed iview#1922

commit 65255c9
Author: Sergio Crisostomo <sergiosbox@gmail.com>
Date:   Mon Oct 23 15:53:12 2017 +0200

    fix date formatting when strings are supplied to DatePicker

commit 6c634aa
Author: 梁灏 <admin@aresn.com>
Date:   Mon Oct 23 19:01:47 2017 +0800

    fixed iview#2078

commit c2d74ec
Author: 梁灏 <admin@aresn.com>
Date:   Mon Oct 23 18:26:42 2017 +0800

    fixed iview#2100

commit b92a1b5
Merge: 6261a49 3ed12b4
Author: Aresn <admin@aresn.com>
Date:   Mon Oct 23 04:22:44 2017 -0500

    Merge pull request iview#2170 from SergioCrisostomo/use-locale-formated-year-month

    Correct month calculation and add specs for date-picker labels

commit 6261a49
Merge: a1553a9 7afb406
Author: Aresn <admin@aresn.com>
Date:   Mon Oct 23 04:19:11 2017 -0500

    Merge pull request iview#2171 from iview/pr/2124

    update Tag style for check

commit a1553a9
Merge: 5064c7b fd79f10
Author: Aresn <admin@aresn.com>
Date:   Mon Oct 23 04:17:50 2017 -0500

    Merge pull request iview#2124 from daiyanze/feature/checkable_tag

    Feature/checkable tag (追加功能:可选标签)

commit 7afb406
Author: 梁灏 <admin@aresn.com>
Date:   Mon Oct 23 17:14:29 2017 +0800

    update Tag style for check

commit 3ed12b4
Author: Sergio Crisostomo <sergiosbox@gmail.com>
Date:   Mon Oct 23 11:13:06 2017 +0200

    Correct month calculation and add specs for date-picker labels

commit fd79f10
Author: Aresn <admin@aresn.com>
Date:   Mon Oct 23 03:57:05 2017 -0500

    Update tag.vue

commit 5064c7b
Author: 梁灏 <admin@aresn.com>
Date:   Mon Oct 23 16:52:30 2017 +0800

    update ja-JP

commit 4c6d996
Author: Aresn <admin@aresn.com>
Date:   Mon Oct 23 03:40:39 2017 -0500

    Update tag.vue

commit b75ad4a
Author: 梁灏 <admin@aresn.com>
Date:   Mon Oct 23 14:12:02 2017 +0800

    fixed iview#1700

commit 6ed0cd7
Author: 梁灏 <admin@aresn.com>
Date:   Mon Oct 23 11:55:35 2017 +0800

    update Tree demo

commit 0e31618
Author: 梁灏 <admin@aresn.com>
Date:   Mon Oct 23 11:00:20 2017 +0800

    update demo

commit ba1422c
Author: 梁灏 <admin@aresn.com>
Date:   Mon Oct 23 09:52:56 2017 +0800

    update zh-TW

commit f672ae0
Merge: 0f65109 2537c26
Author: Aresn <admin@aresn.com>
Date:   Sun Oct 22 20:29:51 2017 -0500

    Merge pull request iview#2097 from SergioCrisostomo/use-locale-formated-year-month

    use date.toLocaleDateString to format year/month

commit 0f65109
Author: 梁灏 <admin@aresn.com>
Date:   Mon Oct 23 09:26:41 2017 +0800

    update

commit a730a84
Author: 梁灏 <admin@aresn.com>
Date:   Fri Oct 20 17:44:58 2017 +0800

    update Tabs

commit ec1a5e2
Merge: 758bd76 be3fbd2
Author: Aresn <admin@aresn.com>
Date:   Fri Oct 20 04:38:28 2017 -0500

    Merge pull request iview#2156 from marxy/tabs-scroll

    Tabs add scroll

commit 758bd76
Merge: 45103ca e15746f
Author: 梁灏 <admin@aresn.com>
Date:   Fri Oct 20 16:56:33 2017 +0800

    Merge branch '2.0' of https://github.com/iview/iview into 2.0

commit 45103ca
Author: 梁灏 <admin@aresn.com>
Date:   Fri Oct 20 16:53:59 2017 +0800

    fixed iview#2066

commit be3fbd2
Author: marxy <334905044@qq.com>
Date:   Fri Oct 20 16:30:44 2017 +0800

    Tabs add scroll

commit e15746f
Author: Aresn <admin@aresn.com>
Date:   Fri Oct 20 03:18:08 2017 -0500

    update dependence

commit 485a903
Author: 梁灏 <admin@aresn.com>
Date:   Fri Oct 20 15:36:43 2017 +0800

    fixed iview#2149

commit cbe5ccf
Merge: 11baa9a 437b805
Author: Aresn <admin@aresn.com>
Date:   Thu Oct 19 22:47:33 2017 -0500

    Merge pull request iview#2114 from SergioCrisostomo/improve-csv

    Improve export to CSV functionality

commit 11baa9a
Merge: 2e8add2 a3336b3
Author: Aresn <admin@aresn.com>
Date:   Thu Oct 19 05:45:31 2017 -0500

    Merge pull request iview#2136 from SergioCrisostomo/fix-scroll-event

    add missing event in callback

commit a3336b3
Author: Sergio Crisostomo <sergiosbox@gmail.com>
Date:   Thu Oct 19 10:41:19 2017 +0200

    add missing event in callback

commit 62bf2b3
Author: daiyanze <ginoalex8964@yahoo.com>
Date:   Wed Oct 18 17:21:52 2017 +0900

    Modify: example of tags

commit dc39cc3
Author: daiyanze <ginoalex8964@yahoo.com>
Date:   Wed Oct 18 17:13:06 2017 +0900

    Feature: Checkable tag

commit 2e8add2
Author: 梁灏 <admin@aresn.com>
Date:   Wed Oct 18 08:58:16 2017 +0800

    release 2.5.1

commit 95dfbe1
Merge: 3c6d8ea 5d1c24c
Author: Aresn <admin@aresn.com>
Date:   Tue Oct 17 19:52:02 2017 -0500

    Merge pull request iview#2120 from SergioCrisostomo/fix-2119

    correct behaviour when initialising date-picker with a empty string

commit 5d1c24c
Author: Sergio Crisostomo <sergiosbox@gmail.com>
Date:   Tue Oct 17 15:13:42 2017 +0200

    correct behaviour when initialising date-picker with a empty string

commit 2537c26
Author: Sergio Crisostomo <sergiosbox@gmail.com>
Date:   Tue Oct 17 14:26:12 2017 +0200

    add dateLabel to time panel

commit b27858d
Author: Sergio Crisostomo <sergiosbox@gmail.com>
Date:   Tue Oct 17 13:09:04 2017 +0200

    add date panel label format logic

commit 3d50db5
Author: Sergio Crisostomo <sergiosbox@gmail.com>
Date:   Tue Oct 17 12:25:36 2017 +0200

    add datePanelLabel format in locale files

commit 437b805
Author: Sergio Crisostomo <sergiosbox@gmail.com>
Date:   Tue Oct 17 10:14:10 2017 +0200

    Added Table to CSV example and tests

commit fb84799
Author: Sergio Crisostomo <sergiosbox@gmail.com>
Date:   Tue Oct 17 10:13:54 2017 +0200

    Improve export to CSV functionality

     - added`callback`option so we can get CSV data in case we do not want
    to download
     - added options:
        - `quoted` for cases when we have line breaks in content
        - `separator` for cases when we have commas in content

commit 3c6d8ea
Author: 梁灏 <admin@aresn.com>
Date:   Tue Oct 17 16:09:11 2017 +0800

    release 2.5.0

commit 61d1637
Author: 梁灏 <admin@aresn.com>
Date:   Mon Oct 16 20:45:46 2017 +0800

    publish 2.5.0-beta.2

commit 78b46fa
Author: 梁灏 <admin@aresn.com>
Date:   Mon Oct 16 20:41:13 2017 +0800

    Scroll add local loading-text

commit 109465d
Author: 梁灏 <admin@aresn.com>
Date:   Mon Oct 16 20:10:21 2017 +0800

    optimize  Scroll scroll behavior

commit 6850c1d
Author: 梁灏 <admin@aresn.com>
Date:   Mon Oct 16 18:32:47 2017 +0800

    Scroll add `height` prop

commit 7462478
Author: 梁灏 <admin@aresn.com>
Date:   Mon Oct 16 16:05:06 2017 +0800

    publish 2.5.0-beta.1

commit 8c2e53e
Merge: f180098 af6a7c4
Author: Aresn <admin@aresn.com>
Date:   Mon Oct 16 02:54:57 2017 -0500

    Merge pull request iview#2069 from dspangenberg/2.0

    DatePicker: weekStartDay did not influence the order of the weekdays in the header

commit af6a7c4
Author: Danny Spangenberg <danny.spangenberg@twiceware.de>
Date:   Wed Oct 11 17:38:03 2017 +0200

    weekStartDay did not influence the order of the weekdays in the header

commit 0c0683e
Author: Haven <baoyx007@gmail.com>
Date:   Thu Sep 28 00:40:16 2017 -0500

    feat(form) : support promise for validate method iview#1857
ZhaoYuLing pushed a commit to baishancloud/iview-bsc that referenced this pull request Dec 21, 2017
commit 7053de4
Author: 梁灏 <admin@aresn.com>
Date:   Tue Oct 24 09:52:42 2017 +0800

    update demo

commit c61015d
Merge: a5f4a1d 65255c9
Author: Aresn <admin@aresn.com>
Date:   Mon Oct 23 20:22:51 2017 -0500

    Merge pull request iview#2172 from SergioCrisostomo/fix-2164

    format string dates in daterange also

commit a5f4a1d
Author: 梁灏 <admin@aresn.com>
Date:   Mon Oct 23 23:08:40 2017 +0800

    fixed iview#1922

commit 65255c9
Author: Sergio Crisostomo <sergiosbox@gmail.com>
Date:   Mon Oct 23 15:53:12 2017 +0200

    fix date formatting when strings are supplied to DatePicker

commit 6c634aa
Author: 梁灏 <admin@aresn.com>
Date:   Mon Oct 23 19:01:47 2017 +0800

    fixed iview#2078

commit c2d74ec
Author: 梁灏 <admin@aresn.com>
Date:   Mon Oct 23 18:26:42 2017 +0800

    fixed iview#2100

commit b92a1b5
Merge: 6261a49 3ed12b4
Author: Aresn <admin@aresn.com>
Date:   Mon Oct 23 04:22:44 2017 -0500

    Merge pull request iview#2170 from SergioCrisostomo/use-locale-formated-year-month

    Correct month calculation and add specs for date-picker labels

commit 6261a49
Merge: a1553a9 7afb406
Author: Aresn <admin@aresn.com>
Date:   Mon Oct 23 04:19:11 2017 -0500

    Merge pull request iview#2171 from iview/pr/2124

    update Tag style for check

commit a1553a9
Merge: 5064c7b fd79f10
Author: Aresn <admin@aresn.com>
Date:   Mon Oct 23 04:17:50 2017 -0500

    Merge pull request iview#2124 from daiyanze/feature/checkable_tag

    Feature/checkable tag (追加功能:可选标签)

commit 7afb406
Author: 梁灏 <admin@aresn.com>
Date:   Mon Oct 23 17:14:29 2017 +0800

    update Tag style for check

commit 3ed12b4
Author: Sergio Crisostomo <sergiosbox@gmail.com>
Date:   Mon Oct 23 11:13:06 2017 +0200

    Correct month calculation and add specs for date-picker labels

commit fd79f10
Author: Aresn <admin@aresn.com>
Date:   Mon Oct 23 03:57:05 2017 -0500

    Update tag.vue

commit 5064c7b
Author: 梁灏 <admin@aresn.com>
Date:   Mon Oct 23 16:52:30 2017 +0800

    update ja-JP

commit 4c6d996
Author: Aresn <admin@aresn.com>
Date:   Mon Oct 23 03:40:39 2017 -0500

    Update tag.vue

commit b75ad4a
Author: 梁灏 <admin@aresn.com>
Date:   Mon Oct 23 14:12:02 2017 +0800

    fixed iview#1700

commit 6ed0cd7
Author: 梁灏 <admin@aresn.com>
Date:   Mon Oct 23 11:55:35 2017 +0800

    update Tree demo

commit 0e31618
Author: 梁灏 <admin@aresn.com>
Date:   Mon Oct 23 11:00:20 2017 +0800

    update demo

commit ba1422c
Author: 梁灏 <admin@aresn.com>
Date:   Mon Oct 23 09:52:56 2017 +0800

    update zh-TW

commit f672ae0
Merge: 0f65109 2537c26
Author: Aresn <admin@aresn.com>
Date:   Sun Oct 22 20:29:51 2017 -0500

    Merge pull request iview#2097 from SergioCrisostomo/use-locale-formated-year-month

    use date.toLocaleDateString to format year/month

commit 0f65109
Author: 梁灏 <admin@aresn.com>
Date:   Mon Oct 23 09:26:41 2017 +0800

    update

commit a730a84
Author: 梁灏 <admin@aresn.com>
Date:   Fri Oct 20 17:44:58 2017 +0800

    update Tabs

commit ec1a5e2
Merge: 758bd76 be3fbd2
Author: Aresn <admin@aresn.com>
Date:   Fri Oct 20 04:38:28 2017 -0500

    Merge pull request iview#2156 from marxy/tabs-scroll

    Tabs add scroll

commit 758bd76
Merge: 45103ca e15746f
Author: 梁灏 <admin@aresn.com>
Date:   Fri Oct 20 16:56:33 2017 +0800

    Merge branch '2.0' of https://github.com/iview/iview into 2.0

commit 45103ca
Author: 梁灏 <admin@aresn.com>
Date:   Fri Oct 20 16:53:59 2017 +0800

    fixed iview#2066

commit be3fbd2
Author: marxy <334905044@qq.com>
Date:   Fri Oct 20 16:30:44 2017 +0800

    Tabs add scroll

commit e15746f
Author: Aresn <admin@aresn.com>
Date:   Fri Oct 20 03:18:08 2017 -0500

    update dependence

commit 485a903
Author: 梁灏 <admin@aresn.com>
Date:   Fri Oct 20 15:36:43 2017 +0800

    fixed iview#2149

commit cbe5ccf
Merge: 11baa9a 437b805
Author: Aresn <admin@aresn.com>
Date:   Thu Oct 19 22:47:33 2017 -0500

    Merge pull request iview#2114 from SergioCrisostomo/improve-csv

    Improve export to CSV functionality

commit 11baa9a
Merge: 2e8add2 a3336b3
Author: Aresn <admin@aresn.com>
Date:   Thu Oct 19 05:45:31 2017 -0500

    Merge pull request iview#2136 from SergioCrisostomo/fix-scroll-event

    add missing event in callback

commit a3336b3
Author: Sergio Crisostomo <sergiosbox@gmail.com>
Date:   Thu Oct 19 10:41:19 2017 +0200

    add missing event in callback

commit 62bf2b3
Author: daiyanze <ginoalex8964@yahoo.com>
Date:   Wed Oct 18 17:21:52 2017 +0900

    Modify: example of tags

commit dc39cc3
Author: daiyanze <ginoalex8964@yahoo.com>
Date:   Wed Oct 18 17:13:06 2017 +0900

    Feature: Checkable tag

commit 2e8add2
Author: 梁灏 <admin@aresn.com>
Date:   Wed Oct 18 08:58:16 2017 +0800

    release 2.5.1

commit 95dfbe1
Merge: 3c6d8ea 5d1c24c
Author: Aresn <admin@aresn.com>
Date:   Tue Oct 17 19:52:02 2017 -0500

    Merge pull request iview#2120 from SergioCrisostomo/fix-2119

    correct behaviour when initialising date-picker with a empty string

commit 5d1c24c
Author: Sergio Crisostomo <sergiosbox@gmail.com>
Date:   Tue Oct 17 15:13:42 2017 +0200

    correct behaviour when initialising date-picker with a empty string

commit 2537c26
Author: Sergio Crisostomo <sergiosbox@gmail.com>
Date:   Tue Oct 17 14:26:12 2017 +0200

    add dateLabel to time panel

commit b27858d
Author: Sergio Crisostomo <sergiosbox@gmail.com>
Date:   Tue Oct 17 13:09:04 2017 +0200

    add date panel label format logic

commit 3d50db5
Author: Sergio Crisostomo <sergiosbox@gmail.com>
Date:   Tue Oct 17 12:25:36 2017 +0200

    add datePanelLabel format in locale files

commit 437b805
Author: Sergio Crisostomo <sergiosbox@gmail.com>
Date:   Tue Oct 17 10:14:10 2017 +0200

    Added Table to CSV example and tests

commit fb84799
Author: Sergio Crisostomo <sergiosbox@gmail.com>
Date:   Tue Oct 17 10:13:54 2017 +0200

    Improve export to CSV functionality

     - added`callback`option so we can get CSV data in case we do not want
    to download
     - added options:
        - `quoted` for cases when we have line breaks in content
        - `separator` for cases when we have commas in content

commit 3c6d8ea
Author: 梁灏 <admin@aresn.com>
Date:   Tue Oct 17 16:09:11 2017 +0800

    release 2.5.0

commit 61d1637
Author: 梁灏 <admin@aresn.com>
Date:   Mon Oct 16 20:45:46 2017 +0800

    publish 2.5.0-beta.2

commit 78b46fa
Author: 梁灏 <admin@aresn.com>
Date:   Mon Oct 16 20:41:13 2017 +0800

    Scroll add local loading-text

commit 109465d
Author: 梁灏 <admin@aresn.com>
Date:   Mon Oct 16 20:10:21 2017 +0800

    optimize  Scroll scroll behavior

commit 6850c1d
Author: 梁灏 <admin@aresn.com>
Date:   Mon Oct 16 18:32:47 2017 +0800

    Scroll add `height` prop

commit 7462478
Author: 梁灏 <admin@aresn.com>
Date:   Mon Oct 16 16:05:06 2017 +0800

    publish 2.5.0-beta.1

commit 8c2e53e
Merge: f180098 af6a7c4
Author: Aresn <admin@aresn.com>
Date:   Mon Oct 16 02:54:57 2017 -0500

    Merge pull request iview#2069 from dspangenberg/2.0

    DatePicker: weekStartDay did not influence the order of the weekdays in the header

commit af6a7c4
Author: Danny Spangenberg <danny.spangenberg@twiceware.de>
Date:   Wed Oct 11 17:38:03 2017 +0200

    weekStartDay did not influence the order of the weekdays in the header
ZhaoYuLing pushed a commit to baishancloud/iview-bsc that referenced this pull request Dec 21, 2017
commit 9af3d87
Author: lan <adwerrd@hotmail.com>
Date:   Mon Nov 6 10:40:32 2017 +0800

    radio adn switch dark

commit 914a145
Author: xiaoyu <852483353@qq.com>
Date:   Sat Nov 4 17:27:07 2017 +0800

    slider dark

commit 83c7b53
Author: xiaoyu <852483353@qq.com>
Date:   Sat Nov 4 17:03:22 2017 +0800

    progress dark

commit 85c812f
Author: xiaoyu <852483353@qq.com>
Date:   Sat Nov 4 13:58:21 2017 +0800

    tooltip dark

commit 664d022
Author: xiaoyu <852483353@qq.com>
Date:   Sat Nov 4 11:48:41 2017 +0800

    poptip dark

commit d02a4fa
Author: xiaoyu <852483353@qq.com>
Date:   Fri Nov 3 20:28:18 2017 +0800

    spin dark

commit bb38adf
Author: xiaoyu <852483353@qq.com>
Date:   Fri Nov 3 19:19:17 2017 +0800

    tabs dark

commit 90713f1
Author: xiaoyu <852483353@qq.com>
Date:   Fri Nov 3 16:55:08 2017 +0800

    tag dark

commit ba22112
Author: xiaoyu <852483353@qq.com>
Date:   Fri Nov 3 16:18:17 2017 +0800

    input-number dark

commit ef06cf2
Author: xiaoyu <852483353@qq.com>
Date:   Fri Nov 3 15:18:32 2017 +0800

    input dark

commit bbc598f
Author: lan <adwerrd@hotmail.com>
Date:   Thu Nov 2 19:44:57 2017 +0800

    version change

commit 4f84332
Author: lan <adwerrd@hotmail.com>
Date:   Thu Nov 2 19:43:52 2017 +0800

    switch bugfix

commit 99d0b55
Author: lan <adwerrd@hotmail.com>
Date:   Thu Nov 2 19:43:16 2017 +0800

    Squashed commit of the following:

    commit 427dd34
    Author: 梁灏 <admin@aresn.com>
    Date:   Thu Nov 2 18:23:10 2017 +0800

        update issue guide

    commit 0819648
    Merge: 470930e d1f698c
    Author: Aresn <admin@aresn.com>
    Date:   Wed Nov 1 04:03:17 2017 -0500

        Merge pull request iview#2274 from yangdan8/patch-2

        Modal弹窗请添加on-visible-change给外部api访问

    commit d1f698c
    Author: yangdan8 <13532023084@139.com>
    Date:   Wed Nov 1 15:12:12 2017 +0800

        Modal弹窗请添加on-visible-change给外部api访问

        Modal弹窗请添加on-visible-change给外部api访问

    commit 470930e
    Author: 梁灏 <admin@aresn.com>
    Date:   Tue Oct 31 14:15:00 2017 +0800

        update issue template

    commit d44e817
    Author: 梁灏 <admin@aresn.com>
    Date:   Tue Oct 31 10:33:50 2017 +0800

        update Readme

    commit 1a1f7c3
    Merge: 75fa706 915e06d
    Author: 梁灏 <admin@aresn.com>
    Date:   Mon Oct 30 16:09:25 2017 +0800

        Merge branch '2.0' of https://github.com/iview/iview into 2.0

    commit 75fa706
    Author: 梁灏 <admin@aresn.com>
    Date:   Mon Oct 30 16:01:18 2017 +0800

        update tabs demo

    commit 915e06d
    Merge: 1231c1a 3be0aa1
    Author: Aresn <admin@aresn.com>
    Date:   Mon Oct 30 03:01:06 2017 -0500

        Merge pull request iview#2230 from cheng-kang/2.0

        fix issue iview#1846

    commit 1231c1a
    Merge: 5a83c4a 0c0683e
    Author: Aresn <admin@aresn.com>
    Date:   Mon Oct 30 02:46:05 2017 -0500

        Merge pull request iview#2018 from Baoyx007/patch-1

        feat(form) : support promise for validate method iview#1857

    commit 3be0aa1
    Author: Kang Cheng <me@chengkang.pw>
    Date:   Mon Oct 30 00:33:31 2017 -0700

        Import custom MutationObserver; remove mutation observer before component get destroyed

    commit 5a83c4a
    Merge: 7a9f6b2 b30250a
    Author: Aresn <admin@aresn.com>
    Date:   Mon Oct 30 01:40:31 2017 -0500

        Merge pull request iview#2223 from chavyleung/2.0

        fixed: iview#2219 & ColorPicker icon position

    commit 7988575
    Author: Kang Cheng <me@chengkang.pw>
    Date:   Sun Oct 29 15:39:45 2017 -0700

        fix issue iview#1846

    commit b30250a
    Author: Chavy <chavyleung@163.com>
    Date:   Sat Oct 28 11:57:38 2017 +0800

        fixed: iview#2219 & ColorPicker icon position

    commit 7a9f6b2
    Merge: 7d25930 a892ba6
    Author: Aresn <admin@aresn.com>
    Date:   Fri Oct 27 02:22:16 2017 -0500

        Merge pull request iview#2213 from SergioCrisostomo/fix-number-input

        prevent firing change when typing numbers < min

    commit a892ba6
    Author: Sergio Crisostomo <sergiosbox@gmail.com>
    Date:   Fri Oct 27 08:40:11 2017 +0200

        prevent firing change when typing numbers < min

    commit 7d25930
    Author: 梁灏 <admin@aresn.com>
    Date:   Thu Oct 26 14:47:54 2017 +0800

        release 2.6.0

    commit f673ca4
    Author: 梁灏 <admin@aresn.com>
    Date:   Thu Oct 26 14:18:07 2017 +0800

        publish 2.6.0 beta

    commit 86cdfb8
    Merge: 252717e 19ad5f4
    Author: Aresn <admin@aresn.com>
    Date:   Thu Oct 26 00:14:52 2017 -0500

        Merge pull request iview#2194 from SergioCrisostomo/add-scroll-distance-to-edge

        add distance-to-edge property

    commit 19ad5f4
    Author: Aresn <admin@aresn.com>
    Date:   Thu Oct 26 00:14:36 2017 -0500

        Update scroll.vue

    commit 252717e
    Merge: 9147e63 dfae43a
    Author: Aresn <admin@aresn.com>
    Date:   Thu Oct 26 00:13:02 2017 -0500

        Merge pull request iview#2193 from SergioCrisostomo/fix-2191

        correct input value in filterable mode

    commit 9147e63
    Merge: 51939f8 cbdac01
    Author: Aresn <admin@aresn.com>
    Date:   Thu Oct 26 00:10:44 2017 -0500

        Merge pull request iview#2195 from yangdan8/patch-4

        Update table.vue  解决tabs切换时,tab中的table调试时控制台报$el undefined的问题

    commit cbdac01
    Author: Aresn <admin@aresn.com>
    Date:   Thu Oct 26 00:09:42 2017 -0500

        Update table.vue

    commit 51939f8
    Author: 梁灏 <admin@aresn.com>
    Date:   Thu Oct 26 12:55:18 2017 +0800

        update Select tag

    commit 2079c47
    Author: 梁灏 <admin@aresn.com>
    Date:   Thu Oct 26 11:57:24 2017 +0800

        update Tag

    commit 2993f4e
    Author: 梁灏 <admin@aresn.com>
    Date:   Thu Oct 26 11:26:05 2017 +0800

        update Tab

    commit f6a787f
    Author: yangdan8 <13532023084@139.com>
    Date:   Thu Oct 26 09:48:47 2017 +0800

        Update table.vue

    commit 72ba666
    Author: Sergio Crisostomo <sergiosbox@gmail.com>
    Date:   Wed Oct 25 21:21:35 2017 +0200

        add distance-to-edge property

    commit dfae43a
    Author: Sergio Crisostomo <sergiosbox@gmail.com>
    Date:   Wed Oct 25 20:49:38 2017 +0200

        correct input value in filterable mode

    commit af7d72b
    Author: 梁灏 <admin@aresn.com>
    Date:   Wed Oct 25 22:34:58 2017 +0800

        update Tree selected

    commit 6ff0e34
    Author: 梁灏 <admin@aresn.com>
    Date:   Wed Oct 25 21:10:29 2017 +0800

        update Tree Render function

    commit 97098fc
    Author: 梁灏 <admin@aresn.com>
    Date:   Wed Oct 25 19:12:14 2017 +0800

        update Tree example

    commit b64204f
    Author: 梁灏 <admin@aresn.com>
    Date:   Wed Oct 25 17:41:37 2017 +0800

        update Tree demo

    commit 174836c
    Author: 梁灏 <admin@aresn.com>
    Date:   Wed Oct 25 16:45:42 2017 +0800

        update Tree Render function use

    commit 3ea2461
    Author: 梁灏 <admin@aresn.com>
    Date:   Wed Oct 25 14:33:22 2017 +0800

        update checkbox style

    commit 69460a5
    Merge: 8711920 610fd3a
    Author: Aresn <admin@aresn.com>
    Date:   Tue Oct 24 21:44:41 2017 -0500

        Merge pull request iview#2181 from lisafra/update-carousel

        Update carousel component: add loop and radiusDot property

    commit 610fd3a
    Author: houyl <houyl@okooo.net>
    Date:   Wed Oct 25 09:30:46 2017 +0800

        [fix bug]  carousel component: remove no use code

    commit 8711920
    Merge: 2be2b97 692be62
    Author: Aresn <admin@aresn.com>
    Date:   Tue Oct 24 19:14:01 2017 -0500

        Merge pull request iview#2185 from md678685/patch-1

        Fix some English grammar in README

    commit 692be62
    Author: md678685 <mathew678@hotmail.co.uk>
    Date:   Tue Oct 24 21:06:04 2017 +0100

        Fix some English grammar in README

        This PR changes some of the English sentences in the `README.md` to sound more natural. I have tried to keep the structure as close as possible to the original. If anything sounds confusing, please reply below.

        这个PR改变了`README.md`中的一些英文句子,使其听起来更自然。 我试图保持结构尽可能接近原来。 如有任何疑问,请在下面回覆。

    commit 2be2b97
    Merge: b31aab7 da76a83
    Author: Aresn <admin@aresn.com>
    Date:   Tue Oct 24 07:46:14 2017 -0500

        Merge pull request iview#2184 from SergioCrisostomo/fix-tree-examples

        fix dom rendering when adding new nodes in example

    commit da76a83
    Author: Sergio Crisostomo <sergiosbox@gmail.com>
    Date:   Tue Oct 24 14:08:52 2017 +0200

        fix dom rendering problems

    commit b31aab7
    Author: 梁灏 <admin@aresn.com>
    Date:   Tue Oct 24 18:14:22 2017 +0800

        Tree add async loading

    commit 76a4781
    Author: 梁灏 <admin@aresn.com>
    Date:   Tue Oct 24 16:48:28 2017 +0800

        fixed iview#2128

    commit ccf544d
    Author: houyl <houyl@okooo.net>
    Date:   Tue Oct 24 16:47:12 2017 +0800

        Merge branch 'master' of https://github.com/iview/iview into 2.0
        Update carousel component: add loop and radiusDot property
        # Conflicts:
        #	package.json
        #	src/components/date-picker/picker.vue
        #	src/components/select/select.vue

    commit 9b24f1a
    Author: 梁灏 <admin@aresn.com>
    Date:   Tue Oct 24 16:20:09 2017 +0800

        Tree add Render function

        fixed iview#2133
        fixed iview#1784
        fixed iview#1333
        fixed iview#1362

    commit ecf6c2f
    Author: 梁灏 <admin@aresn.com>
    Date:   Tue Oct 24 15:47:07 2017 +0800

        update dependence

    commit c89e0e1
    Merge: 7053de4 0a8f9b4
    Author: Aresn <admin@aresn.com>
    Date:   Tue Oct 24 02:44:19 2017 -0500

        Merge pull request iview#2090 from SergioCrisostomo/refactor-tree

        Refactor tree

    commit 0a8f9b4
    Author: Sergio Crisostomo <sergiosbox@gmail.com>
    Date:   Tue Oct 24 09:30:09 2017 +0200

        Keep original data pointers and correct if clause

    commit d44420b
    Author: Sergio Crisostomo <sergiosbox@gmail.com>
    Date:   Sat Oct 14 09:49:13 2017 +0200

        refactor and make indeterminate accessible outside tree

    commit 94d177c
    Author: Sergio Crisostomo <sergiosbox@gmail.com>
    Date:   Sat Oct 14 09:47:33 2017 +0200

        add width to expand icon so we can click on it easier

    commit 7053de4
    Author: 梁灏 <admin@aresn.com>
    Date:   Tue Oct 24 09:52:42 2017 +0800

        update demo

    commit c61015d
    Merge: a5f4a1d 65255c9
    Author: Aresn <admin@aresn.com>
    Date:   Mon Oct 23 20:22:51 2017 -0500

        Merge pull request iview#2172 from SergioCrisostomo/fix-2164

        format string dates in daterange also

    commit a5f4a1d
    Author: 梁灏 <admin@aresn.com>
    Date:   Mon Oct 23 23:08:40 2017 +0800

        fixed iview#1922

    commit 65255c9
    Author: Sergio Crisostomo <sergiosbox@gmail.com>
    Date:   Mon Oct 23 15:53:12 2017 +0200

        fix date formatting when strings are supplied to DatePicker

    commit 6c634aa
    Author: 梁灏 <admin@aresn.com>
    Date:   Mon Oct 23 19:01:47 2017 +0800

        fixed iview#2078

    commit c2d74ec
    Author: 梁灏 <admin@aresn.com>
    Date:   Mon Oct 23 18:26:42 2017 +0800

        fixed iview#2100

    commit b92a1b5
    Merge: 6261a49 3ed12b4
    Author: Aresn <admin@aresn.com>
    Date:   Mon Oct 23 04:22:44 2017 -0500

        Merge pull request iview#2170 from SergioCrisostomo/use-locale-formated-year-month

        Correct month calculation and add specs for date-picker labels

    commit 6261a49
    Merge: a1553a9 7afb406
    Author: Aresn <admin@aresn.com>
    Date:   Mon Oct 23 04:19:11 2017 -0500

        Merge pull request iview#2171 from iview/pr/2124

        update Tag style for check

    commit a1553a9
    Merge: 5064c7b fd79f10
    Author: Aresn <admin@aresn.com>
    Date:   Mon Oct 23 04:17:50 2017 -0500

        Merge pull request iview#2124 from daiyanze/feature/checkable_tag

        Feature/checkable tag (追加功能:可选标签)

    commit 7afb406
    Author: 梁灏 <admin@aresn.com>
    Date:   Mon Oct 23 17:14:29 2017 +0800

        update Tag style for check

    commit 3ed12b4
    Author: Sergio Crisostomo <sergiosbox@gmail.com>
    Date:   Mon Oct 23 11:13:06 2017 +0200

        Correct month calculation and add specs for date-picker labels

    commit fd79f10
    Author: Aresn <admin@aresn.com>
    Date:   Mon Oct 23 03:57:05 2017 -0500

        Update tag.vue

    commit 5064c7b
    Author: 梁灏 <admin@aresn.com>
    Date:   Mon Oct 23 16:52:30 2017 +0800

        update ja-JP

    commit 4c6d996
    Author: Aresn <admin@aresn.com>
    Date:   Mon Oct 23 03:40:39 2017 -0500

        Update tag.vue

    commit b75ad4a
    Author: 梁灏 <admin@aresn.com>
    Date:   Mon Oct 23 14:12:02 2017 +0800

        fixed iview#1700

    commit 6ed0cd7
    Author: 梁灏 <admin@aresn.com>
    Date:   Mon Oct 23 11:55:35 2017 +0800

        update Tree demo

    commit 0e31618
    Author: 梁灏 <admin@aresn.com>
    Date:   Mon Oct 23 11:00:20 2017 +0800

        update demo

    commit ba1422c
    Author: 梁灏 <admin@aresn.com>
    Date:   Mon Oct 23 09:52:56 2017 +0800

        update zh-TW

    commit f672ae0
    Merge: 0f65109 2537c26
    Author: Aresn <admin@aresn.com>
    Date:   Sun Oct 22 20:29:51 2017 -0500

        Merge pull request iview#2097 from SergioCrisostomo/use-locale-formated-year-month

        use date.toLocaleDateString to format year/month

    commit 0f65109
    Author: 梁灏 <admin@aresn.com>
    Date:   Mon Oct 23 09:26:41 2017 +0800

        update

    commit a730a84
    Author: 梁灏 <admin@aresn.com>
    Date:   Fri Oct 20 17:44:58 2017 +0800

        update Tabs

    commit ec1a5e2
    Merge: 758bd76 be3fbd2
    Author: Aresn <admin@aresn.com>
    Date:   Fri Oct 20 04:38:28 2017 -0500

        Merge pull request iview#2156 from marxy/tabs-scroll

        Tabs add scroll

    commit 758bd76
    Merge: 45103ca e15746f
    Author: 梁灏 <admin@aresn.com>
    Date:   Fri Oct 20 16:56:33 2017 +0800

        Merge branch '2.0' of https://github.com/iview/iview into 2.0

    commit 45103ca
    Author: 梁灏 <admin@aresn.com>
    Date:   Fri Oct 20 16:53:59 2017 +0800

        fixed iview#2066

    commit be3fbd2
    Author: marxy <334905044@qq.com>
    Date:   Fri Oct 20 16:30:44 2017 +0800

        Tabs add scroll

    commit e15746f
    Author: Aresn <admin@aresn.com>
    Date:   Fri Oct 20 03:18:08 2017 -0500

        update dependence

    commit 485a903
    Author: 梁灏 <admin@aresn.com>
    Date:   Fri Oct 20 15:36:43 2017 +0800

        fixed iview#2149

    commit cbe5ccf
    Merge: 11baa9a 437b805
    Author: Aresn <admin@aresn.com>
    Date:   Thu Oct 19 22:47:33 2017 -0500

        Merge pull request iview#2114 from SergioCrisostomo/improve-csv

        Improve export to CSV functionality

    commit 11baa9a
    Merge: 2e8add2 a3336b3
    Author: Aresn <admin@aresn.com>
    Date:   Thu Oct 19 05:45:31 2017 -0500

        Merge pull request iview#2136 from SergioCrisostomo/fix-scroll-event

        add missing event in callback

    commit a3336b3
    Author: Sergio Crisostomo <sergiosbox@gmail.com>
    Date:   Thu Oct 19 10:41:19 2017 +0200

        add missing event in callback

    commit 62bf2b3
    Author: daiyanze <ginoalex8964@yahoo.com>
    Date:   Wed Oct 18 17:21:52 2017 +0900

        Modify: example of tags

    commit dc39cc3
    Author: daiyanze <ginoalex8964@yahoo.com>
    Date:   Wed Oct 18 17:13:06 2017 +0900

        Feature: Checkable tag

    commit 2e8add2
    Author: 梁灏 <admin@aresn.com>
    Date:   Wed Oct 18 08:58:16 2017 +0800

        release 2.5.1

    commit 95dfbe1
    Merge: 3c6d8ea 5d1c24c
    Author: Aresn <admin@aresn.com>
    Date:   Tue Oct 17 19:52:02 2017 -0500

        Merge pull request iview#2120 from SergioCrisostomo/fix-2119

        correct behaviour when initialising date-picker with a empty string

    commit 5d1c24c
    Author: Sergio Crisostomo <sergiosbox@gmail.com>
    Date:   Tue Oct 17 15:13:42 2017 +0200

        correct behaviour when initialising date-picker with a empty string

    commit 2537c26
    Author: Sergio Crisostomo <sergiosbox@gmail.com>
    Date:   Tue Oct 17 14:26:12 2017 +0200

        add dateLabel to time panel

    commit b27858d
    Author: Sergio Crisostomo <sergiosbox@gmail.com>
    Date:   Tue Oct 17 13:09:04 2017 +0200

        add date panel label format logic

    commit 3d50db5
    Author: Sergio Crisostomo <sergiosbox@gmail.com>
    Date:   Tue Oct 17 12:25:36 2017 +0200

        add datePanelLabel format in locale files

    commit 437b805
    Author: Sergio Crisostomo <sergiosbox@gmail.com>
    Date:   Tue Oct 17 10:14:10 2017 +0200

        Added Table to CSV example and tests

    commit fb84799
    Author: Sergio Crisostomo <sergiosbox@gmail.com>
    Date:   Tue Oct 17 10:13:54 2017 +0200

        Improve export to CSV functionality

         - added`callback`option so we can get CSV data in case we do not want
        to download
         - added options:
            - `quoted` for cases when we have line breaks in content
            - `separator` for cases when we have commas in content

    commit 3c6d8ea
    Author: 梁灏 <admin@aresn.com>
    Date:   Tue Oct 17 16:09:11 2017 +0800

        release 2.5.0

    commit 61d1637
    Author: 梁灏 <admin@aresn.com>
    Date:   Mon Oct 16 20:45:46 2017 +0800

        publish 2.5.0-beta.2

    commit 78b46fa
    Author: 梁灏 <admin@aresn.com>
    Date:   Mon Oct 16 20:41:13 2017 +0800

        Scroll add local loading-text

    commit 109465d
    Author: 梁灏 <admin@aresn.com>
    Date:   Mon Oct 16 20:10:21 2017 +0800

        optimize  Scroll scroll behavior

    commit 6850c1d
    Author: 梁灏 <admin@aresn.com>
    Date:   Mon Oct 16 18:32:47 2017 +0800

        Scroll add `height` prop

    commit 7462478
    Author: 梁灏 <admin@aresn.com>
    Date:   Mon Oct 16 16:05:06 2017 +0800

        publish 2.5.0-beta.1

    commit 8c2e53e
    Merge: f180098 af6a7c4
    Author: Aresn <admin@aresn.com>
    Date:   Mon Oct 16 02:54:57 2017 -0500

        Merge pull request iview#2069 from dspangenberg/2.0

        DatePicker: weekStartDay did not influence the order of the weekdays in the header

    commit af6a7c4
    Author: Danny Spangenberg <danny.spangenberg@twiceware.de>
    Date:   Wed Oct 11 17:38:03 2017 +0200

        weekStartDay did not influence the order of the weekdays in the header

    commit 0c0683e
    Author: Haven <baoyx007@gmail.com>
    Date:   Thu Sep 28 00:40:16 2017 -0500

        feat(form) : support promise for validate method iview#1857

commit d545cc6
Author: xiaoyu <852483353@qq.com>
Date:   Thu Nov 2 17:35:44 2017 +0800

    dark bugfix

commit 2995faf
Author: xiaoyu <852483353@qq.com>
Date:   Thu Nov 2 16:50:39 2017 +0800

    date-picker dark

commit d8dc76f
Author: lan <adwerrd@hotmail.com>
Date:   Wed Nov 1 16:52:46 2017 +0800

    remove css-dark

commit c4789cd
Author: xiaoyu <852483353@qq.com>
Date:   Thu Nov 2 10:40:41 2017 +0800

    select dark

commit 5ae38e2
Author: xiaoyu <852483353@qq.com>
Date:   Wed Nov 1 17:11:50 2017 +0800

    checkbox dark

commit 706736c
Author: xiaoyu <852483353@qq.com>
Date:   Wed Nov 1 16:19:36 2017 +0800

    modify modal dark

commit 363dc6f
Author: xiaoyu <852483353@qq.com>
Date:   Wed Nov 1 14:52:21 2017 +0800

    simplify table dark

commit e5efbcb
Author: lan <adwerrd@hotmail.com>
Date:   Wed Nov 1 15:15:49 2017 +0800

    button dark

commit 4ccbf8e
Author: lan <adwerrd@hotmail.com>
Date:   Tue Oct 31 15:51:13 2017 +0800

    button dark

commit 4ba897d
Author: xiaoyu <852483353@qq.com>
Date:   Wed Nov 1 12:01:47 2017 +0800

    modify -dark in custom.less

commit 94151fc
Author: xiaoyu <852483353@qq.com>
Date:   Wed Nov 1 11:12:45 2017 +0800

    add -dark in custom.less

commit a361f59
Author: xiaoyu <852483353@qq.com>
Date:   Tue Oct 31 19:35:00 2017 +0800

    checkbox dark

commit 023454d
Author: xiaoyu <852483353@qq.com>
Date:   Tue Oct 31 17:32:37 2017 +0800

    dark table sort  bugfix

commit 25e3758
Author: zyl <949472497@qq.com>
Date:   Tue Oct 31 16:49:30 2017 +0800

    switch black bugfix

commit e08998c
Author: zyl <949472497@qq.com>
Date:   Tue Oct 31 16:05:36 2017 +0800

    switch black

commit 71a091b
Author: zyl <949472497@qq.com>
Date:   Tue Oct 31 15:00:47 2017 +0800

    tag black

commit 62587b6
Author: zyl <949472497@qq.com>
Date:   Wed Oct 25 19:17:36 2017 +0800

    input black

commit 8795f12
Author: zyl <949472497@qq.com>
Date:   Wed Oct 25 19:34:24 2017 +0800

    input-number black

commit eee42f9
Author: zyl <949472497@qq.com>
Date:   Wed Oct 25 19:28:46 2017 +0800

    radio black

commit 8109034
Author: zyl <949472497@qq.com>
Date:   Wed Oct 25 19:17:36 2017 +0800

    input black

commit 8d78de9
Author: xiaoyu <852483353@qq.com>
Date:   Tue Oct 31 16:25:58 2017 +0800

    date-picker dark

commit dc01707
Author: xiaoyu <852483353@qq.com>
Date:   Wed Oct 25 18:56:38 2017 +0800

    modal-dark  and  select-dark

commit f54459a
Author: xiaoyu <852483353@qq.com>
Date:   Wed Oct 25 11:58:57 2017 +0800

    table dark

commit 2fab71a
Author: lan <adwerrd@hotmail.com>
Date:   Tue Oct 24 20:56:44 2017 +0800

    add dark less

commit ed4e493
Author: lan <adwerrd@hotmail.com>
Date:   Tue Oct 24 20:56:34 2017 +0800

    add dark less 2

commit 5060fc8
Author: lan <adwerrd@hotmail.com>
Date:   Tue Oct 24 19:34:26 2017 +0800

    add dark less

commit b51c7cb
Author: xiaoyu <852483353@qq.com>
Date:   Tue Oct 24 17:02:32 2017 +0800

    table black color
ZhaoYuLing pushed a commit to baishancloud/iview-bsc that referenced this pull request Dec 21, 2017
commit 240bb21
Author: 梁灏 <admin@aresn.com>
Date:   Mon Nov 13 11:35:19 2017 +0800

    release 2.7.0

commit f2212c3
Author: 梁灏 <admin@aresn.com>
Date:   Mon Nov 13 10:07:45 2017 +0800

    publish 2.7.0-beta.1

commit 5bd0f52
Author: 梁灏 <admin@aresn.com>
Date:   Mon Nov 13 09:44:56 2017 +0800

    fixed

    iview#1090 iview#2387 iview#2379

commit d63a378
Author: 梁灏 <admin@aresn.com>
Date:   Mon Nov 13 09:27:54 2017 +0800

    fixed

    iview#1090 iview#2387 iview#379

commit a5dad1a
Author: 梁灏 <admin@aresn.com>
Date:   Mon Nov 13 09:14:03 2017 +0800

    fixed iview#1090 & close iview#2387 iview#2379

commit 6b2af1b
Merge: 593742a a2a18a4
Author: Aresn <admin@aresn.com>
Date:   Thu Nov 9 20:32:16 2017 -0600

    Merge pull request iview#2377 from btfrankenstein/2.0

    feat($input-number): add events 'on-focus', 'on-blur', 'on-enter' for…

commit a2a18a4
Author: Aresn <admin@aresn.com>
Date:   Thu Nov 9 20:31:47 2017 -0600

    Update input-number.vue

    remove `on-enter` because excessive and inflexible

commit c21a814
Author: btfrankenstein <btfrankenstein@gmail.com>
Date:   Thu Nov 9 17:56:33 2017 +0800

    feat($input-number): add events 'on-focus', 'on-blur', 'on-enter' for input-number component

commit 593742a
Author: 梁灏 <admin@aresn.com>
Date:   Thu Nov 9 17:06:49 2017 +0800

    update locale build file

commit b355578
Merge: 9d1add4 0c0d2c7
Author: Aresn <admin@aresn.com>
Date:   Thu Nov 9 00:47:25 2017 -0600

    Merge pull request iview#2354 from SergioCrisostomo/dry-exports

    reorganize and DRY components list

commit 9d1add4
Author: 梁灏 <admin@aresn.com>
Date:   Thu Nov 9 14:38:26 2017 +0800

    update Date example

commit 2df70eb
Merge: b91fd49 40aa935
Author: Aresn <admin@aresn.com>
Date:   Thu Nov 9 00:37:27 2017 -0600

    Merge pull request iview#2356 from SergioCrisostomo/fix-2122

    Patch Chromium bug

commit b91fd49
Merge: 4b33839 7f8d334
Author: Aresn <admin@aresn.com>
Date:   Thu Nov 9 00:18:47 2017 -0600

    Merge pull request iview#2368 from SergioCrisostomo/fix-datepicker-test

    fix date picker callback test

commit 7f8d334
Author: Sergio Crisostomo <sergiosbox@gmail.com>
Date:   Thu Nov 9 05:58:25 2017 +0100

    fix date picker callback test

commit 0c0d2c7
Author: Sergio Crisostomo <sergiosbox@gmail.com>
Date:   Thu Nov 9 05:50:30 2017 +0100

    reorganize and DRY components list

commit 4b33839
Author: 梁灏 <admin@aresn.com>
Date:   Thu Nov 9 11:11:54 2017 +0800

    update Select example

commit 67a9c1c
Author: 梁灏 <admin@aresn.com>
Date:   Thu Nov 9 09:48:56 2017 +0800

    update Tabs

commit bff9081
Merge: 4ab1ac5 5fbe80f
Author: Aresn <admin@aresn.com>
Date:   Wed Nov 8 19:19:51 2017 -0600

    Merge pull request iview#2351 from SergioCrisostomo/i18n

    use dist's locale

commit 4ab1ac5
Merge: 37fe6bb 236e0bf
Author: Aresn <admin@aresn.com>
Date:   Wed Nov 8 19:17:32 2017 -0600

    Merge pull request iview#2358 from SergioCrisostomo/ie-fix-2330

    Don't use includes to make IE happy and avoid Polyfill

commit 37fe6bb
Merge: 22c27b7 b1d124f
Author: Aresn <admin@aresn.com>
Date:   Wed Nov 8 19:15:00 2017 -0600

    Merge pull request iview#2361 from SergioCrisostomo/fix-2215

    add test for iview#2215

commit b1d124f
Author: Sergio Crisostomo <sergiosbox@gmail.com>
Date:   Wed Nov 8 16:07:23 2017 +0100

    add test for iview#2215

commit 22c27b7
Author: 梁灏 <admin@aresn.com>
Date:   Wed Nov 8 20:44:35 2017 +0800

    fixed iview#2215

commit 236e0bf
Author: Sergio Crisostomo <sergiosbox@gmail.com>
Date:   Wed Nov 8 10:14:08 2017 +0100

    DOn't use includes to make IE happy and avoid Polyfill

commit 5fbe80f
Author: Sergio Crisostomo <sergiosbox@gmail.com>
Date:   Wed Nov 8 09:59:45 2017 +0100

    use dist's locale

commit 40aa935
Author: Sergio Crisostomo <sergiosbox@gmail.com>
Date:   Wed Nov 8 09:54:14 2017 +0100

    patch chromium bug

commit b142865
Author: 梁灏 <admin@aresn.com>
Date:   Wed Nov 8 16:11:04 2017 +0800

    fixed iview#2102

commit 55f90d8
Author: 梁灏 <admin@aresn.com>
Date:   Wed Nov 8 14:39:39 2017 +0800

    fixed iview#1648

commit 6319935
Merge: cd92d87 297d1f1
Author: Aresn <admin@aresn.com>
Date:   Tue Nov 7 20:14:16 2017 -0600

    Merge pull request iview#2341 from f3man/2.0

    add uk_UA locale

commit cd92d87
Author: 梁灏 <admin@aresn.com>
Date:   Tue Nov 7 18:09:01 2017 +0800

    fixed iview#1482

commit 9f5a643
Author: 梁灏 <admin@aresn.com>
Date:   Tue Nov 7 17:54:36 2017 +0800

    fixed iview#2019

commit 84a4a95
Author: 梁灏 <admin@aresn.com>
Date:   Tue Nov 7 17:36:26 2017 +0800

    fixed iview#1926

commit 05265be
Author: 梁灏 <admin@aresn.com>
Date:   Tue Nov 7 17:28:20 2017 +0800

    fixed iview#2214

commit 6d2b7bc
Author: 梁灏 <admin@aresn.com>
Date:   Tue Nov 7 17:07:03 2017 +0800

    fixed iview#1575

commit 8869b70
Author: 梁灏 <admin@aresn.com>
Date:   Tue Nov 7 16:59:20 2017 +0800

    update

commit c7e432f
Author: 梁灏 <admin@aresn.com>
Date:   Tue Nov 7 16:43:23 2017 +0800

    update export & i18n

commit 297d1f1
Author: f3man <stepan7box@gmail.com>
Date:   Tue Nov 7 10:19:12 2017 +0200

    add uk_UA locale

    added ukranian language

commit 32e8393
Merge: bceb3c5 c17c5ad
Author: Aresn <admin@aresn.com>
Date:   Mon Nov 6 19:11:37 2017 -0600

    Merge pull request iview#2324 from SergioCrisostomo/auto-complete

    normalize autocomplete and spellcheck

commit bceb3c5
Merge: 427dd34 b9c1fe7
Author: Aresn <admin@aresn.com>
Date:   Mon Nov 6 19:02:53 2017 -0600

    Merge pull request iview#2322 from SergioCrisostomo/export-locales

    export locale objects

commit c17c5ad
Author: Sergio Crisostomo <sergiosbox@gmail.com>
Date:   Sat Nov 4 16:37:29 2017 +0100

    normalize autocomplete and spellcheck

commit b9c1fe7
Author: Sergio Crisostomo <sergiosbox@gmail.com>
Date:   Sat Nov 4 15:21:26 2017 +0100

    export locale objects

commit 427dd34
Author: 梁灏 <admin@aresn.com>
Date:   Thu Nov 2 18:23:10 2017 +0800

    update issue guide

commit 0819648
Merge: 470930e d1f698c
Author: Aresn <admin@aresn.com>
Date:   Wed Nov 1 04:03:17 2017 -0500

    Merge pull request iview#2274 from yangdan8/patch-2

    Modal弹窗请添加on-visible-change给外部api访问

commit d1f698c
Author: yangdan8 <13532023084@139.com>
Date:   Wed Nov 1 15:12:12 2017 +0800

    Modal弹窗请添加on-visible-change给外部api访问

    Modal弹窗请添加on-visible-change给外部api访问

commit 470930e
Author: 梁灏 <admin@aresn.com>
Date:   Tue Oct 31 14:15:00 2017 +0800

    update issue template

commit d44e817
Author: 梁灏 <admin@aresn.com>
Date:   Tue Oct 31 10:33:50 2017 +0800

    update Readme

commit 1a1f7c3
Merge: 75fa706 915e06d
Author: 梁灏 <admin@aresn.com>
Date:   Mon Oct 30 16:09:25 2017 +0800

    Merge branch '2.0' of https://github.com/iview/iview into 2.0

commit 75fa706
Author: 梁灏 <admin@aresn.com>
Date:   Mon Oct 30 16:01:18 2017 +0800

    update tabs demo

commit 915e06d
Merge: 1231c1a 3be0aa1
Author: Aresn <admin@aresn.com>
Date:   Mon Oct 30 03:01:06 2017 -0500

    Merge pull request iview#2230 from cheng-kang/2.0

    fix issue iview#1846

commit 1231c1a
Merge: 5a83c4a 0c0683e
Author: Aresn <admin@aresn.com>
Date:   Mon Oct 30 02:46:05 2017 -0500

    Merge pull request iview#2018 from Baoyx007/patch-1

    feat(form) : support promise for validate method iview#1857

commit 3be0aa1
Author: Kang Cheng <me@chengkang.pw>
Date:   Mon Oct 30 00:33:31 2017 -0700

    Import custom MutationObserver; remove mutation observer before component get destroyed

commit 5a83c4a
Merge: 7a9f6b2 b30250a
Author: Aresn <admin@aresn.com>
Date:   Mon Oct 30 01:40:31 2017 -0500

    Merge pull request iview#2223 from chavyleung/2.0

    fixed: iview#2219 & ColorPicker icon position

commit 7988575
Author: Kang Cheng <me@chengkang.pw>
Date:   Sun Oct 29 15:39:45 2017 -0700

    fix issue iview#1846

commit b30250a
Author: Chavy <chavyleung@163.com>
Date:   Sat Oct 28 11:57:38 2017 +0800

    fixed: iview#2219 & ColorPicker icon position

commit 7a9f6b2
Merge: 7d25930 a892ba6
Author: Aresn <admin@aresn.com>
Date:   Fri Oct 27 02:22:16 2017 -0500

    Merge pull request iview#2213 from SergioCrisostomo/fix-number-input

    prevent firing change when typing numbers < min

commit a892ba6
Author: Sergio Crisostomo <sergiosbox@gmail.com>
Date:   Fri Oct 27 08:40:11 2017 +0200

    prevent firing change when typing numbers < min

commit 7d25930
Author: 梁灏 <admin@aresn.com>
Date:   Thu Oct 26 14:47:54 2017 +0800

    release 2.6.0

commit f673ca4
Author: 梁灏 <admin@aresn.com>
Date:   Thu Oct 26 14:18:07 2017 +0800

    publish 2.6.0 beta

commit 86cdfb8
Merge: 252717e 19ad5f4
Author: Aresn <admin@aresn.com>
Date:   Thu Oct 26 00:14:52 2017 -0500

    Merge pull request iview#2194 from SergioCrisostomo/add-scroll-distance-to-edge

    add distance-to-edge property

commit 19ad5f4
Author: Aresn <admin@aresn.com>
Date:   Thu Oct 26 00:14:36 2017 -0500

    Update scroll.vue

commit 252717e
Merge: 9147e63 dfae43a
Author: Aresn <admin@aresn.com>
Date:   Thu Oct 26 00:13:02 2017 -0500

    Merge pull request iview#2193 from SergioCrisostomo/fix-2191

    correct input value in filterable mode

commit 9147e63
Merge: 51939f8 cbdac01
Author: Aresn <admin@aresn.com>
Date:   Thu Oct 26 00:10:44 2017 -0500

    Merge pull request iview#2195 from yangdan8/patch-4

    Update table.vue  解决tabs切换时,tab中的table调试时控制台报$el undefined的问题

commit cbdac01
Author: Aresn <admin@aresn.com>
Date:   Thu Oct 26 00:09:42 2017 -0500

    Update table.vue

commit 51939f8
Author: 梁灏 <admin@aresn.com>
Date:   Thu Oct 26 12:55:18 2017 +0800

    update Select tag

commit 2079c47
Author: 梁灏 <admin@aresn.com>
Date:   Thu Oct 26 11:57:24 2017 +0800

    update Tag

commit 2993f4e
Author: 梁灏 <admin@aresn.com>
Date:   Thu Oct 26 11:26:05 2017 +0800

    update Tab

commit f6a787f
Author: yangdan8 <13532023084@139.com>
Date:   Thu Oct 26 09:48:47 2017 +0800

    Update table.vue

commit 72ba666
Author: Sergio Crisostomo <sergiosbox@gmail.com>
Date:   Wed Oct 25 21:21:35 2017 +0200

    add distance-to-edge property

commit dfae43a
Author: Sergio Crisostomo <sergiosbox@gmail.com>
Date:   Wed Oct 25 20:49:38 2017 +0200

    correct input value in filterable mode

commit af7d72b
Author: 梁灏 <admin@aresn.com>
Date:   Wed Oct 25 22:34:58 2017 +0800

    update Tree selected

commit 6ff0e34
Author: 梁灏 <admin@aresn.com>
Date:   Wed Oct 25 21:10:29 2017 +0800

    update Tree Render function

commit 97098fc
Author: 梁灏 <admin@aresn.com>
Date:   Wed Oct 25 19:12:14 2017 +0800

    update Tree example

commit b64204f
Author: 梁灏 <admin@aresn.com>
Date:   Wed Oct 25 17:41:37 2017 +0800

    update Tree demo

commit 174836c
Author: 梁灏 <admin@aresn.com>
Date:   Wed Oct 25 16:45:42 2017 +0800

    update Tree Render function use

commit 3ea2461
Author: 梁灏 <admin@aresn.com>
Date:   Wed Oct 25 14:33:22 2017 +0800

    update checkbox style

commit 69460a5
Merge: 8711920 610fd3a
Author: Aresn <admin@aresn.com>
Date:   Tue Oct 24 21:44:41 2017 -0500

    Merge pull request iview#2181 from lisafra/update-carousel

    Update carousel component: add loop and radiusDot property

commit 610fd3a
Author: houyl <houyl@okooo.net>
Date:   Wed Oct 25 09:30:46 2017 +0800

    [fix bug]  carousel component: remove no use code

commit 8711920
Merge: 2be2b97 692be62
Author: Aresn <admin@aresn.com>
Date:   Tue Oct 24 19:14:01 2017 -0500

    Merge pull request iview#2185 from md678685/patch-1

    Fix some English grammar in README

commit 692be62
Author: md678685 <mathew678@hotmail.co.uk>
Date:   Tue Oct 24 21:06:04 2017 +0100

    Fix some English grammar in README

    This PR changes some of the English sentences in the `README.md` to sound more natural. I have tried to keep the structure as close as possible to the original. If anything sounds confusing, please reply below.

    这个PR改变了`README.md`中的一些英文句子,使其听起来更自然。 我试图保持结构尽可能接近原来。 如有任何疑问,请在下面回覆。

commit 2be2b97
Merge: b31aab7 da76a83
Author: Aresn <admin@aresn.com>
Date:   Tue Oct 24 07:46:14 2017 -0500

    Merge pull request iview#2184 from SergioCrisostomo/fix-tree-examples

    fix dom rendering when adding new nodes in example

commit da76a83
Author: Sergio Crisostomo <sergiosbox@gmail.com>
Date:   Tue Oct 24 14:08:52 2017 +0200

    fix dom rendering problems

commit b31aab7
Author: 梁灏 <admin@aresn.com>
Date:   Tue Oct 24 18:14:22 2017 +0800

    Tree add async loading

commit 76a4781
Author: 梁灏 <admin@aresn.com>
Date:   Tue Oct 24 16:48:28 2017 +0800

    fixed iview#2128

commit ccf544d
Author: houyl <houyl@okooo.net>
Date:   Tue Oct 24 16:47:12 2017 +0800

    Merge branch 'master' of https://github.com/iview/iview into 2.0
    Update carousel component: add loop and radiusDot property
    # Conflicts:
    #	package.json
    #	src/components/date-picker/picker.vue
    #	src/components/select/select.vue

commit 9b24f1a
Author: 梁灏 <admin@aresn.com>
Date:   Tue Oct 24 16:20:09 2017 +0800

    Tree add Render function

    fixed iview#2133
    fixed iview#1784
    fixed iview#1333
    fixed iview#1362

commit ecf6c2f
Author: 梁灏 <admin@aresn.com>
Date:   Tue Oct 24 15:47:07 2017 +0800

    update dependence

commit c89e0e1
Merge: 7053de4 0a8f9b4
Author: Aresn <admin@aresn.com>
Date:   Tue Oct 24 02:44:19 2017 -0500

    Merge pull request iview#2090 from SergioCrisostomo/refactor-tree

    Refactor tree

commit 0a8f9b4
Author: Sergio Crisostomo <sergiosbox@gmail.com>
Date:   Tue Oct 24 09:30:09 2017 +0200

    Keep original data pointers and correct if clause

commit d44420b
Author: Sergio Crisostomo <sergiosbox@gmail.com>
Date:   Sat Oct 14 09:49:13 2017 +0200

    refactor and make indeterminate accessible outside tree

commit 94d177c
Author: Sergio Crisostomo <sergiosbox@gmail.com>
Date:   Sat Oct 14 09:47:33 2017 +0200

    add width to expand icon so we can click on it easier

commit 7053de4
Author: 梁灏 <admin@aresn.com>
Date:   Tue Oct 24 09:52:42 2017 +0800

    update demo

commit c61015d
Merge: a5f4a1d 65255c9
Author: Aresn <admin@aresn.com>
Date:   Mon Oct 23 20:22:51 2017 -0500

    Merge pull request iview#2172 from SergioCrisostomo/fix-2164

    format string dates in daterange also

commit a5f4a1d
Author: 梁灏 <admin@aresn.com>
Date:   Mon Oct 23 23:08:40 2017 +0800

    fixed iview#1922

commit 65255c9
Author: Sergio Crisostomo <sergiosbox@gmail.com>
Date:   Mon Oct 23 15:53:12 2017 +0200

    fix date formatting when strings are supplied to DatePicker

commit 6c634aa
Author: 梁灏 <admin@aresn.com>
Date:   Mon Oct 23 19:01:47 2017 +0800

    fixed iview#2078

commit c2d74ec
Author: 梁灏 <admin@aresn.com>
Date:   Mon Oct 23 18:26:42 2017 +0800

    fixed iview#2100

commit b92a1b5
Merge: 6261a49 3ed12b4
Author: Aresn <admin@aresn.com>
Date:   Mon Oct 23 04:22:44 2017 -0500

    Merge pull request iview#2170 from SergioCrisostomo/use-locale-formated-year-month

    Correct month calculation and add specs for date-picker labels

commit 6261a49
Merge: a1553a9 7afb406
Author: Aresn <admin@aresn.com>
Date:   Mon Oct 23 04:19:11 2017 -0500

    Merge pull request iview#2171 from iview/pr/2124

    update Tag style for check

commit a1553a9
Merge: 5064c7b fd79f10
Author: Aresn <admin@aresn.com>
Date:   Mon Oct 23 04:17:50 2017 -0500

    Merge pull request iview#2124 from daiyanze/feature/checkable_tag

    Feature/checkable tag (追加功能:可选标签)

commit 7afb406
Author: 梁灏 <admin@aresn.com>
Date:   Mon Oct 23 17:14:29 2017 +0800

    update Tag style for check

commit 3ed12b4
Author: Sergio Crisostomo <sergiosbox@gmail.com>
Date:   Mon Oct 23 11:13:06 2017 +0200

    Correct month calculation and add specs for date-picker labels

commit fd79f10
Author: Aresn <admin@aresn.com>
Date:   Mon Oct 23 03:57:05 2017 -0500

    Update tag.vue

commit 5064c7b
Author: 梁灏 <admin@aresn.com>
Date:   Mon Oct 23 16:52:30 2017 +0800

    update ja-JP

commit 4c6d996
Author: Aresn <admin@aresn.com>
Date:   Mon Oct 23 03:40:39 2017 -0500

    Update tag.vue

commit b75ad4a
Author: 梁灏 <admin@aresn.com>
Date:   Mon Oct 23 14:12:02 2017 +0800

    fixed iview#1700

commit 6ed0cd7
Author: 梁灏 <admin@aresn.com>
Date:   Mon Oct 23 11:55:35 2017 +0800

    update Tree demo

commit 0e31618
Author: 梁灏 <admin@aresn.com>
Date:   Mon Oct 23 11:00:20 2017 +0800

    update demo

commit ba1422c
Author: 梁灏 <admin@aresn.com>
Date:   Mon Oct 23 09:52:56 2017 +0800

    update zh-TW

commit f672ae0
Merge: 0f65109 2537c26
Author: Aresn <admin@aresn.com>
Date:   Sun Oct 22 20:29:51 2017 -0500

    Merge pull request iview#2097 from SergioCrisostomo/use-locale-formated-year-month

    use date.toLocaleDateString to format year/month

commit 0f65109
Author: 梁灏 <admin@aresn.com>
Date:   Mon Oct 23 09:26:41 2017 +0800

    update

commit a730a84
Author: 梁灏 <admin@aresn.com>
Date:   Fri Oct 20 17:44:58 2017 +0800

    update Tabs

commit ec1a5e2
Merge: 758bd76 be3fbd2
Author: Aresn <admin@aresn.com>
Date:   Fri Oct 20 04:38:28 2017 -0500

    Merge pull request iview#2156 from marxy/tabs-scroll

    Tabs add scroll

commit 758bd76
Merge: 45103ca e15746f
Author: 梁灏 <admin@aresn.com>
Date:   Fri Oct 20 16:56:33 2017 +0800

    Merge branch '2.0' of https://github.com/iview/iview into 2.0

commit 45103ca
Author: 梁灏 <admin@aresn.com>
Date:   Fri Oct 20 16:53:59 2017 +0800

    fixed iview#2066

commit be3fbd2
Author: marxy <334905044@qq.com>
Date:   Fri Oct 20 16:30:44 2017 +0800

    Tabs add scroll

commit e15746f
Author: Aresn <admin@aresn.com>
Date:   Fri Oct 20 03:18:08 2017 -0500

    update dependence

commit 485a903
Author: 梁灏 <admin@aresn.com>
Date:   Fri Oct 20 15:36:43 2017 +0800

    fixed iview#2149

commit cbe5ccf
Merge: 11baa9a 437b805
Author: Aresn <admin@aresn.com>
Date:   Thu Oct 19 22:47:33 2017 -0500

    Merge pull request iview#2114 from SergioCrisostomo/improve-csv

    Improve export to CSV functionality

commit 11baa9a
Merge: 2e8add2 a3336b3
Author: Aresn <admin@aresn.com>
Date:   Thu Oct 19 05:45:31 2017 -0500

    Merge pull request iview#2136 from SergioCrisostomo/fix-scroll-event

    add missing event in callback

commit a3336b3
Author: Sergio Crisostomo <sergiosbox@gmail.com>
Date:   Thu Oct 19 10:41:19 2017 +0200

    add missing event in callback

commit 62bf2b3
Author: daiyanze <ginoalex8964@yahoo.com>
Date:   Wed Oct 18 17:21:52 2017 +0900

    Modify: example of tags

commit dc39cc3
Author: daiyanze <ginoalex8964@yahoo.com>
Date:   Wed Oct 18 17:13:06 2017 +0900

    Feature: Checkable tag

commit 2e8add2
Author: 梁灏 <admin@aresn.com>
Date:   Wed Oct 18 08:58:16 2017 +0800

    release 2.5.1

commit 95dfbe1
Merge: 3c6d8ea 5d1c24c
Author: Aresn <admin@aresn.com>
Date:   Tue Oct 17 19:52:02 2017 -0500

    Merge pull request iview#2120 from SergioCrisostomo/fix-2119

    correct behaviour when initialising date-picker with a empty string

commit 5d1c24c
Author: Sergio Crisostomo <sergiosbox@gmail.com>
Date:   Tue Oct 17 15:13:42 2017 +0200

    correct behaviour when initialising date-picker with a empty string

commit 2537c26
Author: Sergio Crisostomo <sergiosbox@gmail.com>
Date:   Tue Oct 17 14:26:12 2017 +0200

    add dateLabel to time panel

commit b27858d
Author: Sergio Crisostomo <sergiosbox@gmail.com>
Date:   Tue Oct 17 13:09:04 2017 +0200

    add date panel label format logic

commit 3d50db5
Author: Sergio Crisostomo <sergiosbox@gmail.com>
Date:   Tue Oct 17 12:25:36 2017 +0200

    add datePanelLabel format in locale files

commit 437b805
Author: Sergio Crisostomo <sergiosbox@gmail.com>
Date:   Tue Oct 17 10:14:10 2017 +0200

    Added Table to CSV example and tests

commit fb84799
Author: Sergio Crisostomo <sergiosbox@gmail.com>
Date:   Tue Oct 17 10:13:54 2017 +0200

    Improve export to CSV functionality

     - added`callback`option so we can get CSV data in case we do not want
    to download
     - added options:
        - `quoted` for cases when we have line breaks in content
        - `separator` for cases when we have commas in content

commit 3c6d8ea
Author: 梁灏 <admin@aresn.com>
Date:   Tue Oct 17 16:09:11 2017 +0800

    release 2.5.0

commit 61d1637
Author: 梁灏 <admin@aresn.com>
Date:   Mon Oct 16 20:45:46 2017 +0800

    publish 2.5.0-beta.2

commit 78b46fa
Author: 梁灏 <admin@aresn.com>
Date:   Mon Oct 16 20:41:13 2017 +0800

    Scroll add local loading-text

commit 109465d
Author: 梁灏 <admin@aresn.com>
Date:   Mon Oct 16 20:10:21 2017 +0800

    optimize  Scroll scroll behavior

commit 6850c1d
Author: 梁灏 <admin@aresn.com>
Date:   Mon Oct 16 18:32:47 2017 +0800

    Scroll add `height` prop

commit 7462478
Author: 梁灏 <admin@aresn.com>
Date:   Mon Oct 16 16:05:06 2017 +0800

    publish 2.5.0-beta.1

commit 8c2e53e
Merge: f180098 af6a7c4
Author: Aresn <admin@aresn.com>
Date:   Mon Oct 16 02:54:57 2017 -0500

    Merge pull request iview#2069 from dspangenberg/2.0

    DatePicker: weekStartDay did not influence the order of the weekdays in the header

commit af6a7c4
Author: Danny Spangenberg <danny.spangenberg@twiceware.de>
Date:   Wed Oct 11 17:38:03 2017 +0200

    weekStartDay did not influence the order of the weekdays in the header

commit 0c0683e
Author: Haven <baoyx007@gmail.com>
Date:   Thu Sep 28 00:40:16 2017 -0500

    feat(form) : support promise for validate method iview#1857
ZhaoYuLing pushed a commit to baishancloud/iview-bsc that referenced this pull request Dec 21, 2017
commit 916f3a6
Author: 梁灏 <admin@aresn.com>
Date:   Fri Nov 17 15:42:57 2017 +0800

    update readme

commit 5e70fad
Author: 梁灏 <admin@aresn.com>
Date:   Thu Nov 16 11:16:43 2017 +0800

    release 2.7.3

commit 54f510c
Author: 梁灏 <admin@aresn.com>
Date:   Thu Nov 16 11:02:01 2017 +0800

    fixed not support Nuxt.js

commit 1cbdb61
Merge: 82636f7 4543502
Author: Aresn <admin@aresn.com>
Date:   Wed Nov 15 20:45:44 2017 -0600

    Merge pull request iview#2429 from pbarros78/patch-2

    Long weekdays name to short weekdays name

commit 82636f7
Merge: 1ec1efa a14d6dd
Author: Aresn <admin@aresn.com>
Date:   Wed Nov 15 20:45:13 2017 -0600

    Merge pull request iview#2420 from SergioCrisostomo/input-number-fixes

    fix checking when temp number is invalid

commit 1ec1efa
Merge: d291e81 d962c7f
Author: Aresn <admin@aresn.com>
Date:   Wed Nov 15 20:27:51 2017 -0600

    Merge pull request iview#2421 from SergioCrisostomo/use-packagejson-version

    use version from package.json

commit 4543502
Author: Patricio Barros <patricio.barros@gmail.com>
Date:   Wed Nov 15 11:26:50 2017 -0300

    Long weekdays name to short weekdays name

    Change of name of long weekdays to short weekdays name, for use in datepicker

commit d962c7f
Author: Sergio Crisostomo <sergiosbox@gmail.com>
Date:   Tue Nov 14 17:46:52 2017 +0100

    use version from package.json

commit a14d6dd
Author: Sergio Crisostomo <sergiosbox@gmail.com>
Date:   Tue Nov 14 14:35:42 2017 +0100

    fix checking when temp number is invalid and should be rechecked in "change" event

commit d291e81
Author: 梁灏 <admin@aresn.com>
Date:   Tue Nov 14 09:54:44 2017 +0800

    release 2.7.2

commit 9b6f316
Author: 梁灏 <admin@aresn.com>
Date:   Tue Nov 14 09:53:58 2017 +0800

    fixed Tabs bug

commit 7b0fb4e
Author: 梁灏 <admin@aresn.com>
Date:   Tue Nov 14 09:31:48 2017 +0800

    release 2.7.1

commit 1d15cbb
Merge: 240bb21 a74be22
Author: Aresn <admin@aresn.com>
Date:   Mon Nov 13 19:24:20 2017 -0600

    Merge pull request iview#2407 from SergioCrisostomo/fix-look-for-parent

    don't check past document.body when moving up DOM tree

commit a74be22
Author: Sergio Crisostomo <sergiosbox@gmail.com>
Date:   Mon Nov 13 16:57:43 2017 +0100

    don't check DOM tree past document.body

commit 240bb21
Author: 梁灏 <admin@aresn.com>
Date:   Mon Nov 13 11:35:19 2017 +0800

    release 2.7.0

commit f2212c3
Author: 梁灏 <admin@aresn.com>
Date:   Mon Nov 13 10:07:45 2017 +0800

    publish 2.7.0-beta.1

commit 5bd0f52
Author: 梁灏 <admin@aresn.com>
Date:   Mon Nov 13 09:44:56 2017 +0800

    fixed

    iview#1090 iview#2387 iview#2379

commit d63a378
Author: 梁灏 <admin@aresn.com>
Date:   Mon Nov 13 09:27:54 2017 +0800

    fixed

    iview#1090 iview#2387 iview#379

commit a5dad1a
Author: 梁灏 <admin@aresn.com>
Date:   Mon Nov 13 09:14:03 2017 +0800

    fixed iview#1090 & close iview#2387 iview#2379

commit 6b2af1b
Merge: 593742a a2a18a4
Author: Aresn <admin@aresn.com>
Date:   Thu Nov 9 20:32:16 2017 -0600

    Merge pull request iview#2377 from btfrankenstein/2.0

    feat($input-number): add events 'on-focus', 'on-blur', 'on-enter' for…

commit a2a18a4
Author: Aresn <admin@aresn.com>
Date:   Thu Nov 9 20:31:47 2017 -0600

    Update input-number.vue

    remove `on-enter` because excessive and inflexible

commit c21a814
Author: btfrankenstein <btfrankenstein@gmail.com>
Date:   Thu Nov 9 17:56:33 2017 +0800

    feat($input-number): add events 'on-focus', 'on-blur', 'on-enter' for input-number component

commit 593742a
Author: 梁灏 <admin@aresn.com>
Date:   Thu Nov 9 17:06:49 2017 +0800

    update locale build file

commit b355578
Merge: 9d1add4 0c0d2c7
Author: Aresn <admin@aresn.com>
Date:   Thu Nov 9 00:47:25 2017 -0600

    Merge pull request iview#2354 from SergioCrisostomo/dry-exports

    reorganize and DRY components list

commit 9d1add4
Author: 梁灏 <admin@aresn.com>
Date:   Thu Nov 9 14:38:26 2017 +0800

    update Date example

commit 2df70eb
Merge: b91fd49 40aa935
Author: Aresn <admin@aresn.com>
Date:   Thu Nov 9 00:37:27 2017 -0600

    Merge pull request iview#2356 from SergioCrisostomo/fix-2122

    Patch Chromium bug

commit b91fd49
Merge: 4b33839 7f8d334
Author: Aresn <admin@aresn.com>
Date:   Thu Nov 9 00:18:47 2017 -0600

    Merge pull request iview#2368 from SergioCrisostomo/fix-datepicker-test

    fix date picker callback test

commit 7f8d334
Author: Sergio Crisostomo <sergiosbox@gmail.com>
Date:   Thu Nov 9 05:58:25 2017 +0100

    fix date picker callback test

commit 0c0d2c7
Author: Sergio Crisostomo <sergiosbox@gmail.com>
Date:   Thu Nov 9 05:50:30 2017 +0100

    reorganize and DRY components list

commit 4b33839
Author: 梁灏 <admin@aresn.com>
Date:   Thu Nov 9 11:11:54 2017 +0800

    update Select example

commit 67a9c1c
Author: 梁灏 <admin@aresn.com>
Date:   Thu Nov 9 09:48:56 2017 +0800

    update Tabs

commit bff9081
Merge: 4ab1ac5 5fbe80f
Author: Aresn <admin@aresn.com>
Date:   Wed Nov 8 19:19:51 2017 -0600

    Merge pull request iview#2351 from SergioCrisostomo/i18n

    use dist's locale

commit 4ab1ac5
Merge: 37fe6bb 236e0bf
Author: Aresn <admin@aresn.com>
Date:   Wed Nov 8 19:17:32 2017 -0600

    Merge pull request iview#2358 from SergioCrisostomo/ie-fix-2330

    Don't use includes to make IE happy and avoid Polyfill

commit 37fe6bb
Merge: 22c27b7 b1d124f
Author: Aresn <admin@aresn.com>
Date:   Wed Nov 8 19:15:00 2017 -0600

    Merge pull request iview#2361 from SergioCrisostomo/fix-2215

    add test for iview#2215

commit b1d124f
Author: Sergio Crisostomo <sergiosbox@gmail.com>
Date:   Wed Nov 8 16:07:23 2017 +0100

    add test for iview#2215

commit 22c27b7
Author: 梁灏 <admin@aresn.com>
Date:   Wed Nov 8 20:44:35 2017 +0800

    fixed iview#2215

commit 236e0bf
Author: Sergio Crisostomo <sergiosbox@gmail.com>
Date:   Wed Nov 8 10:14:08 2017 +0100

    DOn't use includes to make IE happy and avoid Polyfill

commit 5fbe80f
Author: Sergio Crisostomo <sergiosbox@gmail.com>
Date:   Wed Nov 8 09:59:45 2017 +0100

    use dist's locale

commit 40aa935
Author: Sergio Crisostomo <sergiosbox@gmail.com>
Date:   Wed Nov 8 09:54:14 2017 +0100

    patch chromium bug

commit b142865
Author: 梁灏 <admin@aresn.com>
Date:   Wed Nov 8 16:11:04 2017 +0800

    fixed iview#2102

commit 55f90d8
Author: 梁灏 <admin@aresn.com>
Date:   Wed Nov 8 14:39:39 2017 +0800

    fixed iview#1648

commit 6319935
Merge: cd92d87 297d1f1
Author: Aresn <admin@aresn.com>
Date:   Tue Nov 7 20:14:16 2017 -0600

    Merge pull request iview#2341 from f3man/2.0

    add uk_UA locale

commit cd92d87
Author: 梁灏 <admin@aresn.com>
Date:   Tue Nov 7 18:09:01 2017 +0800

    fixed iview#1482

commit 9f5a643
Author: 梁灏 <admin@aresn.com>
Date:   Tue Nov 7 17:54:36 2017 +0800

    fixed iview#2019

commit 84a4a95
Author: 梁灏 <admin@aresn.com>
Date:   Tue Nov 7 17:36:26 2017 +0800

    fixed iview#1926

commit 05265be
Author: 梁灏 <admin@aresn.com>
Date:   Tue Nov 7 17:28:20 2017 +0800

    fixed iview#2214

commit 6d2b7bc
Author: 梁灏 <admin@aresn.com>
Date:   Tue Nov 7 17:07:03 2017 +0800

    fixed iview#1575

commit 8869b70
Author: 梁灏 <admin@aresn.com>
Date:   Tue Nov 7 16:59:20 2017 +0800

    update

commit c7e432f
Author: 梁灏 <admin@aresn.com>
Date:   Tue Nov 7 16:43:23 2017 +0800

    update export & i18n

commit 297d1f1
Author: f3man <stepan7box@gmail.com>
Date:   Tue Nov 7 10:19:12 2017 +0200

    add uk_UA locale

    added ukranian language

commit 32e8393
Merge: bceb3c5 c17c5ad
Author: Aresn <admin@aresn.com>
Date:   Mon Nov 6 19:11:37 2017 -0600

    Merge pull request iview#2324 from SergioCrisostomo/auto-complete

    normalize autocomplete and spellcheck

commit bceb3c5
Merge: 427dd34 b9c1fe7
Author: Aresn <admin@aresn.com>
Date:   Mon Nov 6 19:02:53 2017 -0600

    Merge pull request iview#2322 from SergioCrisostomo/export-locales

    export locale objects

commit c17c5ad
Author: Sergio Crisostomo <sergiosbox@gmail.com>
Date:   Sat Nov 4 16:37:29 2017 +0100

    normalize autocomplete and spellcheck

commit b9c1fe7
Author: Sergio Crisostomo <sergiosbox@gmail.com>
Date:   Sat Nov 4 15:21:26 2017 +0100

    export locale objects

commit 427dd34
Author: 梁灏 <admin@aresn.com>
Date:   Thu Nov 2 18:23:10 2017 +0800

    update issue guide

commit 0819648
Merge: 470930e d1f698c
Author: Aresn <admin@aresn.com>
Date:   Wed Nov 1 04:03:17 2017 -0500

    Merge pull request iview#2274 from yangdan8/patch-2

    Modal弹窗请添加on-visible-change给外部api访问

commit d1f698c
Author: yangdan8 <13532023084@139.com>
Date:   Wed Nov 1 15:12:12 2017 +0800

    Modal弹窗请添加on-visible-change给外部api访问

    Modal弹窗请添加on-visible-change给外部api访问

commit 470930e
Author: 梁灏 <admin@aresn.com>
Date:   Tue Oct 31 14:15:00 2017 +0800

    update issue template

commit d44e817
Author: 梁灏 <admin@aresn.com>
Date:   Tue Oct 31 10:33:50 2017 +0800

    update Readme

commit 1a1f7c3
Merge: 75fa706 915e06d
Author: 梁灏 <admin@aresn.com>
Date:   Mon Oct 30 16:09:25 2017 +0800

    Merge branch '2.0' of https://github.com/iview/iview into 2.0

commit 75fa706
Author: 梁灏 <admin@aresn.com>
Date:   Mon Oct 30 16:01:18 2017 +0800

    update tabs demo

commit 915e06d
Merge: 1231c1a 3be0aa1
Author: Aresn <admin@aresn.com>
Date:   Mon Oct 30 03:01:06 2017 -0500

    Merge pull request iview#2230 from cheng-kang/2.0

    fix issue iview#1846

commit 1231c1a
Merge: 5a83c4a 0c0683e
Author: Aresn <admin@aresn.com>
Date:   Mon Oct 30 02:46:05 2017 -0500

    Merge pull request iview#2018 from Baoyx007/patch-1

    feat(form) : support promise for validate method iview#1857

commit 3be0aa1
Author: Kang Cheng <me@chengkang.pw>
Date:   Mon Oct 30 00:33:31 2017 -0700

    Import custom MutationObserver; remove mutation observer before component get destroyed

commit 5a83c4a
Merge: 7a9f6b2 b30250a
Author: Aresn <admin@aresn.com>
Date:   Mon Oct 30 01:40:31 2017 -0500

    Merge pull request iview#2223 from chavyleung/2.0

    fixed: iview#2219 & ColorPicker icon position

commit 7988575
Author: Kang Cheng <me@chengkang.pw>
Date:   Sun Oct 29 15:39:45 2017 -0700

    fix issue iview#1846

commit b30250a
Author: Chavy <chavyleung@163.com>
Date:   Sat Oct 28 11:57:38 2017 +0800

    fixed: iview#2219 & ColorPicker icon position

commit 7a9f6b2
Merge: 7d25930 a892ba6
Author: Aresn <admin@aresn.com>
Date:   Fri Oct 27 02:22:16 2017 -0500

    Merge pull request iview#2213 from SergioCrisostomo/fix-number-input

    prevent firing change when typing numbers < min

commit a892ba6
Author: Sergio Crisostomo <sergiosbox@gmail.com>
Date:   Fri Oct 27 08:40:11 2017 +0200

    prevent firing change when typing numbers < min

commit 7d25930
Author: 梁灏 <admin@aresn.com>
Date:   Thu Oct 26 14:47:54 2017 +0800

    release 2.6.0

commit f673ca4
Author: 梁灏 <admin@aresn.com>
Date:   Thu Oct 26 14:18:07 2017 +0800

    publish 2.6.0 beta

commit 86cdfb8
Merge: 252717e 19ad5f4
Author: Aresn <admin@aresn.com>
Date:   Thu Oct 26 00:14:52 2017 -0500

    Merge pull request iview#2194 from SergioCrisostomo/add-scroll-distance-to-edge

    add distance-to-edge property

commit 19ad5f4
Author: Aresn <admin@aresn.com>
Date:   Thu Oct 26 00:14:36 2017 -0500

    Update scroll.vue

commit 252717e
Merge: 9147e63 dfae43a
Author: Aresn <admin@aresn.com>
Date:   Thu Oct 26 00:13:02 2017 -0500

    Merge pull request iview#2193 from SergioCrisostomo/fix-2191

    correct input value in filterable mode

commit 9147e63
Merge: 51939f8 cbdac01
Author: Aresn <admin@aresn.com>
Date:   Thu Oct 26 00:10:44 2017 -0500

    Merge pull request iview#2195 from yangdan8/patch-4

    Update table.vue  解决tabs切换时,tab中的table调试时控制台报$el undefined的问题

commit cbdac01
Author: Aresn <admin@aresn.com>
Date:   Thu Oct 26 00:09:42 2017 -0500

    Update table.vue

commit 51939f8
Author: 梁灏 <admin@aresn.com>
Date:   Thu Oct 26 12:55:18 2017 +0800

    update Select tag

commit 2079c47
Author: 梁灏 <admin@aresn.com>
Date:   Thu Oct 26 11:57:24 2017 +0800

    update Tag

commit 2993f4e
Author: 梁灏 <admin@aresn.com>
Date:   Thu Oct 26 11:26:05 2017 +0800

    update Tab

commit f6a787f
Author: yangdan8 <13532023084@139.com>
Date:   Thu Oct 26 09:48:47 2017 +0800

    Update table.vue

commit 72ba666
Author: Sergio Crisostomo <sergiosbox@gmail.com>
Date:   Wed Oct 25 21:21:35 2017 +0200

    add distance-to-edge property

commit dfae43a
Author: Sergio Crisostomo <sergiosbox@gmail.com>
Date:   Wed Oct 25 20:49:38 2017 +0200

    correct input value in filterable mode

commit af7d72b
Author: 梁灏 <admin@aresn.com>
Date:   Wed Oct 25 22:34:58 2017 +0800

    update Tree selected

commit 6ff0e34
Author: 梁灏 <admin@aresn.com>
Date:   Wed Oct 25 21:10:29 2017 +0800

    update Tree Render function

commit 97098fc
Author: 梁灏 <admin@aresn.com>
Date:   Wed Oct 25 19:12:14 2017 +0800

    update Tree example

commit b64204f
Author: 梁灏 <admin@aresn.com>
Date:   Wed Oct 25 17:41:37 2017 +0800

    update Tree demo

commit 174836c
Author: 梁灏 <admin@aresn.com>
Date:   Wed Oct 25 16:45:42 2017 +0800

    update Tree Render function use

commit 3ea2461
Author: 梁灏 <admin@aresn.com>
Date:   Wed Oct 25 14:33:22 2017 +0800

    update checkbox style

commit 69460a5
Merge: 8711920 610fd3a
Author: Aresn <admin@aresn.com>
Date:   Tue Oct 24 21:44:41 2017 -0500

    Merge pull request iview#2181 from lisafra/update-carousel

    Update carousel component: add loop and radiusDot property

commit 610fd3a
Author: houyl <houyl@okooo.net>
Date:   Wed Oct 25 09:30:46 2017 +0800

    [fix bug]  carousel component: remove no use code

commit 8711920
Merge: 2be2b97 692be62
Author: Aresn <admin@aresn.com>
Date:   Tue Oct 24 19:14:01 2017 -0500

    Merge pull request iview#2185 from md678685/patch-1

    Fix some English grammar in README

commit 692be62
Author: md678685 <mathew678@hotmail.co.uk>
Date:   Tue Oct 24 21:06:04 2017 +0100

    Fix some English grammar in README

    This PR changes some of the English sentences in the `README.md` to sound more natural. I have tried to keep the structure as close as possible to the original. If anything sounds confusing, please reply below.

    这个PR改变了`README.md`中的一些英文句子,使其听起来更自然。 我试图保持结构尽可能接近原来。 如有任何疑问,请在下面回覆。

commit 2be2b97
Merge: b31aab7 da76a83
Author: Aresn <admin@aresn.com>
Date:   Tue Oct 24 07:46:14 2017 -0500

    Merge pull request iview#2184 from SergioCrisostomo/fix-tree-examples

    fix dom rendering when adding new nodes in example

commit da76a83
Author: Sergio Crisostomo <sergiosbox@gmail.com>
Date:   Tue Oct 24 14:08:52 2017 +0200

    fix dom rendering problems

commit b31aab7
Author: 梁灏 <admin@aresn.com>
Date:   Tue Oct 24 18:14:22 2017 +0800

    Tree add async loading

commit 76a4781
Author: 梁灏 <admin@aresn.com>
Date:   Tue Oct 24 16:48:28 2017 +0800

    fixed iview#2128

commit ccf544d
Author: houyl <houyl@okooo.net>
Date:   Tue Oct 24 16:47:12 2017 +0800

    Merge branch 'master' of https://github.com/iview/iview into 2.0
    Update carousel component: add loop and radiusDot property
    # Conflicts:
    #	package.json
    #	src/components/date-picker/picker.vue
    #	src/components/select/select.vue

commit 9b24f1a
Author: 梁灏 <admin@aresn.com>
Date:   Tue Oct 24 16:20:09 2017 +0800

    Tree add Render function

    fixed iview#2133
    fixed iview#1784
    fixed iview#1333
    fixed iview#1362

commit ecf6c2f
Author: 梁灏 <admin@aresn.com>
Date:   Tue Oct 24 15:47:07 2017 +0800

    update dependence

commit c89e0e1
Merge: 7053de4 0a8f9b4
Author: Aresn <admin@aresn.com>
Date:   Tue Oct 24 02:44:19 2017 -0500

    Merge pull request iview#2090 from SergioCrisostomo/refactor-tree

    Refactor tree

commit 0a8f9b4
Author: Sergio Crisostomo <sergiosbox@gmail.com>
Date:   Tue Oct 24 09:30:09 2017 +0200

    Keep original data pointers and correct if clause

commit d44420b
Author: Sergio Crisostomo <sergiosbox@gmail.com>
Date:   Sat Oct 14 09:49:13 2017 +0200

    refactor and make indeterminate accessible outside tree

commit 94d177c
Author: Sergio Crisostomo <sergiosbox@gmail.com>
Date:   Sat Oct 14 09:47:33 2017 +0200

    add width to expand icon so we can click on it easier

commit 7053de4
Author: 梁灏 <admin@aresn.com>
Date:   Tue Oct 24 09:52:42 2017 +0800

    update demo

commit c61015d
Merge: a5f4a1d 65255c9
Author: Aresn <admin@aresn.com>
Date:   Mon Oct 23 20:22:51 2017 -0500

    Merge pull request iview#2172 from SergioCrisostomo/fix-2164

    format string dates in daterange also

commit a5f4a1d
Author: 梁灏 <admin@aresn.com>
Date:   Mon Oct 23 23:08:40 2017 +0800

    fixed iview#1922

commit 65255c9
Author: Sergio Crisostomo <sergiosbox@gmail.com>
Date:   Mon Oct 23 15:53:12 2017 +0200

    fix date formatting when strings are supplied to DatePicker

commit 6c634aa
Author: 梁灏 <admin@aresn.com>
Date:   Mon Oct 23 19:01:47 2017 +0800

    fixed iview#2078

commit c2d74ec
Author: 梁灏 <admin@aresn.com>
Date:   Mon Oct 23 18:26:42 2017 +0800

    fixed iview#2100

commit b92a1b5
Merge: 6261a49 3ed12b4
Author: Aresn <admin@aresn.com>
Date:   Mon Oct 23 04:22:44 2017 -0500

    Merge pull request iview#2170 from SergioCrisostomo/use-locale-formated-year-month

    Correct month calculation and add specs for date-picker labels

commit 6261a49
Merge: a1553a9 7afb406
Author: Aresn <admin@aresn.com>
Date:   Mon Oct 23 04:19:11 2017 -0500

    Merge pull request iview#2171 from iview/pr/2124

    update Tag style for check

commit a1553a9
Merge: 5064c7b fd79f10
Author: Aresn <admin@aresn.com>
Date:   Mon Oct 23 04:17:50 2017 -0500

    Merge pull request iview#2124 from daiyanze/feature/checkable_tag

    Feature/checkable tag (追加功能:可选标签)

commit 7afb406
Author: 梁灏 <admin@aresn.com>
Date:   Mon Oct 23 17:14:29 2017 +0800

    update Tag style for check

commit 3ed12b4
Author: Sergio Crisostomo <sergiosbox@gmail.com>
Date:   Mon Oct 23 11:13:06 2017 +0200

    Correct month calculation and add specs for date-picker labels

commit fd79f10
Author: Aresn <admin@aresn.com>
Date:   Mon Oct 23 03:57:05 2017 -0500

    Update tag.vue

commit 5064c7b
Author: 梁灏 <admin@aresn.com>
Date:   Mon Oct 23 16:52:30 2017 +0800

    update ja-JP

commit 4c6d996
Author: Aresn <admin@aresn.com>
Date:   Mon Oct 23 03:40:39 2017 -0500

    Update tag.vue

commit b75ad4a
Author: 梁灏 <admin@aresn.com>
Date:   Mon Oct 23 14:12:02 2017 +0800

    fixed iview#1700

commit 6ed0cd7
Author: 梁灏 <admin@aresn.com>
Date:   Mon Oct 23 11:55:35 2017 +0800

    update Tree demo

commit 0e31618
Author: 梁灏 <admin@aresn.com>
Date:   Mon Oct 23 11:00:20 2017 +0800

    update demo

commit ba1422c
Author: 梁灏 <admin@aresn.com>
Date:   Mon Oct 23 09:52:56 2017 +0800

    update zh-TW

commit f672ae0
Merge: 0f65109 2537c26
Author: Aresn <admin@aresn.com>
Date:   Sun Oct 22 20:29:51 2017 -0500

    Merge pull request iview#2097 from SergioCrisostomo/use-locale-formated-year-month

    use date.toLocaleDateString to format year/month

commit 0f65109
Author: 梁灏 <admin@aresn.com>
Date:   Mon Oct 23 09:26:41 2017 +0800

    update

commit a730a84
Author: 梁灏 <admin@aresn.com>
Date:   Fri Oct 20 17:44:58 2017 +0800

    update Tabs

commit ec1a5e2
Merge: 758bd76 be3fbd2
Author: Aresn <admin@aresn.com>
Date:   Fri Oct 20 04:38:28 2017 -0500

    Merge pull request iview#2156 from marxy/tabs-scroll

    Tabs add scroll

commit 758bd76
Merge: 45103ca e15746f
Author: 梁灏 <admin@aresn.com>
Date:   Fri Oct 20 16:56:33 2017 +0800

    Merge branch '2.0' of https://github.com/iview/iview into 2.0

commit 45103ca
Author: 梁灏 <admin@aresn.com>
Date:   Fri Oct 20 16:53:59 2017 +0800

    fixed iview#2066

commit be3fbd2
Author: marxy <334905044@qq.com>
Date:   Fri Oct 20 16:30:44 2017 +0800

    Tabs add scroll

commit e15746f
Author: Aresn <admin@aresn.com>
Date:   Fri Oct 20 03:18:08 2017 -0500

    update dependence

commit 485a903
Author: 梁灏 <admin@aresn.com>
Date:   Fri Oct 20 15:36:43 2017 +0800

    fixed iview#2149

commit cbe5ccf
Merge: 11baa9a 437b805
Author: Aresn <admin@aresn.com>
Date:   Thu Oct 19 22:47:33 2017 -0500

    Merge pull request iview#2114 from SergioCrisostomo/improve-csv

    Improve export to CSV functionality

commit 11baa9a
Merge: 2e8add2 a3336b3
Author: Aresn <admin@aresn.com>
Date:   Thu Oct 19 05:45:31 2017 -0500

    Merge pull request iview#2136 from SergioCrisostomo/fix-scroll-event

    add missing event in callback

commit a3336b3
Author: Sergio Crisostomo <sergiosbox@gmail.com>
Date:   Thu Oct 19 10:41:19 2017 +0200

    add missing event in callback

commit 62bf2b3
Author: daiyanze <ginoalex8964@yahoo.com>
Date:   Wed Oct 18 17:21:52 2017 +0900

    Modify: example of tags

commit dc39cc3
Author: daiyanze <ginoalex8964@yahoo.com>
Date:   Wed Oct 18 17:13:06 2017 +0900

    Feature: Checkable tag

commit 2e8add2
Author: 梁灏 <admin@aresn.com>
Date:   Wed Oct 18 08:58:16 2017 +0800

    release 2.5.1

commit 95dfbe1
Merge: 3c6d8ea 5d1c24c
Author: Aresn <admin@aresn.com>
Date:   Tue Oct 17 19:52:02 2017 -0500

    Merge pull request iview#2120 from SergioCrisostomo/fix-2119

    correct behaviour when initialising date-picker with a empty string

commit 5d1c24c
Author: Sergio Crisostomo <sergiosbox@gmail.com>
Date:   Tue Oct 17 15:13:42 2017 +0200

    correct behaviour when initialising date-picker with a empty string

commit 2537c26
Author: Sergio Crisostomo <sergiosbox@gmail.com>
Date:   Tue Oct 17 14:26:12 2017 +0200

    add dateLabel to time panel

commit b27858d
Author: Sergio Crisostomo <sergiosbox@gmail.com>
Date:   Tue Oct 17 13:09:04 2017 +0200

    add date panel label format logic

commit 3d50db5
Author: Sergio Crisostomo <sergiosbox@gmail.com>
Date:   Tue Oct 17 12:25:36 2017 +0200

    add datePanelLabel format in locale files

commit 437b805
Author: Sergio Crisostomo <sergiosbox@gmail.com>
Date:   Tue Oct 17 10:14:10 2017 +0200

    Added Table to CSV example and tests

commit fb84799
Author: Sergio Crisostomo <sergiosbox@gmail.com>
Date:   Tue Oct 17 10:13:54 2017 +0200

    Improve export to CSV functionality

     - added`callback`option so we can get CSV data in case we do not want
    to download
     - added options:
        - `quoted` for cases when we have line breaks in content
        - `separator` for cases when we have commas in content

commit 3c6d8ea
Author: 梁灏 <admin@aresn.com>
Date:   Tue Oct 17 16:09:11 2017 +0800

    release 2.5.0

commit 61d1637
Author: 梁灏 <admin@aresn.com>
Date:   Mon Oct 16 20:45:46 2017 +0800

    publish 2.5.0-beta.2

commit 78b46fa
Author: 梁灏 <admin@aresn.com>
Date:   Mon Oct 16 20:41:13 2017 +0800

    Scroll add local loading-text

commit 109465d
Author: 梁灏 <admin@aresn.com>
Date:   Mon Oct 16 20:10:21 2017 +0800

    optimize  Scroll scroll behavior

commit 6850c1d
Author: 梁灏 <admin@aresn.com>
Date:   Mon Oct 16 18:32:47 2017 +0800

    Scroll add `height` prop

commit 7462478
Author: 梁灏 <admin@aresn.com>
Date:   Mon Oct 16 16:05:06 2017 +0800

    publish 2.5.0-beta.1

commit 8c2e53e
Merge: f180098 af6a7c4
Author: Aresn <admin@aresn.com>
Date:   Mon Oct 16 02:54:57 2017 -0500

    Merge pull request iview#2069 from dspangenberg/2.0

    DatePicker: weekStartDay did not influence the order of the weekdays in the header

commit af6a7c4
Author: Danny Spangenberg <danny.spangenberg@twiceware.de>
Date:   Wed Oct 11 17:38:03 2017 +0200

    weekStartDay did not influence the order of the weekdays in the header

commit 0c0683e
Author: Haven <baoyx007@gmail.com>
Date:   Thu Sep 28 00:40:16 2017 -0500

    feat(form) : support promise for validate method iview#1857
ZhaoYuLing pushed a commit to baishancloud/iview-bsc that referenced this pull request Mar 14, 2018
commit 7053de4
Author: 梁灏 <admin@aresn.com>
Date:   Tue Oct 24 09:52:42 2017 +0800

    update demo

commit c61015d
Merge: a5f4a1d 65255c9
Author: Aresn <admin@aresn.com>
Date:   Mon Oct 23 20:22:51 2017 -0500

    Merge pull request iview#2172 from SergioCrisostomo/fix-2164

    format string dates in daterange also

commit a5f4a1d
Author: 梁灏 <admin@aresn.com>
Date:   Mon Oct 23 23:08:40 2017 +0800

    fixed iview#1922

commit 65255c9
Author: Sergio Crisostomo <sergiosbox@gmail.com>
Date:   Mon Oct 23 15:53:12 2017 +0200

    fix date formatting when strings are supplied to DatePicker

commit 6c634aa
Author: 梁灏 <admin@aresn.com>
Date:   Mon Oct 23 19:01:47 2017 +0800

    fixed iview#2078

commit c2d74ec
Author: 梁灏 <admin@aresn.com>
Date:   Mon Oct 23 18:26:42 2017 +0800

    fixed iview#2100

commit b92a1b5
Merge: 6261a49 3ed12b4
Author: Aresn <admin@aresn.com>
Date:   Mon Oct 23 04:22:44 2017 -0500

    Merge pull request iview#2170 from SergioCrisostomo/use-locale-formated-year-month

    Correct month calculation and add specs for date-picker labels

commit 6261a49
Merge: a1553a9 7afb406
Author: Aresn <admin@aresn.com>
Date:   Mon Oct 23 04:19:11 2017 -0500

    Merge pull request iview#2171 from iview/pr/2124

    update Tag style for check

commit a1553a9
Merge: 5064c7b fd79f10
Author: Aresn <admin@aresn.com>
Date:   Mon Oct 23 04:17:50 2017 -0500

    Merge pull request iview#2124 from daiyanze/feature/checkable_tag

    Feature/checkable tag (追加功能:可选标签)

commit 7afb406
Author: 梁灏 <admin@aresn.com>
Date:   Mon Oct 23 17:14:29 2017 +0800

    update Tag style for check

commit 3ed12b4
Author: Sergio Crisostomo <sergiosbox@gmail.com>
Date:   Mon Oct 23 11:13:06 2017 +0200

    Correct month calculation and add specs for date-picker labels

commit fd79f10
Author: Aresn <admin@aresn.com>
Date:   Mon Oct 23 03:57:05 2017 -0500

    Update tag.vue

commit 5064c7b
Author: 梁灏 <admin@aresn.com>
Date:   Mon Oct 23 16:52:30 2017 +0800

    update ja-JP

commit 4c6d996
Author: Aresn <admin@aresn.com>
Date:   Mon Oct 23 03:40:39 2017 -0500

    Update tag.vue

commit b75ad4a
Author: 梁灏 <admin@aresn.com>
Date:   Mon Oct 23 14:12:02 2017 +0800

    fixed iview#1700

commit 6ed0cd7
Author: 梁灏 <admin@aresn.com>
Date:   Mon Oct 23 11:55:35 2017 +0800

    update Tree demo

commit 0e31618
Author: 梁灏 <admin@aresn.com>
Date:   Mon Oct 23 11:00:20 2017 +0800

    update demo

commit ba1422c
Author: 梁灏 <admin@aresn.com>
Date:   Mon Oct 23 09:52:56 2017 +0800

    update zh-TW

commit f672ae0
Merge: 0f65109 2537c26
Author: Aresn <admin@aresn.com>
Date:   Sun Oct 22 20:29:51 2017 -0500

    Merge pull request iview#2097 from SergioCrisostomo/use-locale-formated-year-month

    use date.toLocaleDateString to format year/month

commit 0f65109
Author: 梁灏 <admin@aresn.com>
Date:   Mon Oct 23 09:26:41 2017 +0800

    update

commit a730a84
Author: 梁灏 <admin@aresn.com>
Date:   Fri Oct 20 17:44:58 2017 +0800

    update Tabs

commit ec1a5e2
Merge: 758bd76 be3fbd2
Author: Aresn <admin@aresn.com>
Date:   Fri Oct 20 04:38:28 2017 -0500

    Merge pull request iview#2156 from marxy/tabs-scroll

    Tabs add scroll

commit 758bd76
Merge: 45103ca e15746f
Author: 梁灏 <admin@aresn.com>
Date:   Fri Oct 20 16:56:33 2017 +0800

    Merge branch '2.0' of https://github.com/iview/iview into 2.0

commit 45103ca
Author: 梁灏 <admin@aresn.com>
Date:   Fri Oct 20 16:53:59 2017 +0800

    fixed iview#2066

commit be3fbd2
Author: marxy <334905044@qq.com>
Date:   Fri Oct 20 16:30:44 2017 +0800

    Tabs add scroll

commit e15746f
Author: Aresn <admin@aresn.com>
Date:   Fri Oct 20 03:18:08 2017 -0500

    update dependence

commit 485a903
Author: 梁灏 <admin@aresn.com>
Date:   Fri Oct 20 15:36:43 2017 +0800

    fixed iview#2149

commit cbe5ccf
Merge: 11baa9a 437b805
Author: Aresn <admin@aresn.com>
Date:   Thu Oct 19 22:47:33 2017 -0500

    Merge pull request iview#2114 from SergioCrisostomo/improve-csv

    Improve export to CSV functionality

commit 11baa9a
Merge: 2e8add2 a3336b3
Author: Aresn <admin@aresn.com>
Date:   Thu Oct 19 05:45:31 2017 -0500

    Merge pull request iview#2136 from SergioCrisostomo/fix-scroll-event

    add missing event in callback

commit a3336b3
Author: Sergio Crisostomo <sergiosbox@gmail.com>
Date:   Thu Oct 19 10:41:19 2017 +0200

    add missing event in callback

commit 62bf2b3
Author: daiyanze <ginoalex8964@yahoo.com>
Date:   Wed Oct 18 17:21:52 2017 +0900

    Modify: example of tags

commit dc39cc3
Author: daiyanze <ginoalex8964@yahoo.com>
Date:   Wed Oct 18 17:13:06 2017 +0900

    Feature: Checkable tag

commit 2e8add2
Author: 梁灏 <admin@aresn.com>
Date:   Wed Oct 18 08:58:16 2017 +0800

    release 2.5.1

commit 95dfbe1
Merge: 3c6d8ea 5d1c24c
Author: Aresn <admin@aresn.com>
Date:   Tue Oct 17 19:52:02 2017 -0500

    Merge pull request iview#2120 from SergioCrisostomo/fix-2119

    correct behaviour when initialising date-picker with a empty string

commit 5d1c24c
Author: Sergio Crisostomo <sergiosbox@gmail.com>
Date:   Tue Oct 17 15:13:42 2017 +0200

    correct behaviour when initialising date-picker with a empty string

commit 2537c26
Author: Sergio Crisostomo <sergiosbox@gmail.com>
Date:   Tue Oct 17 14:26:12 2017 +0200

    add dateLabel to time panel

commit b27858d
Author: Sergio Crisostomo <sergiosbox@gmail.com>
Date:   Tue Oct 17 13:09:04 2017 +0200

    add date panel label format logic

commit 3d50db5
Author: Sergio Crisostomo <sergiosbox@gmail.com>
Date:   Tue Oct 17 12:25:36 2017 +0200

    add datePanelLabel format in locale files

commit 437b805
Author: Sergio Crisostomo <sergiosbox@gmail.com>
Date:   Tue Oct 17 10:14:10 2017 +0200

    Added Table to CSV example and tests

commit fb84799
Author: Sergio Crisostomo <sergiosbox@gmail.com>
Date:   Tue Oct 17 10:13:54 2017 +0200

    Improve export to CSV functionality

     - added`callback`option so we can get CSV data in case we do not want
    to download
     - added options:
        - `quoted` for cases when we have line breaks in content
        - `separator` for cases when we have commas in content

commit 3c6d8ea
Author: 梁灏 <admin@aresn.com>
Date:   Tue Oct 17 16:09:11 2017 +0800

    release 2.5.0

commit 61d1637
Author: 梁灏 <admin@aresn.com>
Date:   Mon Oct 16 20:45:46 2017 +0800

    publish 2.5.0-beta.2

commit 78b46fa
Author: 梁灏 <admin@aresn.com>
Date:   Mon Oct 16 20:41:13 2017 +0800

    Scroll add local loading-text

commit 109465d
Author: 梁灏 <admin@aresn.com>
Date:   Mon Oct 16 20:10:21 2017 +0800

    optimize  Scroll scroll behavior

commit 6850c1d
Author: 梁灏 <admin@aresn.com>
Date:   Mon Oct 16 18:32:47 2017 +0800

    Scroll add `height` prop

commit 7462478
Author: 梁灏 <admin@aresn.com>
Date:   Mon Oct 16 16:05:06 2017 +0800

    publish 2.5.0-beta.1

commit 8c2e53e
Merge: f180098 af6a7c4
Author: Aresn <admin@aresn.com>
Date:   Mon Oct 16 02:54:57 2017 -0500

    Merge pull request iview#2069 from dspangenberg/2.0

    DatePicker: weekStartDay did not influence the order of the weekdays in the header

commit af6a7c4
Author: Danny Spangenberg <danny.spangenberg@twiceware.de>
Date:   Wed Oct 11 17:38:03 2017 +0200

    weekStartDay did not influence the order of the weekdays in the header
ZhaoYuLing pushed a commit to baishancloud/iview-bsc that referenced this pull request Mar 14, 2018
commit 9af3d87
Author: lan <adwerrd@hotmail.com>
Date:   Mon Nov 6 10:40:32 2017 +0800

    radio adn switch dark

commit 914a145
Author: xiaoyu <852483353@qq.com>
Date:   Sat Nov 4 17:27:07 2017 +0800

    slider dark

commit 83c7b53
Author: xiaoyu <852483353@qq.com>
Date:   Sat Nov 4 17:03:22 2017 +0800

    progress dark

commit 85c812f
Author: xiaoyu <852483353@qq.com>
Date:   Sat Nov 4 13:58:21 2017 +0800

    tooltip dark

commit 664d022
Author: xiaoyu <852483353@qq.com>
Date:   Sat Nov 4 11:48:41 2017 +0800

    poptip dark

commit d02a4fa
Author: xiaoyu <852483353@qq.com>
Date:   Fri Nov 3 20:28:18 2017 +0800

    spin dark

commit bb38adf
Author: xiaoyu <852483353@qq.com>
Date:   Fri Nov 3 19:19:17 2017 +0800

    tabs dark

commit 90713f1
Author: xiaoyu <852483353@qq.com>
Date:   Fri Nov 3 16:55:08 2017 +0800

    tag dark

commit ba22112
Author: xiaoyu <852483353@qq.com>
Date:   Fri Nov 3 16:18:17 2017 +0800

    input-number dark

commit ef06cf2
Author: xiaoyu <852483353@qq.com>
Date:   Fri Nov 3 15:18:32 2017 +0800

    input dark

commit bbc598f
Author: lan <adwerrd@hotmail.com>
Date:   Thu Nov 2 19:44:57 2017 +0800

    version change

commit 4f84332
Author: lan <adwerrd@hotmail.com>
Date:   Thu Nov 2 19:43:52 2017 +0800

    switch bugfix

commit 99d0b55
Author: lan <adwerrd@hotmail.com>
Date:   Thu Nov 2 19:43:16 2017 +0800

    Squashed commit of the following:

    commit 427dd34
    Author: 梁灏 <admin@aresn.com>
    Date:   Thu Nov 2 18:23:10 2017 +0800

        update issue guide

    commit 0819648
    Merge: 470930e d1f698c
    Author: Aresn <admin@aresn.com>
    Date:   Wed Nov 1 04:03:17 2017 -0500

        Merge pull request iview#2274 from yangdan8/patch-2

        Modal弹窗请添加on-visible-change给外部api访问

    commit d1f698c
    Author: yangdan8 <13532023084@139.com>
    Date:   Wed Nov 1 15:12:12 2017 +0800

        Modal弹窗请添加on-visible-change给外部api访问

        Modal弹窗请添加on-visible-change给外部api访问

    commit 470930e
    Author: 梁灏 <admin@aresn.com>
    Date:   Tue Oct 31 14:15:00 2017 +0800

        update issue template

    commit d44e817
    Author: 梁灏 <admin@aresn.com>
    Date:   Tue Oct 31 10:33:50 2017 +0800

        update Readme

    commit 1a1f7c3
    Merge: 75fa706 915e06d
    Author: 梁灏 <admin@aresn.com>
    Date:   Mon Oct 30 16:09:25 2017 +0800

        Merge branch '2.0' of https://github.com/iview/iview into 2.0

    commit 75fa706
    Author: 梁灏 <admin@aresn.com>
    Date:   Mon Oct 30 16:01:18 2017 +0800

        update tabs demo

    commit 915e06d
    Merge: 1231c1a 3be0aa1
    Author: Aresn <admin@aresn.com>
    Date:   Mon Oct 30 03:01:06 2017 -0500

        Merge pull request iview#2230 from cheng-kang/2.0

        fix issue iview#1846

    commit 1231c1a
    Merge: 5a83c4a 0c0683e
    Author: Aresn <admin@aresn.com>
    Date:   Mon Oct 30 02:46:05 2017 -0500

        Merge pull request iview#2018 from Baoyx007/patch-1

        feat(form) : support promise for validate method iview#1857

    commit 3be0aa1
    Author: Kang Cheng <me@chengkang.pw>
    Date:   Mon Oct 30 00:33:31 2017 -0700

        Import custom MutationObserver; remove mutation observer before component get destroyed

    commit 5a83c4a
    Merge: 7a9f6b2 b30250a
    Author: Aresn <admin@aresn.com>
    Date:   Mon Oct 30 01:40:31 2017 -0500

        Merge pull request iview#2223 from chavyleung/2.0

        fixed: iview#2219 & ColorPicker icon position

    commit 7988575
    Author: Kang Cheng <me@chengkang.pw>
    Date:   Sun Oct 29 15:39:45 2017 -0700

        fix issue iview#1846

    commit b30250a
    Author: Chavy <chavyleung@163.com>
    Date:   Sat Oct 28 11:57:38 2017 +0800

        fixed: iview#2219 & ColorPicker icon position

    commit 7a9f6b2
    Merge: 7d25930 a892ba6
    Author: Aresn <admin@aresn.com>
    Date:   Fri Oct 27 02:22:16 2017 -0500

        Merge pull request iview#2213 from SergioCrisostomo/fix-number-input

        prevent firing change when typing numbers < min

    commit a892ba6
    Author: Sergio Crisostomo <sergiosbox@gmail.com>
    Date:   Fri Oct 27 08:40:11 2017 +0200

        prevent firing change when typing numbers < min

    commit 7d25930
    Author: 梁灏 <admin@aresn.com>
    Date:   Thu Oct 26 14:47:54 2017 +0800

        release 2.6.0

    commit f673ca4
    Author: 梁灏 <admin@aresn.com>
    Date:   Thu Oct 26 14:18:07 2017 +0800

        publish 2.6.0 beta

    commit 86cdfb8
    Merge: 252717e 19ad5f4
    Author: Aresn <admin@aresn.com>
    Date:   Thu Oct 26 00:14:52 2017 -0500

        Merge pull request iview#2194 from SergioCrisostomo/add-scroll-distance-to-edge

        add distance-to-edge property

    commit 19ad5f4
    Author: Aresn <admin@aresn.com>
    Date:   Thu Oct 26 00:14:36 2017 -0500

        Update scroll.vue

    commit 252717e
    Merge: 9147e63 dfae43a
    Author: Aresn <admin@aresn.com>
    Date:   Thu Oct 26 00:13:02 2017 -0500

        Merge pull request iview#2193 from SergioCrisostomo/fix-2191

        correct input value in filterable mode

    commit 9147e63
    Merge: 51939f8 cbdac01
    Author: Aresn <admin@aresn.com>
    Date:   Thu Oct 26 00:10:44 2017 -0500

        Merge pull request iview#2195 from yangdan8/patch-4

        Update table.vue  解决tabs切换时,tab中的table调试时控制台报$el undefined的问题

    commit cbdac01
    Author: Aresn <admin@aresn.com>
    Date:   Thu Oct 26 00:09:42 2017 -0500

        Update table.vue

    commit 51939f8
    Author: 梁灏 <admin@aresn.com>
    Date:   Thu Oct 26 12:55:18 2017 +0800

        update Select tag

    commit 2079c47
    Author: 梁灏 <admin@aresn.com>
    Date:   Thu Oct 26 11:57:24 2017 +0800

        update Tag

    commit 2993f4e
    Author: 梁灏 <admin@aresn.com>
    Date:   Thu Oct 26 11:26:05 2017 +0800

        update Tab

    commit f6a787f
    Author: yangdan8 <13532023084@139.com>
    Date:   Thu Oct 26 09:48:47 2017 +0800

        Update table.vue

    commit 72ba666
    Author: Sergio Crisostomo <sergiosbox@gmail.com>
    Date:   Wed Oct 25 21:21:35 2017 +0200

        add distance-to-edge property

    commit dfae43a
    Author: Sergio Crisostomo <sergiosbox@gmail.com>
    Date:   Wed Oct 25 20:49:38 2017 +0200

        correct input value in filterable mode

    commit af7d72b
    Author: 梁灏 <admin@aresn.com>
    Date:   Wed Oct 25 22:34:58 2017 +0800

        update Tree selected

    commit 6ff0e34
    Author: 梁灏 <admin@aresn.com>
    Date:   Wed Oct 25 21:10:29 2017 +0800

        update Tree Render function

    commit 97098fc
    Author: 梁灏 <admin@aresn.com>
    Date:   Wed Oct 25 19:12:14 2017 +0800

        update Tree example

    commit b64204f
    Author: 梁灏 <admin@aresn.com>
    Date:   Wed Oct 25 17:41:37 2017 +0800

        update Tree demo

    commit 174836c
    Author: 梁灏 <admin@aresn.com>
    Date:   Wed Oct 25 16:45:42 2017 +0800

        update Tree Render function use

    commit 3ea2461
    Author: 梁灏 <admin@aresn.com>
    Date:   Wed Oct 25 14:33:22 2017 +0800

        update checkbox style

    commit 69460a5
    Merge: 8711920 610fd3a
    Author: Aresn <admin@aresn.com>
    Date:   Tue Oct 24 21:44:41 2017 -0500

        Merge pull request iview#2181 from lisafra/update-carousel

        Update carousel component: add loop and radiusDot property

    commit 610fd3a
    Author: houyl <houyl@okooo.net>
    Date:   Wed Oct 25 09:30:46 2017 +0800

        [fix bug]  carousel component: remove no use code

    commit 8711920
    Merge: 2be2b97 692be62
    Author: Aresn <admin@aresn.com>
    Date:   Tue Oct 24 19:14:01 2017 -0500

        Merge pull request iview#2185 from md678685/patch-1

        Fix some English grammar in README

    commit 692be62
    Author: md678685 <mathew678@hotmail.co.uk>
    Date:   Tue Oct 24 21:06:04 2017 +0100

        Fix some English grammar in README

        This PR changes some of the English sentences in the `README.md` to sound more natural. I have tried to keep the structure as close as possible to the original. If anything sounds confusing, please reply below.

        这个PR改变了`README.md`中的一些英文句子,使其听起来更自然。 我试图保持结构尽可能接近原来。 如有任何疑问,请在下面回覆。

    commit 2be2b97
    Merge: b31aab7 da76a83
    Author: Aresn <admin@aresn.com>
    Date:   Tue Oct 24 07:46:14 2017 -0500

        Merge pull request iview#2184 from SergioCrisostomo/fix-tree-examples

        fix dom rendering when adding new nodes in example

    commit da76a83
    Author: Sergio Crisostomo <sergiosbox@gmail.com>
    Date:   Tue Oct 24 14:08:52 2017 +0200

        fix dom rendering problems

    commit b31aab7
    Author: 梁灏 <admin@aresn.com>
    Date:   Tue Oct 24 18:14:22 2017 +0800

        Tree add async loading

    commit 76a4781
    Author: 梁灏 <admin@aresn.com>
    Date:   Tue Oct 24 16:48:28 2017 +0800

        fixed iview#2128

    commit ccf544d
    Author: houyl <houyl@okooo.net>
    Date:   Tue Oct 24 16:47:12 2017 +0800

        Merge branch 'master' of https://github.com/iview/iview into 2.0
        Update carousel component: add loop and radiusDot property
        # Conflicts:
        #	package.json
        #	src/components/date-picker/picker.vue
        #	src/components/select/select.vue

    commit 9b24f1a
    Author: 梁灏 <admin@aresn.com>
    Date:   Tue Oct 24 16:20:09 2017 +0800

        Tree add Render function

        fixed iview#2133
        fixed iview#1784
        fixed iview#1333
        fixed iview#1362

    commit ecf6c2f
    Author: 梁灏 <admin@aresn.com>
    Date:   Tue Oct 24 15:47:07 2017 +0800

        update dependence

    commit c89e0e1
    Merge: 7053de4 0a8f9b4
    Author: Aresn <admin@aresn.com>
    Date:   Tue Oct 24 02:44:19 2017 -0500

        Merge pull request iview#2090 from SergioCrisostomo/refactor-tree

        Refactor tree

    commit 0a8f9b4
    Author: Sergio Crisostomo <sergiosbox@gmail.com>
    Date:   Tue Oct 24 09:30:09 2017 +0200

        Keep original data pointers and correct if clause

    commit d44420b
    Author: Sergio Crisostomo <sergiosbox@gmail.com>
    Date:   Sat Oct 14 09:49:13 2017 +0200

        refactor and make indeterminate accessible outside tree

    commit 94d177c
    Author: Sergio Crisostomo <sergiosbox@gmail.com>
    Date:   Sat Oct 14 09:47:33 2017 +0200

        add width to expand icon so we can click on it easier

    commit 7053de4
    Author: 梁灏 <admin@aresn.com>
    Date:   Tue Oct 24 09:52:42 2017 +0800

        update demo

    commit c61015d
    Merge: a5f4a1d 65255c9
    Author: Aresn <admin@aresn.com>
    Date:   Mon Oct 23 20:22:51 2017 -0500

        Merge pull request iview#2172 from SergioCrisostomo/fix-2164

        format string dates in daterange also

    commit a5f4a1d
    Author: 梁灏 <admin@aresn.com>
    Date:   Mon Oct 23 23:08:40 2017 +0800

        fixed iview#1922

    commit 65255c9
    Author: Sergio Crisostomo <sergiosbox@gmail.com>
    Date:   Mon Oct 23 15:53:12 2017 +0200

        fix date formatting when strings are supplied to DatePicker

    commit 6c634aa
    Author: 梁灏 <admin@aresn.com>
    Date:   Mon Oct 23 19:01:47 2017 +0800

        fixed iview#2078

    commit c2d74ec
    Author: 梁灏 <admin@aresn.com>
    Date:   Mon Oct 23 18:26:42 2017 +0800

        fixed iview#2100

    commit b92a1b5
    Merge: 6261a49 3ed12b4
    Author: Aresn <admin@aresn.com>
    Date:   Mon Oct 23 04:22:44 2017 -0500

        Merge pull request iview#2170 from SergioCrisostomo/use-locale-formated-year-month

        Correct month calculation and add specs for date-picker labels

    commit 6261a49
    Merge: a1553a9 7afb406
    Author: Aresn <admin@aresn.com>
    Date:   Mon Oct 23 04:19:11 2017 -0500

        Merge pull request iview#2171 from iview/pr/2124

        update Tag style for check

    commit a1553a9
    Merge: 5064c7b fd79f10
    Author: Aresn <admin@aresn.com>
    Date:   Mon Oct 23 04:17:50 2017 -0500

        Merge pull request iview#2124 from daiyanze/feature/checkable_tag

        Feature/checkable tag (追加功能:可选标签)

    commit 7afb406
    Author: 梁灏 <admin@aresn.com>
    Date:   Mon Oct 23 17:14:29 2017 +0800

        update Tag style for check

    commit 3ed12b4
    Author: Sergio Crisostomo <sergiosbox@gmail.com>
    Date:   Mon Oct 23 11:13:06 2017 +0200

        Correct month calculation and add specs for date-picker labels

    commit fd79f10
    Author: Aresn <admin@aresn.com>
    Date:   Mon Oct 23 03:57:05 2017 -0500

        Update tag.vue

    commit 5064c7b
    Author: 梁灏 <admin@aresn.com>
    Date:   Mon Oct 23 16:52:30 2017 +0800

        update ja-JP

    commit 4c6d996
    Author: Aresn <admin@aresn.com>
    Date:   Mon Oct 23 03:40:39 2017 -0500

        Update tag.vue

    commit b75ad4a
    Author: 梁灏 <admin@aresn.com>
    Date:   Mon Oct 23 14:12:02 2017 +0800

        fixed iview#1700

    commit 6ed0cd7
    Author: 梁灏 <admin@aresn.com>
    Date:   Mon Oct 23 11:55:35 2017 +0800

        update Tree demo

    commit 0e31618
    Author: 梁灏 <admin@aresn.com>
    Date:   Mon Oct 23 11:00:20 2017 +0800

        update demo

    commit ba1422c
    Author: 梁灏 <admin@aresn.com>
    Date:   Mon Oct 23 09:52:56 2017 +0800

        update zh-TW

    commit f672ae0
    Merge: 0f65109 2537c26
    Author: Aresn <admin@aresn.com>
    Date:   Sun Oct 22 20:29:51 2017 -0500

        Merge pull request iview#2097 from SergioCrisostomo/use-locale-formated-year-month

        use date.toLocaleDateString to format year/month

    commit 0f65109
    Author: 梁灏 <admin@aresn.com>
    Date:   Mon Oct 23 09:26:41 2017 +0800

        update

    commit a730a84
    Author: 梁灏 <admin@aresn.com>
    Date:   Fri Oct 20 17:44:58 2017 +0800

        update Tabs

    commit ec1a5e2
    Merge: 758bd76 be3fbd2
    Author: Aresn <admin@aresn.com>
    Date:   Fri Oct 20 04:38:28 2017 -0500

        Merge pull request iview#2156 from marxy/tabs-scroll

        Tabs add scroll

    commit 758bd76
    Merge: 45103ca e15746f
    Author: 梁灏 <admin@aresn.com>
    Date:   Fri Oct 20 16:56:33 2017 +0800

        Merge branch '2.0' of https://github.com/iview/iview into 2.0

    commit 45103ca
    Author: 梁灏 <admin@aresn.com>
    Date:   Fri Oct 20 16:53:59 2017 +0800

        fixed iview#2066

    commit be3fbd2
    Author: marxy <334905044@qq.com>
    Date:   Fri Oct 20 16:30:44 2017 +0800

        Tabs add scroll

    commit e15746f
    Author: Aresn <admin@aresn.com>
    Date:   Fri Oct 20 03:18:08 2017 -0500

        update dependence

    commit 485a903
    Author: 梁灏 <admin@aresn.com>
    Date:   Fri Oct 20 15:36:43 2017 +0800

        fixed iview#2149

    commit cbe5ccf
    Merge: 11baa9a 437b805
    Author: Aresn <admin@aresn.com>
    Date:   Thu Oct 19 22:47:33 2017 -0500

        Merge pull request iview#2114 from SergioCrisostomo/improve-csv

        Improve export to CSV functionality

    commit 11baa9a
    Merge: 2e8add2 a3336b3
    Author: Aresn <admin@aresn.com>
    Date:   Thu Oct 19 05:45:31 2017 -0500

        Merge pull request iview#2136 from SergioCrisostomo/fix-scroll-event

        add missing event in callback

    commit a3336b3
    Author: Sergio Crisostomo <sergiosbox@gmail.com>
    Date:   Thu Oct 19 10:41:19 2017 +0200

        add missing event in callback

    commit 62bf2b3
    Author: daiyanze <ginoalex8964@yahoo.com>
    Date:   Wed Oct 18 17:21:52 2017 +0900

        Modify: example of tags

    commit dc39cc3
    Author: daiyanze <ginoalex8964@yahoo.com>
    Date:   Wed Oct 18 17:13:06 2017 +0900

        Feature: Checkable tag

    commit 2e8add2
    Author: 梁灏 <admin@aresn.com>
    Date:   Wed Oct 18 08:58:16 2017 +0800

        release 2.5.1

    commit 95dfbe1
    Merge: 3c6d8ea 5d1c24c
    Author: Aresn <admin@aresn.com>
    Date:   Tue Oct 17 19:52:02 2017 -0500

        Merge pull request iview#2120 from SergioCrisostomo/fix-2119

        correct behaviour when initialising date-picker with a empty string

    commit 5d1c24c
    Author: Sergio Crisostomo <sergiosbox@gmail.com>
    Date:   Tue Oct 17 15:13:42 2017 +0200

        correct behaviour when initialising date-picker with a empty string

    commit 2537c26
    Author: Sergio Crisostomo <sergiosbox@gmail.com>
    Date:   Tue Oct 17 14:26:12 2017 +0200

        add dateLabel to time panel

    commit b27858d
    Author: Sergio Crisostomo <sergiosbox@gmail.com>
    Date:   Tue Oct 17 13:09:04 2017 +0200

        add date panel label format logic

    commit 3d50db5
    Author: Sergio Crisostomo <sergiosbox@gmail.com>
    Date:   Tue Oct 17 12:25:36 2017 +0200

        add datePanelLabel format in locale files

    commit 437b805
    Author: Sergio Crisostomo <sergiosbox@gmail.com>
    Date:   Tue Oct 17 10:14:10 2017 +0200

        Added Table to CSV example and tests

    commit fb84799
    Author: Sergio Crisostomo <sergiosbox@gmail.com>
    Date:   Tue Oct 17 10:13:54 2017 +0200

        Improve export to CSV functionality

         - added`callback`option so we can get CSV data in case we do not want
        to download
         - added options:
            - `quoted` for cases when we have line breaks in content
            - `separator` for cases when we have commas in content

    commit 3c6d8ea
    Author: 梁灏 <admin@aresn.com>
    Date:   Tue Oct 17 16:09:11 2017 +0800

        release 2.5.0

    commit 61d1637
    Author: 梁灏 <admin@aresn.com>
    Date:   Mon Oct 16 20:45:46 2017 +0800

        publish 2.5.0-beta.2

    commit 78b46fa
    Author: 梁灏 <admin@aresn.com>
    Date:   Mon Oct 16 20:41:13 2017 +0800

        Scroll add local loading-text

    commit 109465d
    Author: 梁灏 <admin@aresn.com>
    Date:   Mon Oct 16 20:10:21 2017 +0800

        optimize  Scroll scroll behavior

    commit 6850c1d
    Author: 梁灏 <admin@aresn.com>
    Date:   Mon Oct 16 18:32:47 2017 +0800

        Scroll add `height` prop

    commit 7462478
    Author: 梁灏 <admin@aresn.com>
    Date:   Mon Oct 16 16:05:06 2017 +0800

        publish 2.5.0-beta.1

    commit 8c2e53e
    Merge: f180098 af6a7c4
    Author: Aresn <admin@aresn.com>
    Date:   Mon Oct 16 02:54:57 2017 -0500

        Merge pull request iview#2069 from dspangenberg/2.0

        DatePicker: weekStartDay did not influence the order of the weekdays in the header

    commit af6a7c4
    Author: Danny Spangenberg <danny.spangenberg@twiceware.de>
    Date:   Wed Oct 11 17:38:03 2017 +0200

        weekStartDay did not influence the order of the weekdays in the header

    commit 0c0683e
    Author: Haven <baoyx007@gmail.com>
    Date:   Thu Sep 28 00:40:16 2017 -0500

        feat(form) : support promise for validate method iview#1857

commit d545cc6
Author: xiaoyu <852483353@qq.com>
Date:   Thu Nov 2 17:35:44 2017 +0800

    dark bugfix

commit 2995faf
Author: xiaoyu <852483353@qq.com>
Date:   Thu Nov 2 16:50:39 2017 +0800

    date-picker dark

commit d8dc76f
Author: lan <adwerrd@hotmail.com>
Date:   Wed Nov 1 16:52:46 2017 +0800

    remove css-dark

commit c4789cd
Author: xiaoyu <852483353@qq.com>
Date:   Thu Nov 2 10:40:41 2017 +0800

    select dark

commit 5ae38e2
Author: xiaoyu <852483353@qq.com>
Date:   Wed Nov 1 17:11:50 2017 +0800

    checkbox dark

commit 706736c
Author: xiaoyu <852483353@qq.com>
Date:   Wed Nov 1 16:19:36 2017 +0800

    modify modal dark

commit 363dc6f
Author: xiaoyu <852483353@qq.com>
Date:   Wed Nov 1 14:52:21 2017 +0800

    simplify table dark

commit e5efbcb
Author: lan <adwerrd@hotmail.com>
Date:   Wed Nov 1 15:15:49 2017 +0800

    button dark

commit 4ccbf8e
Author: lan <adwerrd@hotmail.com>
Date:   Tue Oct 31 15:51:13 2017 +0800

    button dark

commit 4ba897d
Author: xiaoyu <852483353@qq.com>
Date:   Wed Nov 1 12:01:47 2017 +0800

    modify -dark in custom.less

commit 94151fc
Author: xiaoyu <852483353@qq.com>
Date:   Wed Nov 1 11:12:45 2017 +0800

    add -dark in custom.less

commit a361f59
Author: xiaoyu <852483353@qq.com>
Date:   Tue Oct 31 19:35:00 2017 +0800

    checkbox dark

commit 023454d
Author: xiaoyu <852483353@qq.com>
Date:   Tue Oct 31 17:32:37 2017 +0800

    dark table sort  bugfix

commit 25e3758
Author: zyl <949472497@qq.com>
Date:   Tue Oct 31 16:49:30 2017 +0800

    switch black bugfix

commit e08998c
Author: zyl <949472497@qq.com>
Date:   Tue Oct 31 16:05:36 2017 +0800

    switch black

commit 71a091b
Author: zyl <949472497@qq.com>
Date:   Tue Oct 31 15:00:47 2017 +0800

    tag black

commit 62587b6
Author: zyl <949472497@qq.com>
Date:   Wed Oct 25 19:17:36 2017 +0800

    input black

commit 8795f12
Author: zyl <949472497@qq.com>
Date:   Wed Oct 25 19:34:24 2017 +0800

    input-number black

commit eee42f9
Author: zyl <949472497@qq.com>
Date:   Wed Oct 25 19:28:46 2017 +0800

    radio black

commit 8109034
Author: zyl <949472497@qq.com>
Date:   Wed Oct 25 19:17:36 2017 +0800

    input black

commit 8d78de9
Author: xiaoyu <852483353@qq.com>
Date:   Tue Oct 31 16:25:58 2017 +0800

    date-picker dark

commit dc01707
Author: xiaoyu <852483353@qq.com>
Date:   Wed Oct 25 18:56:38 2017 +0800

    modal-dark  and  select-dark

commit f54459a
Author: xiaoyu <852483353@qq.com>
Date:   Wed Oct 25 11:58:57 2017 +0800

    table dark

commit 2fab71a
Author: lan <adwerrd@hotmail.com>
Date:   Tue Oct 24 20:56:44 2017 +0800

    add dark less

commit ed4e493
Author: lan <adwerrd@hotmail.com>
Date:   Tue Oct 24 20:56:34 2017 +0800

    add dark less 2

commit 5060fc8
Author: lan <adwerrd@hotmail.com>
Date:   Tue Oct 24 19:34:26 2017 +0800

    add dark less

commit b51c7cb
Author: xiaoyu <852483353@qq.com>
Date:   Tue Oct 24 17:02:32 2017 +0800

    table black color
ZhaoYuLing pushed a commit to baishancloud/iview-bsc that referenced this pull request Mar 14, 2018
commit 240bb21
Author: 梁灏 <admin@aresn.com>
Date:   Mon Nov 13 11:35:19 2017 +0800

    release 2.7.0

commit f2212c3
Author: 梁灏 <admin@aresn.com>
Date:   Mon Nov 13 10:07:45 2017 +0800

    publish 2.7.0-beta.1

commit 5bd0f52
Author: 梁灏 <admin@aresn.com>
Date:   Mon Nov 13 09:44:56 2017 +0800

    fixed

    iview#1090 iview#2387 iview#2379

commit d63a378
Author: 梁灏 <admin@aresn.com>
Date:   Mon Nov 13 09:27:54 2017 +0800

    fixed

    iview#1090 iview#2387 iview#379

commit a5dad1a
Author: 梁灏 <admin@aresn.com>
Date:   Mon Nov 13 09:14:03 2017 +0800

    fixed iview#1090 & close iview#2387 iview#2379

commit 6b2af1b
Merge: 593742a a2a18a4
Author: Aresn <admin@aresn.com>
Date:   Thu Nov 9 20:32:16 2017 -0600

    Merge pull request iview#2377 from btfrankenstein/2.0

    feat($input-number): add events 'on-focus', 'on-blur', 'on-enter' for…

commit a2a18a4
Author: Aresn <admin@aresn.com>
Date:   Thu Nov 9 20:31:47 2017 -0600

    Update input-number.vue

    remove `on-enter` because excessive and inflexible

commit c21a814
Author: btfrankenstein <btfrankenstein@gmail.com>
Date:   Thu Nov 9 17:56:33 2017 +0800

    feat($input-number): add events 'on-focus', 'on-blur', 'on-enter' for input-number component

commit 593742a
Author: 梁灏 <admin@aresn.com>
Date:   Thu Nov 9 17:06:49 2017 +0800

    update locale build file

commit b355578
Merge: 9d1add4 0c0d2c7
Author: Aresn <admin@aresn.com>
Date:   Thu Nov 9 00:47:25 2017 -0600

    Merge pull request iview#2354 from SergioCrisostomo/dry-exports

    reorganize and DRY components list

commit 9d1add4
Author: 梁灏 <admin@aresn.com>
Date:   Thu Nov 9 14:38:26 2017 +0800

    update Date example

commit 2df70eb
Merge: b91fd49 40aa935
Author: Aresn <admin@aresn.com>
Date:   Thu Nov 9 00:37:27 2017 -0600

    Merge pull request iview#2356 from SergioCrisostomo/fix-2122

    Patch Chromium bug

commit b91fd49
Merge: 4b33839 7f8d334
Author: Aresn <admin@aresn.com>
Date:   Thu Nov 9 00:18:47 2017 -0600

    Merge pull request iview#2368 from SergioCrisostomo/fix-datepicker-test

    fix date picker callback test

commit 7f8d334
Author: Sergio Crisostomo <sergiosbox@gmail.com>
Date:   Thu Nov 9 05:58:25 2017 +0100

    fix date picker callback test

commit 0c0d2c7
Author: Sergio Crisostomo <sergiosbox@gmail.com>
Date:   Thu Nov 9 05:50:30 2017 +0100

    reorganize and DRY components list

commit 4b33839
Author: 梁灏 <admin@aresn.com>
Date:   Thu Nov 9 11:11:54 2017 +0800

    update Select example

commit 67a9c1c
Author: 梁灏 <admin@aresn.com>
Date:   Thu Nov 9 09:48:56 2017 +0800

    update Tabs

commit bff9081
Merge: 4ab1ac5 5fbe80f
Author: Aresn <admin@aresn.com>
Date:   Wed Nov 8 19:19:51 2017 -0600

    Merge pull request iview#2351 from SergioCrisostomo/i18n

    use dist's locale

commit 4ab1ac5
Merge: 37fe6bb 236e0bf
Author: Aresn <admin@aresn.com>
Date:   Wed Nov 8 19:17:32 2017 -0600

    Merge pull request iview#2358 from SergioCrisostomo/ie-fix-2330

    Don't use includes to make IE happy and avoid Polyfill

commit 37fe6bb
Merge: 22c27b7 b1d124f
Author: Aresn <admin@aresn.com>
Date:   Wed Nov 8 19:15:00 2017 -0600

    Merge pull request iview#2361 from SergioCrisostomo/fix-2215

    add test for iview#2215

commit b1d124f
Author: Sergio Crisostomo <sergiosbox@gmail.com>
Date:   Wed Nov 8 16:07:23 2017 +0100

    add test for iview#2215

commit 22c27b7
Author: 梁灏 <admin@aresn.com>
Date:   Wed Nov 8 20:44:35 2017 +0800

    fixed iview#2215

commit 236e0bf
Author: Sergio Crisostomo <sergiosbox@gmail.com>
Date:   Wed Nov 8 10:14:08 2017 +0100

    DOn't use includes to make IE happy and avoid Polyfill

commit 5fbe80f
Author: Sergio Crisostomo <sergiosbox@gmail.com>
Date:   Wed Nov 8 09:59:45 2017 +0100

    use dist's locale

commit 40aa935
Author: Sergio Crisostomo <sergiosbox@gmail.com>
Date:   Wed Nov 8 09:54:14 2017 +0100

    patch chromium bug

commit b142865
Author: 梁灏 <admin@aresn.com>
Date:   Wed Nov 8 16:11:04 2017 +0800

    fixed iview#2102

commit 55f90d8
Author: 梁灏 <admin@aresn.com>
Date:   Wed Nov 8 14:39:39 2017 +0800

    fixed iview#1648

commit 6319935
Merge: cd92d87 297d1f1
Author: Aresn <admin@aresn.com>
Date:   Tue Nov 7 20:14:16 2017 -0600

    Merge pull request iview#2341 from f3man/2.0

    add uk_UA locale

commit cd92d87
Author: 梁灏 <admin@aresn.com>
Date:   Tue Nov 7 18:09:01 2017 +0800

    fixed iview#1482

commit 9f5a643
Author: 梁灏 <admin@aresn.com>
Date:   Tue Nov 7 17:54:36 2017 +0800

    fixed iview#2019

commit 84a4a95
Author: 梁灏 <admin@aresn.com>
Date:   Tue Nov 7 17:36:26 2017 +0800

    fixed iview#1926

commit 05265be
Author: 梁灏 <admin@aresn.com>
Date:   Tue Nov 7 17:28:20 2017 +0800

    fixed iview#2214

commit 6d2b7bc
Author: 梁灏 <admin@aresn.com>
Date:   Tue Nov 7 17:07:03 2017 +0800

    fixed iview#1575

commit 8869b70
Author: 梁灏 <admin@aresn.com>
Date:   Tue Nov 7 16:59:20 2017 +0800

    update

commit c7e432f
Author: 梁灏 <admin@aresn.com>
Date:   Tue Nov 7 16:43:23 2017 +0800

    update export & i18n

commit 297d1f1
Author: f3man <stepan7box@gmail.com>
Date:   Tue Nov 7 10:19:12 2017 +0200

    add uk_UA locale

    added ukranian language

commit 32e8393
Merge: bceb3c5 c17c5ad
Author: Aresn <admin@aresn.com>
Date:   Mon Nov 6 19:11:37 2017 -0600

    Merge pull request iview#2324 from SergioCrisostomo/auto-complete

    normalize autocomplete and spellcheck

commit bceb3c5
Merge: 427dd34 b9c1fe7
Author: Aresn <admin@aresn.com>
Date:   Mon Nov 6 19:02:53 2017 -0600

    Merge pull request iview#2322 from SergioCrisostomo/export-locales

    export locale objects

commit c17c5ad
Author: Sergio Crisostomo <sergiosbox@gmail.com>
Date:   Sat Nov 4 16:37:29 2017 +0100

    normalize autocomplete and spellcheck

commit b9c1fe7
Author: Sergio Crisostomo <sergiosbox@gmail.com>
Date:   Sat Nov 4 15:21:26 2017 +0100

    export locale objects

commit 427dd34
Author: 梁灏 <admin@aresn.com>
Date:   Thu Nov 2 18:23:10 2017 +0800

    update issue guide

commit 0819648
Merge: 470930e d1f698c
Author: Aresn <admin@aresn.com>
Date:   Wed Nov 1 04:03:17 2017 -0500

    Merge pull request iview#2274 from yangdan8/patch-2

    Modal弹窗请添加on-visible-change给外部api访问

commit d1f698c
Author: yangdan8 <13532023084@139.com>
Date:   Wed Nov 1 15:12:12 2017 +0800

    Modal弹窗请添加on-visible-change给外部api访问

    Modal弹窗请添加on-visible-change给外部api访问

commit 470930e
Author: 梁灏 <admin@aresn.com>
Date:   Tue Oct 31 14:15:00 2017 +0800

    update issue template

commit d44e817
Author: 梁灏 <admin@aresn.com>
Date:   Tue Oct 31 10:33:50 2017 +0800

    update Readme

commit 1a1f7c3
Merge: 75fa706 915e06d
Author: 梁灏 <admin@aresn.com>
Date:   Mon Oct 30 16:09:25 2017 +0800

    Merge branch '2.0' of https://github.com/iview/iview into 2.0

commit 75fa706
Author: 梁灏 <admin@aresn.com>
Date:   Mon Oct 30 16:01:18 2017 +0800

    update tabs demo

commit 915e06d
Merge: 1231c1a 3be0aa1
Author: Aresn <admin@aresn.com>
Date:   Mon Oct 30 03:01:06 2017 -0500

    Merge pull request iview#2230 from cheng-kang/2.0

    fix issue iview#1846

commit 1231c1a
Merge: 5a83c4a 0c0683e
Author: Aresn <admin@aresn.com>
Date:   Mon Oct 30 02:46:05 2017 -0500

    Merge pull request iview#2018 from Baoyx007/patch-1

    feat(form) : support promise for validate method iview#1857

commit 3be0aa1
Author: Kang Cheng <me@chengkang.pw>
Date:   Mon Oct 30 00:33:31 2017 -0700

    Import custom MutationObserver; remove mutation observer before component get destroyed

commit 5a83c4a
Merge: 7a9f6b2 b30250a
Author: Aresn <admin@aresn.com>
Date:   Mon Oct 30 01:40:31 2017 -0500

    Merge pull request iview#2223 from chavyleung/2.0

    fixed: iview#2219 & ColorPicker icon position

commit 7988575
Author: Kang Cheng <me@chengkang.pw>
Date:   Sun Oct 29 15:39:45 2017 -0700

    fix issue iview#1846

commit b30250a
Author: Chavy <chavyleung@163.com>
Date:   Sat Oct 28 11:57:38 2017 +0800

    fixed: iview#2219 & ColorPicker icon position

commit 7a9f6b2
Merge: 7d25930 a892ba6
Author: Aresn <admin@aresn.com>
Date:   Fri Oct 27 02:22:16 2017 -0500

    Merge pull request iview#2213 from SergioCrisostomo/fix-number-input

    prevent firing change when typing numbers < min

commit a892ba6
Author: Sergio Crisostomo <sergiosbox@gmail.com>
Date:   Fri Oct 27 08:40:11 2017 +0200

    prevent firing change when typing numbers < min

commit 7d25930
Author: 梁灏 <admin@aresn.com>
Date:   Thu Oct 26 14:47:54 2017 +0800

    release 2.6.0

commit f673ca4
Author: 梁灏 <admin@aresn.com>
Date:   Thu Oct 26 14:18:07 2017 +0800

    publish 2.6.0 beta

commit 86cdfb8
Merge: 252717e 19ad5f4
Author: Aresn <admin@aresn.com>
Date:   Thu Oct 26 00:14:52 2017 -0500

    Merge pull request iview#2194 from SergioCrisostomo/add-scroll-distance-to-edge

    add distance-to-edge property

commit 19ad5f4
Author: Aresn <admin@aresn.com>
Date:   Thu Oct 26 00:14:36 2017 -0500

    Update scroll.vue

commit 252717e
Merge: 9147e63 dfae43a
Author: Aresn <admin@aresn.com>
Date:   Thu Oct 26 00:13:02 2017 -0500

    Merge pull request iview#2193 from SergioCrisostomo/fix-2191

    correct input value in filterable mode

commit 9147e63
Merge: 51939f8 cbdac01
Author: Aresn <admin@aresn.com>
Date:   Thu Oct 26 00:10:44 2017 -0500

    Merge pull request iview#2195 from yangdan8/patch-4

    Update table.vue  解决tabs切换时,tab中的table调试时控制台报$el undefined的问题

commit cbdac01
Author: Aresn <admin@aresn.com>
Date:   Thu Oct 26 00:09:42 2017 -0500

    Update table.vue

commit 51939f8
Author: 梁灏 <admin@aresn.com>
Date:   Thu Oct 26 12:55:18 2017 +0800

    update Select tag

commit 2079c47
Author: 梁灏 <admin@aresn.com>
Date:   Thu Oct 26 11:57:24 2017 +0800

    update Tag

commit 2993f4e
Author: 梁灏 <admin@aresn.com>
Date:   Thu Oct 26 11:26:05 2017 +0800

    update Tab

commit f6a787f
Author: yangdan8 <13532023084@139.com>
Date:   Thu Oct 26 09:48:47 2017 +0800

    Update table.vue

commit 72ba666
Author: Sergio Crisostomo <sergiosbox@gmail.com>
Date:   Wed Oct 25 21:21:35 2017 +0200

    add distance-to-edge property

commit dfae43a
Author: Sergio Crisostomo <sergiosbox@gmail.com>
Date:   Wed Oct 25 20:49:38 2017 +0200

    correct input value in filterable mode

commit af7d72b
Author: 梁灏 <admin@aresn.com>
Date:   Wed Oct 25 22:34:58 2017 +0800

    update Tree selected

commit 6ff0e34
Author: 梁灏 <admin@aresn.com>
Date:   Wed Oct 25 21:10:29 2017 +0800

    update Tree Render function

commit 97098fc
Author: 梁灏 <admin@aresn.com>
Date:   Wed Oct 25 19:12:14 2017 +0800

    update Tree example

commit b64204f
Author: 梁灏 <admin@aresn.com>
Date:   Wed Oct 25 17:41:37 2017 +0800

    update Tree demo

commit 174836c
Author: 梁灏 <admin@aresn.com>
Date:   Wed Oct 25 16:45:42 2017 +0800

    update Tree Render function use

commit 3ea2461
Author: 梁灏 <admin@aresn.com>
Date:   Wed Oct 25 14:33:22 2017 +0800

    update checkbox style

commit 69460a5
Merge: 8711920 610fd3a
Author: Aresn <admin@aresn.com>
Date:   Tue Oct 24 21:44:41 2017 -0500

    Merge pull request iview#2181 from lisafra/update-carousel

    Update carousel component: add loop and radiusDot property

commit 610fd3a
Author: houyl <houyl@okooo.net>
Date:   Wed Oct 25 09:30:46 2017 +0800

    [fix bug]  carousel component: remove no use code

commit 8711920
Merge: 2be2b97 692be62
Author: Aresn <admin@aresn.com>
Date:   Tue Oct 24 19:14:01 2017 -0500

    Merge pull request iview#2185 from md678685/patch-1

    Fix some English grammar in README

commit 692be62
Author: md678685 <mathew678@hotmail.co.uk>
Date:   Tue Oct 24 21:06:04 2017 +0100

    Fix some English grammar in README

    This PR changes some of the English sentences in the `README.md` to sound more natural. I have tried to keep the structure as close as possible to the original. If anything sounds confusing, please reply below.

    这个PR改变了`README.md`中的一些英文句子,使其听起来更自然。 我试图保持结构尽可能接近原来。 如有任何疑问,请在下面回覆。

commit 2be2b97
Merge: b31aab7 da76a83
Author: Aresn <admin@aresn.com>
Date:   Tue Oct 24 07:46:14 2017 -0500

    Merge pull request iview#2184 from SergioCrisostomo/fix-tree-examples

    fix dom rendering when adding new nodes in example

commit da76a83
Author: Sergio Crisostomo <sergiosbox@gmail.com>
Date:   Tue Oct 24 14:08:52 2017 +0200

    fix dom rendering problems

commit b31aab7
Author: 梁灏 <admin@aresn.com>
Date:   Tue Oct 24 18:14:22 2017 +0800

    Tree add async loading

commit 76a4781
Author: 梁灏 <admin@aresn.com>
Date:   Tue Oct 24 16:48:28 2017 +0800

    fixed iview#2128

commit ccf544d
Author: houyl <houyl@okooo.net>
Date:   Tue Oct 24 16:47:12 2017 +0800

    Merge branch 'master' of https://github.com/iview/iview into 2.0
    Update carousel component: add loop and radiusDot property
    # Conflicts:
    #	package.json
    #	src/components/date-picker/picker.vue
    #	src/components/select/select.vue

commit 9b24f1a
Author: 梁灏 <admin@aresn.com>
Date:   Tue Oct 24 16:20:09 2017 +0800

    Tree add Render function

    fixed iview#2133
    fixed iview#1784
    fixed iview#1333
    fixed iview#1362

commit ecf6c2f
Author: 梁灏 <admin@aresn.com>
Date:   Tue Oct 24 15:47:07 2017 +0800

    update dependence

commit c89e0e1
Merge: 7053de4 0a8f9b4
Author: Aresn <admin@aresn.com>
Date:   Tue Oct 24 02:44:19 2017 -0500

    Merge pull request iview#2090 from SergioCrisostomo/refactor-tree

    Refactor tree

commit 0a8f9b4
Author: Sergio Crisostomo <sergiosbox@gmail.com>
Date:   Tue Oct 24 09:30:09 2017 +0200

    Keep original data pointers and correct if clause

commit d44420b
Author: Sergio Crisostomo <sergiosbox@gmail.com>
Date:   Sat Oct 14 09:49:13 2017 +0200

    refactor and make indeterminate accessible outside tree

commit 94d177c
Author: Sergio Crisostomo <sergiosbox@gmail.com>
Date:   Sat Oct 14 09:47:33 2017 +0200

    add width to expand icon so we can click on it easier

commit 7053de4
Author: 梁灏 <admin@aresn.com>
Date:   Tue Oct 24 09:52:42 2017 +0800

    update demo

commit c61015d
Merge: a5f4a1d 65255c9
Author: Aresn <admin@aresn.com>
Date:   Mon Oct 23 20:22:51 2017 -0500

    Merge pull request iview#2172 from SergioCrisostomo/fix-2164

    format string dates in daterange also

commit a5f4a1d
Author: 梁灏 <admin@aresn.com>
Date:   Mon Oct 23 23:08:40 2017 +0800

    fixed iview#1922

commit 65255c9
Author: Sergio Crisostomo <sergiosbox@gmail.com>
Date:   Mon Oct 23 15:53:12 2017 +0200

    fix date formatting when strings are supplied to DatePicker

commit 6c634aa
Author: 梁灏 <admin@aresn.com>
Date:   Mon Oct 23 19:01:47 2017 +0800

    fixed iview#2078

commit c2d74ec
Author: 梁灏 <admin@aresn.com>
Date:   Mon Oct 23 18:26:42 2017 +0800

    fixed iview#2100

commit b92a1b5
Merge: 6261a49 3ed12b4
Author: Aresn <admin@aresn.com>
Date:   Mon Oct 23 04:22:44 2017 -0500

    Merge pull request iview#2170 from SergioCrisostomo/use-locale-formated-year-month

    Correct month calculation and add specs for date-picker labels

commit 6261a49
Merge: a1553a9 7afb406
Author: Aresn <admin@aresn.com>
Date:   Mon Oct 23 04:19:11 2017 -0500

    Merge pull request iview#2171 from iview/pr/2124

    update Tag style for check

commit a1553a9
Merge: 5064c7b fd79f10
Author: Aresn <admin@aresn.com>
Date:   Mon Oct 23 04:17:50 2017 -0500

    Merge pull request iview#2124 from daiyanze/feature/checkable_tag

    Feature/checkable tag (追加功能:可选标签)

commit 7afb406
Author: 梁灏 <admin@aresn.com>
Date:   Mon Oct 23 17:14:29 2017 +0800

    update Tag style for check

commit 3ed12b4
Author: Sergio Crisostomo <sergiosbox@gmail.com>
Date:   Mon Oct 23 11:13:06 2017 +0200

    Correct month calculation and add specs for date-picker labels

commit fd79f10
Author: Aresn <admin@aresn.com>
Date:   Mon Oct 23 03:57:05 2017 -0500

    Update tag.vue

commit 5064c7b
Author: 梁灏 <admin@aresn.com>
Date:   Mon Oct 23 16:52:30 2017 +0800

    update ja-JP

commit 4c6d996
Author: Aresn <admin@aresn.com>
Date:   Mon Oct 23 03:40:39 2017 -0500

    Update tag.vue

commit b75ad4a
Author: 梁灏 <admin@aresn.com>
Date:   Mon Oct 23 14:12:02 2017 +0800

    fixed iview#1700

commit 6ed0cd7
Author: 梁灏 <admin@aresn.com>
Date:   Mon Oct 23 11:55:35 2017 +0800

    update Tree demo

commit 0e31618
Author: 梁灏 <admin@aresn.com>
Date:   Mon Oct 23 11:00:20 2017 +0800

    update demo

commit ba1422c
Author: 梁灏 <admin@aresn.com>
Date:   Mon Oct 23 09:52:56 2017 +0800

    update zh-TW

commit f672ae0
Merge: 0f65109 2537c26
Author: Aresn <admin@aresn.com>
Date:   Sun Oct 22 20:29:51 2017 -0500

    Merge pull request iview#2097 from SergioCrisostomo/use-locale-formated-year-month

    use date.toLocaleDateString to format year/month

commit 0f65109
Author: 梁灏 <admin@aresn.com>
Date:   Mon Oct 23 09:26:41 2017 +0800

    update

commit a730a84
Author: 梁灏 <admin@aresn.com>
Date:   Fri Oct 20 17:44:58 2017 +0800

    update Tabs

commit ec1a5e2
Merge: 758bd76 be3fbd2
Author: Aresn <admin@aresn.com>
Date:   Fri Oct 20 04:38:28 2017 -0500

    Merge pull request iview#2156 from marxy/tabs-scroll

    Tabs add scroll

commit 758bd76
Merge: 45103ca e15746f
Author: 梁灏 <admin@aresn.com>
Date:   Fri Oct 20 16:56:33 2017 +0800

    Merge branch '2.0' of https://github.com/iview/iview into 2.0

commit 45103ca
Author: 梁灏 <admin@aresn.com>
Date:   Fri Oct 20 16:53:59 2017 +0800

    fixed iview#2066

commit be3fbd2
Author: marxy <334905044@qq.com>
Date:   Fri Oct 20 16:30:44 2017 +0800

    Tabs add scroll

commit e15746f
Author: Aresn <admin@aresn.com>
Date:   Fri Oct 20 03:18:08 2017 -0500

    update dependence

commit 485a903
Author: 梁灏 <admin@aresn.com>
Date:   Fri Oct 20 15:36:43 2017 +0800

    fixed iview#2149

commit cbe5ccf
Merge: 11baa9a 437b805
Author: Aresn <admin@aresn.com>
Date:   Thu Oct 19 22:47:33 2017 -0500

    Merge pull request iview#2114 from SergioCrisostomo/improve-csv

    Improve export to CSV functionality

commit 11baa9a
Merge: 2e8add2 a3336b3
Author: Aresn <admin@aresn.com>
Date:   Thu Oct 19 05:45:31 2017 -0500

    Merge pull request iview#2136 from SergioCrisostomo/fix-scroll-event

    add missing event in callback

commit a3336b3
Author: Sergio Crisostomo <sergiosbox@gmail.com>
Date:   Thu Oct 19 10:41:19 2017 +0200

    add missing event in callback

commit 62bf2b3
Author: daiyanze <ginoalex8964@yahoo.com>
Date:   Wed Oct 18 17:21:52 2017 +0900

    Modify: example of tags

commit dc39cc3
Author: daiyanze <ginoalex8964@yahoo.com>
Date:   Wed Oct 18 17:13:06 2017 +0900

    Feature: Checkable tag

commit 2e8add2
Author: 梁灏 <admin@aresn.com>
Date:   Wed Oct 18 08:58:16 2017 +0800

    release 2.5.1

commit 95dfbe1
Merge: 3c6d8ea 5d1c24c
Author: Aresn <admin@aresn.com>
Date:   Tue Oct 17 19:52:02 2017 -0500

    Merge pull request iview#2120 from SergioCrisostomo/fix-2119

    correct behaviour when initialising date-picker with a empty string

commit 5d1c24c
Author: Sergio Crisostomo <sergiosbox@gmail.com>
Date:   Tue Oct 17 15:13:42 2017 +0200

    correct behaviour when initialising date-picker with a empty string

commit 2537c26
Author: Sergio Crisostomo <sergiosbox@gmail.com>
Date:   Tue Oct 17 14:26:12 2017 +0200

    add dateLabel to time panel

commit b27858d
Author: Sergio Crisostomo <sergiosbox@gmail.com>
Date:   Tue Oct 17 13:09:04 2017 +0200

    add date panel label format logic

commit 3d50db5
Author: Sergio Crisostomo <sergiosbox@gmail.com>
Date:   Tue Oct 17 12:25:36 2017 +0200

    add datePanelLabel format in locale files

commit 437b805
Author: Sergio Crisostomo <sergiosbox@gmail.com>
Date:   Tue Oct 17 10:14:10 2017 +0200

    Added Table to CSV example and tests

commit fb84799
Author: Sergio Crisostomo <sergiosbox@gmail.com>
Date:   Tue Oct 17 10:13:54 2017 +0200

    Improve export to CSV functionality

     - added`callback`option so we can get CSV data in case we do not want
    to download
     - added options:
        - `quoted` for cases when we have line breaks in content
        - `separator` for cases when we have commas in content

commit 3c6d8ea
Author: 梁灏 <admin@aresn.com>
Date:   Tue Oct 17 16:09:11 2017 +0800

    release 2.5.0

commit 61d1637
Author: 梁灏 <admin@aresn.com>
Date:   Mon Oct 16 20:45:46 2017 +0800

    publish 2.5.0-beta.2

commit 78b46fa
Author: 梁灏 <admin@aresn.com>
Date:   Mon Oct 16 20:41:13 2017 +0800

    Scroll add local loading-text

commit 109465d
Author: 梁灏 <admin@aresn.com>
Date:   Mon Oct 16 20:10:21 2017 +0800

    optimize  Scroll scroll behavior

commit 6850c1d
Author: 梁灏 <admin@aresn.com>
Date:   Mon Oct 16 18:32:47 2017 +0800

    Scroll add `height` prop

commit 7462478
Author: 梁灏 <admin@aresn.com>
Date:   Mon Oct 16 16:05:06 2017 +0800

    publish 2.5.0-beta.1

commit 8c2e53e
Merge: f180098 af6a7c4
Author: Aresn <admin@aresn.com>
Date:   Mon Oct 16 02:54:57 2017 -0500

    Merge pull request iview#2069 from dspangenberg/2.0

    DatePicker: weekStartDay did not influence the order of the weekdays in the header

commit af6a7c4
Author: Danny Spangenberg <danny.spangenberg@twiceware.de>
Date:   Wed Oct 11 17:38:03 2017 +0200

    weekStartDay did not influence the order of the weekdays in the header

commit 0c0683e
Author: Haven <baoyx007@gmail.com>
Date:   Thu Sep 28 00:40:16 2017 -0500

    feat(form) : support promise for validate method iview#1857
ZhaoYuLing pushed a commit to baishancloud/iview-bsc that referenced this pull request Mar 14, 2018
commit 916f3a6
Author: 梁灏 <admin@aresn.com>
Date:   Fri Nov 17 15:42:57 2017 +0800

    update readme

commit 5e70fad
Author: 梁灏 <admin@aresn.com>
Date:   Thu Nov 16 11:16:43 2017 +0800

    release 2.7.3

commit 54f510c
Author: 梁灏 <admin@aresn.com>
Date:   Thu Nov 16 11:02:01 2017 +0800

    fixed not support Nuxt.js

commit 1cbdb61
Merge: 82636f7 4543502
Author: Aresn <admin@aresn.com>
Date:   Wed Nov 15 20:45:44 2017 -0600

    Merge pull request iview#2429 from pbarros78/patch-2

    Long weekdays name to short weekdays name

commit 82636f7
Merge: 1ec1efa a14d6dd
Author: Aresn <admin@aresn.com>
Date:   Wed Nov 15 20:45:13 2017 -0600

    Merge pull request iview#2420 from SergioCrisostomo/input-number-fixes

    fix checking when temp number is invalid

commit 1ec1efa
Merge: d291e81 d962c7f
Author: Aresn <admin@aresn.com>
Date:   Wed Nov 15 20:27:51 2017 -0600

    Merge pull request iview#2421 from SergioCrisostomo/use-packagejson-version

    use version from package.json

commit 4543502
Author: Patricio Barros <patricio.barros@gmail.com>
Date:   Wed Nov 15 11:26:50 2017 -0300

    Long weekdays name to short weekdays name

    Change of name of long weekdays to short weekdays name, for use in datepicker

commit d962c7f
Author: Sergio Crisostomo <sergiosbox@gmail.com>
Date:   Tue Nov 14 17:46:52 2017 +0100

    use version from package.json

commit a14d6dd
Author: Sergio Crisostomo <sergiosbox@gmail.com>
Date:   Tue Nov 14 14:35:42 2017 +0100

    fix checking when temp number is invalid and should be rechecked in "change" event

commit d291e81
Author: 梁灏 <admin@aresn.com>
Date:   Tue Nov 14 09:54:44 2017 +0800

    release 2.7.2

commit 9b6f316
Author: 梁灏 <admin@aresn.com>
Date:   Tue Nov 14 09:53:58 2017 +0800

    fixed Tabs bug

commit 7b0fb4e
Author: 梁灏 <admin@aresn.com>
Date:   Tue Nov 14 09:31:48 2017 +0800

    release 2.7.1

commit 1d15cbb
Merge: 240bb21 a74be22
Author: Aresn <admin@aresn.com>
Date:   Mon Nov 13 19:24:20 2017 -0600

    Merge pull request iview#2407 from SergioCrisostomo/fix-look-for-parent

    don't check past document.body when moving up DOM tree

commit a74be22
Author: Sergio Crisostomo <sergiosbox@gmail.com>
Date:   Mon Nov 13 16:57:43 2017 +0100

    don't check DOM tree past document.body

commit 240bb21
Author: 梁灏 <admin@aresn.com>
Date:   Mon Nov 13 11:35:19 2017 +0800

    release 2.7.0

commit f2212c3
Author: 梁灏 <admin@aresn.com>
Date:   Mon Nov 13 10:07:45 2017 +0800

    publish 2.7.0-beta.1

commit 5bd0f52
Author: 梁灏 <admin@aresn.com>
Date:   Mon Nov 13 09:44:56 2017 +0800

    fixed

    iview#1090 iview#2387 iview#2379

commit d63a378
Author: 梁灏 <admin@aresn.com>
Date:   Mon Nov 13 09:27:54 2017 +0800

    fixed

    iview#1090 iview#2387 iview#379

commit a5dad1a
Author: 梁灏 <admin@aresn.com>
Date:   Mon Nov 13 09:14:03 2017 +0800

    fixed iview#1090 & close iview#2387 iview#2379

commit 6b2af1b
Merge: 593742a a2a18a4
Author: Aresn <admin@aresn.com>
Date:   Thu Nov 9 20:32:16 2017 -0600

    Merge pull request iview#2377 from btfrankenstein/2.0

    feat($input-number): add events 'on-focus', 'on-blur', 'on-enter' for…

commit a2a18a4
Author: Aresn <admin@aresn.com>
Date:   Thu Nov 9 20:31:47 2017 -0600

    Update input-number.vue

    remove `on-enter` because excessive and inflexible

commit c21a814
Author: btfrankenstein <btfrankenstein@gmail.com>
Date:   Thu Nov 9 17:56:33 2017 +0800

    feat($input-number): add events 'on-focus', 'on-blur', 'on-enter' for input-number component

commit 593742a
Author: 梁灏 <admin@aresn.com>
Date:   Thu Nov 9 17:06:49 2017 +0800

    update locale build file

commit b355578
Merge: 9d1add4 0c0d2c7
Author: Aresn <admin@aresn.com>
Date:   Thu Nov 9 00:47:25 2017 -0600

    Merge pull request iview#2354 from SergioCrisostomo/dry-exports

    reorganize and DRY components list

commit 9d1add4
Author: 梁灏 <admin@aresn.com>
Date:   Thu Nov 9 14:38:26 2017 +0800

    update Date example

commit 2df70eb
Merge: b91fd49 40aa935
Author: Aresn <admin@aresn.com>
Date:   Thu Nov 9 00:37:27 2017 -0600

    Merge pull request iview#2356 from SergioCrisostomo/fix-2122

    Patch Chromium bug

commit b91fd49
Merge: 4b33839 7f8d334
Author: Aresn <admin@aresn.com>
Date:   Thu Nov 9 00:18:47 2017 -0600

    Merge pull request iview#2368 from SergioCrisostomo/fix-datepicker-test

    fix date picker callback test

commit 7f8d334
Author: Sergio Crisostomo <sergiosbox@gmail.com>
Date:   Thu Nov 9 05:58:25 2017 +0100

    fix date picker callback test

commit 0c0d2c7
Author: Sergio Crisostomo <sergiosbox@gmail.com>
Date:   Thu Nov 9 05:50:30 2017 +0100

    reorganize and DRY components list

commit 4b33839
Author: 梁灏 <admin@aresn.com>
Date:   Thu Nov 9 11:11:54 2017 +0800

    update Select example

commit 67a9c1c
Author: 梁灏 <admin@aresn.com>
Date:   Thu Nov 9 09:48:56 2017 +0800

    update Tabs

commit bff9081
Merge: 4ab1ac5 5fbe80f
Author: Aresn <admin@aresn.com>
Date:   Wed Nov 8 19:19:51 2017 -0600

    Merge pull request iview#2351 from SergioCrisostomo/i18n

    use dist's locale

commit 4ab1ac5
Merge: 37fe6bb 236e0bf
Author: Aresn <admin@aresn.com>
Date:   Wed Nov 8 19:17:32 2017 -0600

    Merge pull request iview#2358 from SergioCrisostomo/ie-fix-2330

    Don't use includes to make IE happy and avoid Polyfill

commit 37fe6bb
Merge: 22c27b7 b1d124f
Author: Aresn <admin@aresn.com>
Date:   Wed Nov 8 19:15:00 2017 -0600

    Merge pull request iview#2361 from SergioCrisostomo/fix-2215

    add test for iview#2215

commit b1d124f
Author: Sergio Crisostomo <sergiosbox@gmail.com>
Date:   Wed Nov 8 16:07:23 2017 +0100

    add test for iview#2215

commit 22c27b7
Author: 梁灏 <admin@aresn.com>
Date:   Wed Nov 8 20:44:35 2017 +0800

    fixed iview#2215

commit 236e0bf
Author: Sergio Crisostomo <sergiosbox@gmail.com>
Date:   Wed Nov 8 10:14:08 2017 +0100

    DOn't use includes to make IE happy and avoid Polyfill

commit 5fbe80f
Author: Sergio Crisostomo <sergiosbox@gmail.com>
Date:   Wed Nov 8 09:59:45 2017 +0100

    use dist's locale

commit 40aa935
Author: Sergio Crisostomo <sergiosbox@gmail.com>
Date:   Wed Nov 8 09:54:14 2017 +0100

    patch chromium bug

commit b142865
Author: 梁灏 <admin@aresn.com>
Date:   Wed Nov 8 16:11:04 2017 +0800

    fixed iview#2102

commit 55f90d8
Author: 梁灏 <admin@aresn.com>
Date:   Wed Nov 8 14:39:39 2017 +0800

    fixed iview#1648

commit 6319935
Merge: cd92d87 297d1f1
Author: Aresn <admin@aresn.com>
Date:   Tue Nov 7 20:14:16 2017 -0600

    Merge pull request iview#2341 from f3man/2.0

    add uk_UA locale

commit cd92d87
Author: 梁灏 <admin@aresn.com>
Date:   Tue Nov 7 18:09:01 2017 +0800

    fixed iview#1482

commit 9f5a643
Author: 梁灏 <admin@aresn.com>
Date:   Tue Nov 7 17:54:36 2017 +0800

    fixed iview#2019

commit 84a4a95
Author: 梁灏 <admin@aresn.com>
Date:   Tue Nov 7 17:36:26 2017 +0800

    fixed iview#1926

commit 05265be
Author: 梁灏 <admin@aresn.com>
Date:   Tue Nov 7 17:28:20 2017 +0800

    fixed iview#2214

commit 6d2b7bc
Author: 梁灏 <admin@aresn.com>
Date:   Tue Nov 7 17:07:03 2017 +0800

    fixed iview#1575

commit 8869b70
Author: 梁灏 <admin@aresn.com>
Date:   Tue Nov 7 16:59:20 2017 +0800

    update

commit c7e432f
Author: 梁灏 <admin@aresn.com>
Date:   Tue Nov 7 16:43:23 2017 +0800

    update export & i18n

commit 297d1f1
Author: f3man <stepan7box@gmail.com>
Date:   Tue Nov 7 10:19:12 2017 +0200

    add uk_UA locale

    added ukranian language

commit 32e8393
Merge: bceb3c5 c17c5ad
Author: Aresn <admin@aresn.com>
Date:   Mon Nov 6 19:11:37 2017 -0600

    Merge pull request iview#2324 from SergioCrisostomo/auto-complete

    normalize autocomplete and spellcheck

commit bceb3c5
Merge: 427dd34 b9c1fe7
Author: Aresn <admin@aresn.com>
Date:   Mon Nov 6 19:02:53 2017 -0600

    Merge pull request iview#2322 from SergioCrisostomo/export-locales

    export locale objects

commit c17c5ad
Author: Sergio Crisostomo <sergiosbox@gmail.com>
Date:   Sat Nov 4 16:37:29 2017 +0100

    normalize autocomplete and spellcheck

commit b9c1fe7
Author: Sergio Crisostomo <sergiosbox@gmail.com>
Date:   Sat Nov 4 15:21:26 2017 +0100

    export locale objects

commit 427dd34
Author: 梁灏 <admin@aresn.com>
Date:   Thu Nov 2 18:23:10 2017 +0800

    update issue guide

commit 0819648
Merge: 470930e d1f698c
Author: Aresn <admin@aresn.com>
Date:   Wed Nov 1 04:03:17 2017 -0500

    Merge pull request iview#2274 from yangdan8/patch-2

    Modal弹窗请添加on-visible-change给外部api访问

commit d1f698c
Author: yangdan8 <13532023084@139.com>
Date:   Wed Nov 1 15:12:12 2017 +0800

    Modal弹窗请添加on-visible-change给外部api访问

    Modal弹窗请添加on-visible-change给外部api访问

commit 470930e
Author: 梁灏 <admin@aresn.com>
Date:   Tue Oct 31 14:15:00 2017 +0800

    update issue template

commit d44e817
Author: 梁灏 <admin@aresn.com>
Date:   Tue Oct 31 10:33:50 2017 +0800

    update Readme

commit 1a1f7c3
Merge: 75fa706 915e06d
Author: 梁灏 <admin@aresn.com>
Date:   Mon Oct 30 16:09:25 2017 +0800

    Merge branch '2.0' of https://github.com/iview/iview into 2.0

commit 75fa706
Author: 梁灏 <admin@aresn.com>
Date:   Mon Oct 30 16:01:18 2017 +0800

    update tabs demo

commit 915e06d
Merge: 1231c1a 3be0aa1
Author: Aresn <admin@aresn.com>
Date:   Mon Oct 30 03:01:06 2017 -0500

    Merge pull request iview#2230 from cheng-kang/2.0

    fix issue iview#1846

commit 1231c1a
Merge: 5a83c4a 0c0683e
Author: Aresn <admin@aresn.com>
Date:   Mon Oct 30 02:46:05 2017 -0500

    Merge pull request iview#2018 from Baoyx007/patch-1

    feat(form) : support promise for validate method iview#1857

commit 3be0aa1
Author: Kang Cheng <me@chengkang.pw>
Date:   Mon Oct 30 00:33:31 2017 -0700

    Import custom MutationObserver; remove mutation observer before component get destroyed

commit 5a83c4a
Merge: 7a9f6b2 b30250a
Author: Aresn <admin@aresn.com>
Date:   Mon Oct 30 01:40:31 2017 -0500

    Merge pull request iview#2223 from chavyleung/2.0

    fixed: iview#2219 & ColorPicker icon position

commit 7988575
Author: Kang Cheng <me@chengkang.pw>
Date:   Sun Oct 29 15:39:45 2017 -0700

    fix issue iview#1846

commit b30250a
Author: Chavy <chavyleung@163.com>
Date:   Sat Oct 28 11:57:38 2017 +0800

    fixed: iview#2219 & ColorPicker icon position

commit 7a9f6b2
Merge: 7d25930 a892ba6
Author: Aresn <admin@aresn.com>
Date:   Fri Oct 27 02:22:16 2017 -0500

    Merge pull request iview#2213 from SergioCrisostomo/fix-number-input

    prevent firing change when typing numbers < min

commit a892ba6
Author: Sergio Crisostomo <sergiosbox@gmail.com>
Date:   Fri Oct 27 08:40:11 2017 +0200

    prevent firing change when typing numbers < min

commit 7d25930
Author: 梁灏 <admin@aresn.com>
Date:   Thu Oct 26 14:47:54 2017 +0800

    release 2.6.0

commit f673ca4
Author: 梁灏 <admin@aresn.com>
Date:   Thu Oct 26 14:18:07 2017 +0800

    publish 2.6.0 beta

commit 86cdfb8
Merge: 252717e 19ad5f4
Author: Aresn <admin@aresn.com>
Date:   Thu Oct 26 00:14:52 2017 -0500

    Merge pull request iview#2194 from SergioCrisostomo/add-scroll-distance-to-edge

    add distance-to-edge property

commit 19ad5f4
Author: Aresn <admin@aresn.com>
Date:   Thu Oct 26 00:14:36 2017 -0500

    Update scroll.vue

commit 252717e
Merge: 9147e63 dfae43a
Author: Aresn <admin@aresn.com>
Date:   Thu Oct 26 00:13:02 2017 -0500

    Merge pull request iview#2193 from SergioCrisostomo/fix-2191

    correct input value in filterable mode

commit 9147e63
Merge: 51939f8 cbdac01
Author: Aresn <admin@aresn.com>
Date:   Thu Oct 26 00:10:44 2017 -0500

    Merge pull request iview#2195 from yangdan8/patch-4

    Update table.vue  解决tabs切换时,tab中的table调试时控制台报$el undefined的问题

commit cbdac01
Author: Aresn <admin@aresn.com>
Date:   Thu Oct 26 00:09:42 2017 -0500

    Update table.vue

commit 51939f8
Author: 梁灏 <admin@aresn.com>
Date:   Thu Oct 26 12:55:18 2017 +0800

    update Select tag

commit 2079c47
Author: 梁灏 <admin@aresn.com>
Date:   Thu Oct 26 11:57:24 2017 +0800

    update Tag

commit 2993f4e
Author: 梁灏 <admin@aresn.com>
Date:   Thu Oct 26 11:26:05 2017 +0800

    update Tab

commit f6a787f
Author: yangdan8 <13532023084@139.com>
Date:   Thu Oct 26 09:48:47 2017 +0800

    Update table.vue

commit 72ba666
Author: Sergio Crisostomo <sergiosbox@gmail.com>
Date:   Wed Oct 25 21:21:35 2017 +0200

    add distance-to-edge property

commit dfae43a
Author: Sergio Crisostomo <sergiosbox@gmail.com>
Date:   Wed Oct 25 20:49:38 2017 +0200

    correct input value in filterable mode

commit af7d72b
Author: 梁灏 <admin@aresn.com>
Date:   Wed Oct 25 22:34:58 2017 +0800

    update Tree selected

commit 6ff0e34
Author: 梁灏 <admin@aresn.com>
Date:   Wed Oct 25 21:10:29 2017 +0800

    update Tree Render function

commit 97098fc
Author: 梁灏 <admin@aresn.com>
Date:   Wed Oct 25 19:12:14 2017 +0800

    update Tree example

commit b64204f
Author: 梁灏 <admin@aresn.com>
Date:   Wed Oct 25 17:41:37 2017 +0800

    update Tree demo

commit 174836c
Author: 梁灏 <admin@aresn.com>
Date:   Wed Oct 25 16:45:42 2017 +0800

    update Tree Render function use

commit 3ea2461
Author: 梁灏 <admin@aresn.com>
Date:   Wed Oct 25 14:33:22 2017 +0800

    update checkbox style

commit 69460a5
Merge: 8711920 610fd3a
Author: Aresn <admin@aresn.com>
Date:   Tue Oct 24 21:44:41 2017 -0500

    Merge pull request iview#2181 from lisafra/update-carousel

    Update carousel component: add loop and radiusDot property

commit 610fd3a
Author: houyl <houyl@okooo.net>
Date:   Wed Oct 25 09:30:46 2017 +0800

    [fix bug]  carousel component: remove no use code

commit 8711920
Merge: 2be2b97 692be62
Author: Aresn <admin@aresn.com>
Date:   Tue Oct 24 19:14:01 2017 -0500

    Merge pull request iview#2185 from md678685/patch-1

    Fix some English grammar in README

commit 692be62
Author: md678685 <mathew678@hotmail.co.uk>
Date:   Tue Oct 24 21:06:04 2017 +0100

    Fix some English grammar in README

    This PR changes some of the English sentences in the `README.md` to sound more natural. I have tried to keep the structure as close as possible to the original. If anything sounds confusing, please reply below.

    这个PR改变了`README.md`中的一些英文句子,使其听起来更自然。 我试图保持结构尽可能接近原来。 如有任何疑问,请在下面回覆。

commit 2be2b97
Merge: b31aab7 da76a83
Author: Aresn <admin@aresn.com>
Date:   Tue Oct 24 07:46:14 2017 -0500

    Merge pull request iview#2184 from SergioCrisostomo/fix-tree-examples

    fix dom rendering when adding new nodes in example

commit da76a83
Author: Sergio Crisostomo <sergiosbox@gmail.com>
Date:   Tue Oct 24 14:08:52 2017 +0200

    fix dom rendering problems

commit b31aab7
Author: 梁灏 <admin@aresn.com>
Date:   Tue Oct 24 18:14:22 2017 +0800

    Tree add async loading

commit 76a4781
Author: 梁灏 <admin@aresn.com>
Date:   Tue Oct 24 16:48:28 2017 +0800

    fixed iview#2128

commit ccf544d
Author: houyl <houyl@okooo.net>
Date:   Tue Oct 24 16:47:12 2017 +0800

    Merge branch 'master' of https://github.com/iview/iview into 2.0
    Update carousel component: add loop and radiusDot property
    # Conflicts:
    #	package.json
    #	src/components/date-picker/picker.vue
    #	src/components/select/select.vue

commit 9b24f1a
Author: 梁灏 <admin@aresn.com>
Date:   Tue Oct 24 16:20:09 2017 +0800

    Tree add Render function

    fixed iview#2133
    fixed iview#1784
    fixed iview#1333
    fixed iview#1362

commit ecf6c2f
Author: 梁灏 <admin@aresn.com>
Date:   Tue Oct 24 15:47:07 2017 +0800

    update dependence

commit c89e0e1
Merge: 7053de4 0a8f9b4
Author: Aresn <admin@aresn.com>
Date:   Tue Oct 24 02:44:19 2017 -0500

    Merge pull request iview#2090 from SergioCrisostomo/refactor-tree

    Refactor tree

commit 0a8f9b4
Author: Sergio Crisostomo <sergiosbox@gmail.com>
Date:   Tue Oct 24 09:30:09 2017 +0200

    Keep original data pointers and correct if clause

commit d44420b
Author: Sergio Crisostomo <sergiosbox@gmail.com>
Date:   Sat Oct 14 09:49:13 2017 +0200

    refactor and make indeterminate accessible outside tree

commit 94d177c
Author: Sergio Crisostomo <sergiosbox@gmail.com>
Date:   Sat Oct 14 09:47:33 2017 +0200

    add width to expand icon so we can click on it easier

commit 7053de4
Author: 梁灏 <admin@aresn.com>
Date:   Tue Oct 24 09:52:42 2017 +0800

    update demo

commit c61015d
Merge: a5f4a1d 65255c9
Author: Aresn <admin@aresn.com>
Date:   Mon Oct 23 20:22:51 2017 -0500

    Merge pull request iview#2172 from SergioCrisostomo/fix-2164

    format string dates in daterange also

commit a5f4a1d
Author: 梁灏 <admin@aresn.com>
Date:   Mon Oct 23 23:08:40 2017 +0800

    fixed iview#1922

commit 65255c9
Author: Sergio Crisostomo <sergiosbox@gmail.com>
Date:   Mon Oct 23 15:53:12 2017 +0200

    fix date formatting when strings are supplied to DatePicker

commit 6c634aa
Author: 梁灏 <admin@aresn.com>
Date:   Mon Oct 23 19:01:47 2017 +0800

    fixed iview#2078

commit c2d74ec
Author: 梁灏 <admin@aresn.com>
Date:   Mon Oct 23 18:26:42 2017 +0800

    fixed iview#2100

commit b92a1b5
Merge: 6261a49 3ed12b4
Author: Aresn <admin@aresn.com>
Date:   Mon Oct 23 04:22:44 2017 -0500

    Merge pull request iview#2170 from SergioCrisostomo/use-locale-formated-year-month

    Correct month calculation and add specs for date-picker labels

commit 6261a49
Merge: a1553a9 7afb406
Author: Aresn <admin@aresn.com>
Date:   Mon Oct 23 04:19:11 2017 -0500

    Merge pull request iview#2171 from iview/pr/2124

    update Tag style for check

commit a1553a9
Merge: 5064c7b fd79f10
Author: Aresn <admin@aresn.com>
Date:   Mon Oct 23 04:17:50 2017 -0500

    Merge pull request iview#2124 from daiyanze/feature/checkable_tag

    Feature/checkable tag (追加功能:可选标签)

commit 7afb406
Author: 梁灏 <admin@aresn.com>
Date:   Mon Oct 23 17:14:29 2017 +0800

    update Tag style for check

commit 3ed12b4
Author: Sergio Crisostomo <sergiosbox@gmail.com>
Date:   Mon Oct 23 11:13:06 2017 +0200

    Correct month calculation and add specs for date-picker labels

commit fd79f10
Author: Aresn <admin@aresn.com>
Date:   Mon Oct 23 03:57:05 2017 -0500

    Update tag.vue

commit 5064c7b
Author: 梁灏 <admin@aresn.com>
Date:   Mon Oct 23 16:52:30 2017 +0800

    update ja-JP

commit 4c6d996
Author: Aresn <admin@aresn.com>
Date:   Mon Oct 23 03:40:39 2017 -0500

    Update tag.vue

commit b75ad4a
Author: 梁灏 <admin@aresn.com>
Date:   Mon Oct 23 14:12:02 2017 +0800

    fixed iview#1700

commit 6ed0cd7
Author: 梁灏 <admin@aresn.com>
Date:   Mon Oct 23 11:55:35 2017 +0800

    update Tree demo

commit 0e31618
Author: 梁灏 <admin@aresn.com>
Date:   Mon Oct 23 11:00:20 2017 +0800

    update demo

commit ba1422c
Author: 梁灏 <admin@aresn.com>
Date:   Mon Oct 23 09:52:56 2017 +0800

    update zh-TW

commit f672ae0
Merge: 0f65109 2537c26
Author: Aresn <admin@aresn.com>
Date:   Sun Oct 22 20:29:51 2017 -0500

    Merge pull request iview#2097 from SergioCrisostomo/use-locale-formated-year-month

    use date.toLocaleDateString to format year/month

commit 0f65109
Author: 梁灏 <admin@aresn.com>
Date:   Mon Oct 23 09:26:41 2017 +0800

    update

commit a730a84
Author: 梁灏 <admin@aresn.com>
Date:   Fri Oct 20 17:44:58 2017 +0800

    update Tabs

commit ec1a5e2
Merge: 758bd76 be3fbd2
Author: Aresn <admin@aresn.com>
Date:   Fri Oct 20 04:38:28 2017 -0500

    Merge pull request iview#2156 from marxy/tabs-scroll

    Tabs add scroll

commit 758bd76
Merge: 45103ca e15746f
Author: 梁灏 <admin@aresn.com>
Date:   Fri Oct 20 16:56:33 2017 +0800

    Merge branch '2.0' of https://github.com/iview/iview into 2.0

commit 45103ca
Author: 梁灏 <admin@aresn.com>
Date:   Fri Oct 20 16:53:59 2017 +0800

    fixed iview#2066

commit be3fbd2
Author: marxy <334905044@qq.com>
Date:   Fri Oct 20 16:30:44 2017 +0800

    Tabs add scroll

commit e15746f
Author: Aresn <admin@aresn.com>
Date:   Fri Oct 20 03:18:08 2017 -0500

    update dependence

commit 485a903
Author: 梁灏 <admin@aresn.com>
Date:   Fri Oct 20 15:36:43 2017 +0800

    fixed iview#2149

commit cbe5ccf
Merge: 11baa9a 437b805
Author: Aresn <admin@aresn.com>
Date:   Thu Oct 19 22:47:33 2017 -0500

    Merge pull request iview#2114 from SergioCrisostomo/improve-csv

    Improve export to CSV functionality

commit 11baa9a
Merge: 2e8add2 a3336b3
Author: Aresn <admin@aresn.com>
Date:   Thu Oct 19 05:45:31 2017 -0500

    Merge pull request iview#2136 from SergioCrisostomo/fix-scroll-event

    add missing event in callback

commit a3336b3
Author: Sergio Crisostomo <sergiosbox@gmail.com>
Date:   Thu Oct 19 10:41:19 2017 +0200

    add missing event in callback

commit 62bf2b3
Author: daiyanze <ginoalex8964@yahoo.com>
Date:   Wed Oct 18 17:21:52 2017 +0900

    Modify: example of tags

commit dc39cc3
Author: daiyanze <ginoalex8964@yahoo.com>
Date:   Wed Oct 18 17:13:06 2017 +0900

    Feature: Checkable tag

commit 2e8add2
Author: 梁灏 <admin@aresn.com>
Date:   Wed Oct 18 08:58:16 2017 +0800

    release 2.5.1

commit 95dfbe1
Merge: 3c6d8ea 5d1c24c
Author: Aresn <admin@aresn.com>
Date:   Tue Oct 17 19:52:02 2017 -0500

    Merge pull request iview#2120 from SergioCrisostomo/fix-2119

    correct behaviour when initialising date-picker with a empty string

commit 5d1c24c
Author: Sergio Crisostomo <sergiosbox@gmail.com>
Date:   Tue Oct 17 15:13:42 2017 +0200

    correct behaviour when initialising date-picker with a empty string

commit 2537c26
Author: Sergio Crisostomo <sergiosbox@gmail.com>
Date:   Tue Oct 17 14:26:12 2017 +0200

    add dateLabel to time panel

commit b27858d
Author: Sergio Crisostomo <sergiosbox@gmail.com>
Date:   Tue Oct 17 13:09:04 2017 +0200

    add date panel label format logic

commit 3d50db5
Author: Sergio Crisostomo <sergiosbox@gmail.com>
Date:   Tue Oct 17 12:25:36 2017 +0200

    add datePanelLabel format in locale files

commit 437b805
Author: Sergio Crisostomo <sergiosbox@gmail.com>
Date:   Tue Oct 17 10:14:10 2017 +0200

    Added Table to CSV example and tests

commit fb84799
Author: Sergio Crisostomo <sergiosbox@gmail.com>
Date:   Tue Oct 17 10:13:54 2017 +0200

    Improve export to CSV functionality

     - added`callback`option so we can get CSV data in case we do not want
    to download
     - added options:
        - `quoted` for cases when we have line breaks in content
        - `separator` for cases when we have commas in content

commit 3c6d8ea
Author: 梁灏 <admin@aresn.com>
Date:   Tue Oct 17 16:09:11 2017 +0800

    release 2.5.0

commit 61d1637
Author: 梁灏 <admin@aresn.com>
Date:   Mon Oct 16 20:45:46 2017 +0800

    publish 2.5.0-beta.2

commit 78b46fa
Author: 梁灏 <admin@aresn.com>
Date:   Mon Oct 16 20:41:13 2017 +0800

    Scroll add local loading-text

commit 109465d
Author: 梁灏 <admin@aresn.com>
Date:   Mon Oct 16 20:10:21 2017 +0800

    optimize  Scroll scroll behavior

commit 6850c1d
Author: 梁灏 <admin@aresn.com>
Date:   Mon Oct 16 18:32:47 2017 +0800

    Scroll add `height` prop

commit 7462478
Author: 梁灏 <admin@aresn.com>
Date:   Mon Oct 16 16:05:06 2017 +0800

    publish 2.5.0-beta.1

commit 8c2e53e
Merge: f180098 af6a7c4
Author: Aresn <admin@aresn.com>
Date:   Mon Oct 16 02:54:57 2017 -0500

    Merge pull request iview#2069 from dspangenberg/2.0

    DatePicker: weekStartDay did not influence the order of the weekdays in the header

commit af6a7c4
Author: Danny Spangenberg <danny.spangenberg@twiceware.de>
Date:   Wed Oct 11 17:38:03 2017 +0200

    weekStartDay did not influence the order of the weekdays in the header

commit 0c0683e
Author: Haven <baoyx007@gmail.com>
Date:   Thu Sep 28 00:40:16 2017 -0500

    feat(form) : support promise for validate method iview#1857
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

10 participants