tanjinzhou
							
						 | 
						
							
							
							
							
								
							
								d6bf99b279
								
							
								
							
						 | 
						
							
							
								
								test: update snap
							
							
							
							
							
						 | 
						
							2019-10-30 16:55:01 +08:00 | 
						
					
				
					
						
							
							
								 
								tangjinzhou
							
						 | 
						
							
							
							
							
								
							
								2349348de0
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' into feat-1.4.0
							
							
							
							
							
							
							
							# Conflicts:
#	components/button/__tests__/__snapshots__/demo.test.js.snap
#	components/button/buttonTypes.js
#	components/button/demo/basic.md
#	components/button/style/index.less
#	components/button/style/mixin.less
#	components/form/__tests__/__snapshots__/demo.test.js.snap
#	components/input/__tests__/__snapshots__/demo.test.js.snap
#	components/select/__tests__/__snapshots__/demo.test.js.snap
#	components/select/__tests__/__snapshots__/index.test.js.snap
#	components/tabs/__tests__/__snapshots__/demo.test.js.snap
#	components/vc-collapse/src/Collapse.jsx
#	package.json 
							
						 | 
						
							2019-08-25 22:09:55 +08:00 | 
						
					
				
					
						
							
							
								 
								tangjinzhou
							
						 | 
						
							
							
							
							
								
							
								259f16b145
								
							
								
							
						 | 
						
							
							
								
								fix: ie scrollerbar trigger blur event #999
							
							
							
							
							
						 | 
						
							2019-08-14 18:41:49 +08:00 | 
						
					
				
					
						
							
							
								 
								wangxueliang
							
						 | 
						
							
							
							
							
								
							
								f66fae47e3
								
							
								
							
						 | 
						
							
							
								
								feat: merge master
							
							
							
							
							
						 | 
						
							2019-08-08 19:02:54 +08:00 | 
						
					
				
					
						
							
							
								 
								tangjinzhou
							
						 | 
						
							
							
							
							
								
							
								55a59f207f
								
							
								
							
						 | 
						
							
							
								
								fix: ie scrollerbar trigger blur event #999
							
							
							
							
							
						 | 
						
							2019-07-30 19:51:49 +08:00 | 
						
					
				
					
						
							
							
								 
								tangjinzhou
							
						 | 
						
							
							
							
							
								
							
								ecf7c8b42c
								
							
								
							
						 | 
						
							
							
								
								fix: update icon focusable="false" #924
							
							
							
							
							
						 | 
						
							2019-07-07 21:27:16 +08:00 | 
						
					
				
					
						
							
							
								 
								wangxueliang
							
						 | 
						
							
							
							
							
								
							
								5d8d9248a3
								
							
								
							
						 | 
						
							
							
								
								test: update snapshots
							
							
							
							
							
						 | 
						
							2019-05-18 15:49:50 +08:00 | 
						
					
				
					
						
							
							
								 
								tangjinzhou
							
						 | 
						
							
							
							
							
								
							
								be12d2eee9
								
							
								
							
						 | 
						
							
							
								
								test: update snapshots
							
							
							
							
							
						 | 
						
							2019-02-16 22:46:47 +08:00 | 
						
					
				
					
						
							
							
								 
								tangjinzhou
							
						 | 
						
							
							
							
							
								
							
								ad0727898e
								
							
								
							
						 | 
						
							
							
								
								test: update snapshots
							
							
							
							
							
						 | 
						
							2019-01-05 16:24:52 +08:00 | 
						
					
				
					
						
							
							
								 
								tangjinzhou
							
						 | 
						
							
							
							
							
								
							
								4e0d5ce4b7
								
							
								
							
						 | 
						
							
							
								
								feat: update select
							
							
							
							
							
						 | 
						
							2018-12-11 11:40:27 +08:00 | 
						
					
				
					
						
							
							
								 
								tangjinzhou
							
						 | 
						
							
							
							
							
								
							
								0ce9d646a7
								
							
								
							
						 | 
						
							
							
								
								feat: update back-top badge breadcrumb button calendar card carousel cascader collapse
							
							
							
							
							
						 | 
						
							2018-11-28 21:58:42 +08:00 |