|  tangjinzhou | da0f17d1b6 | Merge remote-tracking branch 'origin/master' into feat-1.4.0 # Conflicts:
#	components/affix/index.jsx
#	components/alert/index.jsx
#	components/back-top/index.jsx
#	components/carousel/index.jsx
#	components/cascader/index.jsx
#	components/comment/index.jsx
#	components/config-provider/index.jsx
#	components/divider/index.jsx
#	components/drawer/index.jsx
#	components/form/Form.jsx
#	components/input-number/index.jsx
#	components/menu/index.jsx
#	components/modal/confirm.js
#	components/modal/index.js
#	components/popconfirm/index.jsx
#	components/popover/index.jsx
#	components/rate/index.jsx
#	components/steps/index.jsx
#	components/switch/index.jsx
#	components/time-picker/index.jsx
#	components/tree-select/index.jsx
#	site/components.js | 2019-08-28 22:36:44 +08:00 | 
				
					
						|  tanjinzhou | c9f1c26693 | chore: add base.vue  inconsistent vue version | 2019-08-28 10:50:19 +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 | c539568b76 | doc: update doc | 2019-08-25 20:58:10 +08:00 | 
				
					
						|  tanjinzhou | 85702bb98f | update site | 2019-08-23 17:58:46 +08:00 | 
				
					
						|  tanjinzhou | 8796c94315 | update site | 2019-08-22 18:29:50 +08:00 | 
				
					
						|  tanjinzhou | d232bf65f3 | doc: update doc | 2019-08-12 20:38:09 +08:00 | 
				
					
						|  wangxueliang | f66fae47e3 | feat: merge master | 2019-08-08 19:02:54 +08:00 | 
				
					
						|  tangjinzhou | 9d78a27030 | doc: update site image | 2019-08-05 22:03:48 +08:00 | 
				
					
						|  tanjinzhou | d60d549f04 | update site | 2019-08-05 16:53:48 +08:00 | 
				
					
						|  tangjinzhou | 6064b97367 | doc: add geektime ad | 2019-08-04 21:14:08 +08:00 | 
				
					
						|  wangxueliang | 9d3188a525 | fix: select drop-down option displays an exception for #970 | 2019-07-16 01:08:14 +08:00 | 
				
					
						|  tanjinzhou | 57a9eafcc6 | site update & icons update | 2019-07-04 18:28:27 +08:00 | 
				
					
						|  tangjinzhou | adbd82b910 | Merge branch 'master' into feat-1.4.0 # Conflicts:
#	components/table/interface.js
#	components/vc-upload/demo/simple.jsx | 2019-06-24 21:47:23 +08:00 | 
				
					
						|  tangjinzhou | d0cf9fd5cd | update site | 2019-06-18 22:05:23 +08:00 | 
				
					
						|  mingyan.yu | 14d4b7745d | feat: add statistic | 2019-05-25 17:18:04 +08:00 | 
				
					
						|  wangxueliang | 00f104757c | feat: merge master | 2019-05-25 16:36:25 +08:00 | 
				
					
						|  wangxueliang | 5b4d30ceae | docs: add docs and demo | 2019-05-18 15:44:54 +08:00 | 
				
					
						|  tangjinzhou | faa4c1c5d9 | docs: opt doc  #767 [update site] | 2019-05-14 22:16:44 +08:00 | 
				
					
						|  wangxueliang | 103293aa8f | feat: update modal | 2019-04-17 10:21:28 +08:00 | 
				
					
						|  tangjinzhou | 219982e927 | update site | 2019-04-10 21:58:12 +08:00 | 
				
					
						|  wangxueliang | 7d6678265e | feat: merge master | 2019-04-07 09:05:54 +08:00 | 
				
					
						|  tangjinzhou | 2b1039f6be | bump 1.3.8 | 2019-04-04 23:42:38 +08:00 | 
				
					
						|  tangjinzhou | 4c92b78b1f | update site | 2019-03-19 15:35:51 +08:00 | 
				
					
						|  tangjinzhou | 82081f1d82 | update site | 2019-03-18 17:27:45 +08:00 | 
				
					
						|  tangjinzhou | f671810c31 | update site | 2019-03-18 17:09:41 +08:00 | 
				
					
						|  tangjinzhou | 4ff2a10848 | style: prettier | 2019-03-15 22:56:22 +08:00 | 
				
					
						|  tangjinzhou | ccd5d64982 | update site add sponsor | 2019-03-11 13:07:29 +08:00 | 
				
					
						|  wangxueliang | 995db39fa5 | feat: add empty components && update locale-provider | 2019-03-07 13:26:03 +08:00 | 
				
					
						|  tangjinzhou | 04501dec3d | docs: udpate | 2019-02-23 18:53:02 +08:00 | 
				
					
						|  wangxueliang | a10711d9ae | feat: vc-upload to 2.6.2 | 2019-02-18 23:33:39 +08:00 | 
				
					
						|  tangjinzhou | e8f2613c68 | update site | 2019-02-16 21:20:12 +08:00 | 
				
					
						|  tangjinzhou | ccbb887e18 | docs: update hm | 2019-02-16 17:16:59 +08:00 | 
				
					
						|  tangjinzhou | 805d4e3295 | docs: update url path | 2019-02-16 16:51:21 +08:00 | 
				
					
						|  tangjinzhou | 86c069ce4e | docs: update new logo | 2019-02-16 14:32:46 +08:00 | 
				
					
						|  Owen Melbourne | 312691dd1f | Replace text-decoration-skip: ink to text-decoration-skip-ink: auto | 2019-02-12 19:55:40 +08:00 | 
				
					
						|  tangjinzhou | 8692336547 | update site | 2019-02-11 22:22:46 +08:00 | 
				
					
						|  tangjinzhou | 7ddc17b3bd | docs: add form vuex demo close #465 | 2019-02-11 22:22:15 +08:00 | 
				
					
						|  tangjinzhou | 55a8dca9e7 | style: update lint and format code | 2019-02-01 17:23:00 +08:00 | 
				
					
						|  tangjinzhou | 58794aaba9 | docs: update docs | 2019-01-26 16:04:32 +08:00 | 
				
					
						|  tangjinzhou | d0ae9ccaeb | docs: update icon doc | 2019-01-23 12:43:45 +08:00 | 
				
					
						|  tangjinzhou | cf444416cf | update site | 2019-01-19 17:54:15 +08:00 | 
				
					
						|  tangjinzhou | 19effd0885 | update site | 2019-01-18 10:18:57 +08:00 | 
				
					
						|  tangjinzhou | 99bf3044d6 | docs: update ad | 2019-01-17 11:59:21 +08:00 | 
				
					
						|  tangjinzhou | f05387d372 | update site | 2019-01-16 13:24:47 +08:00 | 
				
					
						|  tangjinzhou | d41c7dbbcd | update site | 2019-01-16 11:26:56 +08:00 | 
				
					
						|  tangjinzhou | f686674dfc | update site | 2019-01-12 18:52:58 +08:00 | 
				
					
						|  tangjinzhou | 1a6ba14d59 | bump 1.3.0 | 2019-01-12 18:01:02 +08:00 | 
				
					
						|  tangjinzhou | 074aaafea9 | docs: update docs | 2019-01-12 17:19:57 +08:00 | 
				
					
						|  tangjinzhou | ffb2a593b1 | style: lint add semi and prettier | 2019-01-12 12:46:29 +08:00 |