# Conflicts:
#	CHANGELOG.en-US.md
#	CHANGELOG.zh-CN.md
#	examples/app.vue
#	examples/docs/en-US/switch.md
#	examples/docs/zh-CN/switch.md
#	examples/versions.json
#	package.json
#	packages/switch/src/component.vue
#	packages/theme-default/package.json
#	packages/theme-default/src/common/var.css
#	packages/theme-default/src/switch.css
#	src/index.js

* Changelog: update for 2.0.0-alpha.3

* fix test

* Table: Add `important` rule to `col-resize` cursor

* Table: Add `important` rule to `col-resize` cursor

* Update table-header.js

* [Switch]: Add `allowFocus` prop + blur/focus events

+ Add new `allowFocus` prop
+ Add event emitters for focus & blur events
+ Set `input` $ref `.focus()` on switch click event

* [Switch]: Add styling for when `allowFocus: true`

+ Add styling for when `allowFocus` prop is set to true.
+ Add styling for when input is focused

* [Switch]: Update docs

* update el-input change event

* upgrade to vue 2.5.0

* upgrade webpack to 3.7

* upgrade vue to 2.5.2

* minor style updates

* 	add accessibility for message & message-box & tabs

* Update message-box.md

修复 autocomplete 组件 IE11 下使用搜狗输入法，无法输入中文的问题

* Carbon: menu support open close submenu manually

* Update menu.md

* Update menu.md

* Carbon: upload limit & input append & form validate promise

* Update upload.md

* Update upload.md

* Update index.js

* Input: align change event with native ones

* test: update input:change event test

* date-time-picker: fix cancel button

* test: add date-time-picker tests

* Revert "Picker only emit user change (#6214)"

This reverts commit 1912c473.

* picker/util: add helper methods

range: n => Array
modify{Date, Time}: Date => Date
clear{Time, Milliseconds}: Date => Date
limitTimeRange: Date => Date
timeWithinRange: Date, [Date] => Boolean

* time-spinner: refactory

* time-panel: refactory

* picker refactory

* date-panel, *-table: refactory

* time-select: refactory

* test: update time-picker

* test: update date-picker

* time-range: refactory

* date-range: refactory

* test: update time-select

* test: update form date-picker/time-picker

* docs: update date-picker

* Table: Add `important` rule to `col-resize` cursor

* Table: Add `important` rule to `col-resize` cursor

* Update table-header.js

* minor updates & fixes

* Changelog: update for 2.0.0-alpha.1

* update zh installation doc

* update demo block scroll