resolving conflicts

CHANGELOG.en-US.md

@@ -1,6 +1,116 @@
 ## Changelog
 
-## 2.9.1
+### 2.10.1
+
+#### Bug fixes
+
+- Table
+  - Fix sort icon (#15439 by @bezany)
+  - Fix layout breaks when append slot exists (#16332 by @ziyoung)
+  - Fix showOverflowTooltip not reactive (#16295 by @a631807682)
+  - Register scrollbar in filter-panel (#16246 by @ziyoung)
+- Chore
+  - Fix 2.9 docs (#16233 by @ziyoung)
+  - Fix index page theme intro english css style issue (#16254 by @iamkun)
+
+#### Optimization
+
+- Tag
+  - Compatible with IE (#16334 by @ziyoung)
+- Chore
+  - Update Dingtalk Group QR image (#16236 by @iamkun)
+- Doc
+  - Update online theme roller doc (#16244 by @iamkun)
+
+### 2.10.0
+
+*2019-06-25*
+
+#### New features
+
+- I18n
+  - Added Uzbek language (#15796 by @ogabek96)
+- Calendar
+  - Add first-day-of-week attribute (#16047 by @ziyoung)
+- Avatar
+  - Add avatar component (#16144 by @luckyCao)
+- Upload:
+  - Add capability to customize thumbnail template (#13192 by @victorzhuk)
+
+#### Bug fixes
+
+- Tree
+  - Not highlight tree node when currentKey is null (#15668 by @yyjjqq94)
+  - Fix issue #15538 caused by two Tree sharing the same data (#15615 by @VanMess)
+- Upload
+  - Update the parameter `fileList` type (#15716 by @underfin)
+- Table
+  - Fix loading icon not display (#15868 by @ziyoung)
+  - Fix background color of complex table when hovering (#15504 by @cnlon)
+  - Fix current-row-key and select event bug (#15983 by @ziyoung)
+  - Height accepts more units (#16013 by @ziyoung)
+  - Fix reserve-selection not work (#16135 by @ziyoung)
+- Docs
+  - Fix Divider attribute type in zh-cn (#15889 by @haoranyu)
+- Menu
+  - Fixed submenu hidden bug after adding popper-append-to-body (#15391 by @PanJiaChen)
+- Select
+  - Fix initialInputHeight (#15989 by @yyjjqq94)
+  - Fix default-first-option behavior when typing Chinese (#15431 by @VanMess)
+  - fix double import problem (#16215 by @lengband)
+- Message
+  - Add type def for offset option (#16027 by @matjaz)
+- Timeline
+  - Fix reverse broken (#16091 by @ziyoung)
+- Slider
+  - Fix #15545 by adding explains about "input" event in Chinese (#15588 by @VanMess)
+- InfiniteScroll
+  - Update package name (#16125 by @iamkun)
+- MessageBox
+  - Fix  distinguishCancelAndClose action not same as docs bug (#15438 by @qingdengyue)
+- PopupManager
+  - Fix z-index cannot be rewritten at first using (#15738 by @luckyCao)
+- Docs
+  - Delete an incorrect closing html tag and empty block code (#16194 by @Alexeykhr)
+- Chore
+  - Update test api host (#15807 by @iamkun)
+
+#### Optimization
+
+- Tree
+  - Modify loop conditions to improve performance (#15699 by @KingJeason)
+- Theme
+  - Refine GA track & Update footer link forward to online theme roller (#16007 by @island205)
+- Badge
+  - Update badge prop check (#16198 by @iamkun)
+- Avatar
+  - Update theme config var (#16202 by @luckyCao)
+- I18n
+  - Update pt-br.js (#15776 by @gigioSouza)
+  - Update Farsi translation (#15881 by @pamenary)
+- Docs
+  - Add missing components in quickstart (#16063 by @pape2016)
+  - Update french translation (#16208 by @blombard)
+  - Add description $slots.default (#15444 by @Alexeykhr)
+  - Update Spanish Doc 2.9.1 (#15840 by @Gonzalo2310)
+  - Fix spelling mistakes in fr (#15837 by @blombard)
+  - Update changelog 2.9.2 Spanish (#16185 by @Gonzalo2310)
+
+#### Breaking changes
+
+- Form
+  - Remove success status (#16159 by @ziyoung)
+
+### 2.9.2
+
+*2019-06-21*
+
+#### Bug fixes
+
+- Chore
+  - Fix TS definitions file (#15805 by @NateScarlet)
+
+### 2.9.1
 
 *2019-05-30*
 
@@ -32,7 +142,7 @@
 - PageHeader
   - Add PageHeader component (#15714 by @ziyoung)
 - InfiniteScroll
-  - Add InfiniteScroll directive (#15567 by @iamkun) 
+  - Add InfiniteScroll directive (#15567 by @iamkun)
 - Cascader
   - Add multiple mode and filter-method (#15611 by @SimonaliaChen)
 - Message
@@ -46,7 +156,7 @@
 - Image
   - Add support for transmit attrs and listeners (#15578 by @VanMess)
 - Theme
-  - Add popup background (#15412 by @iamkun)  
+  - Add popup background (#15412 by @iamkun)
 - Chore
   - Update new 2.9.0 index page (#15682 by @iamkun)
 
@@ -57,7 +167,7 @@
 - Image
   - Fix ssr and object-fit compatibility (#15346 by @SimonaliaChen)
 - Input
-  - Fix show-word-count style in el-form (#15359 by @lvjiaxuan) 
+  - Fix show-word-count style in el-form (#15359 by @lvjiaxuan)
   - Fix clear icon is not centered (#15354 by @YiiGuxing)
 - Calendar
   - Fix not correct day of week when the day is Sunday (#15399 by @qingdengyue)
@@ -73,7 +183,7 @@
   - Fix custom tabindex not work (#15619 by @SimonaliaChen )
 - Link
   - Fix link icon style class (#15752 by @iamkun)
-- Select  
+- Select
   - Revert set value to null when cleared (#15447 by @iamkun)
 - Loading
   - Fix dom not change when loading state change quickly (#15123 by @FAKER-A)
@@ -102,7 +212,7 @@
   - Rename variable in docs (#15185 by @liupl)
   - Fix image attribute type and default value (#15423 by @haoranyu)
   - Fix form doc bug (#15228 by @SHERlocked93)
- 
+
 ### 2.8.2
 
 *2019-04-25*
@@ -177,7 +287,7 @@
   - Fix label style (#14969 by @ziyoung)
   - Required FormItem displays asterisk when label is auto (#15144 by @ziyoung)
 - Pagination
-  -  Fix slot not updated (#14711 by @lucyhao)
+  - Fix slot not updated (#14711 by @lucyhao)
 - Table
   - Fix load bug in lazy mode (#15101 by @ziyoung)
   - Fix cell width when colspan is grater than 1 (#15196 by @ziyoung)
@@ -245,7 +355,7 @@ Docs
 
 - Form
   - Fix auto `label-width` style (#14955 by @ziyoung)
-  
+
 #### Optimization
 - Docs
   - Fix doc img link error (#14957 by @iamkun)
@@ -268,7 +378,7 @@ Docs
   - Background color can be configured (#14939 by @ziyoung)
 - Form
   - `label-width` supports auto width (#14944 by @ziyoung)
-  
+
 #### Optimization
 - Docs
   - Update Spanish docs (#14913 by @Gonzalo2310)
@@ -413,7 +523,7 @@ Docs
   - Optimize code (by @KAionro in #14413)
 - Docs
   - Add more detail about how to run play mode for contribution (by @island205 in #14355)
-  - Warn input as a controlled component. (by @wacky6 in #14463)
+  - Warn input as a controlled component (by @wacky6 in #14463)
   - Update Table doc (by @luguokong in #14329)
   - Update input doc (by @iamkun in #14437)
   - Update custom-theme docs (by @wangguohao in #14297)
@@ -440,7 +550,7 @@ Docs
 - Tree
   - Empty-text tips are different from tables (by @ColinCll in #14331)
 - Docs
-  - Fix  DatetimePicker format doc error (by @iamkun in #14290)
+  - Fix DatetimePicker format doc error (by @iamkun in #14290)
   - Spelling issue in datepicker documentation (by @helmut in #14481)
   - Fix pagination doc style (by @liuchuzhang in #14451)
 
@@ -484,7 +594,7 @@ Docs
 - Build:
   - Delete unremoved comments in umd module `lib/index.js` (by @island205 in #14233)
   - Fix export error fired in commonjs module used in nuxt.js (by @island205 in #14232)
-  - Fix 2.5.1 build issues  (by @iamkun in #14228)
+  - Fix 2.5.1 build issues (by @iamkun in #14228)
 
 ### 2.5.1
 
@@ -515,7 +625,7 @@ Docs
 #### Optimization
 - Upgrade to webpack@4 (by @jikkai in #14173)
 - Input
-  - Simplify implementation, follow one-way data flow. Fix several related bugs. (by @wacky6 in #13471)
+  - Simplify implementation, follow one-way data flow. Fix several related bugs (by @wacky6 in #13471)
 - Update Axure file，add new components (by @ziyoung in #13773)
 
 #### Bug fixes
@@ -609,7 +719,7 @@ Docs
 
 *2018-10-26*
 
-- The parameter of Form's  `clearValidate`  supports string, #12990 (by @codinglobster)
+- The parameter of Form's `clearValidate` supports string, #12990 (by @codinglobster)
 - Added type attribute for Badge, #12991
 - Users can use scoped-slot to customize table column header #13012 (by @ivanseidel)
 - Fixed the input box of Select unable to type text under IE, #13034 (by @GaliMU)