jiangruowei
							
						 
					 | 
					
						
						
						
						
							
						
						
							ea8ef564b9
							
						
					 | 
					
						
						
							
							merge: merge master&&rebuild docs
						
						
						
						
						
						
					 | 
					
						2017-03-13 21:19:39 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								jiangruowei
							
						 
					 | 
					
						
						
						
						
							
						
						
							4854520353
							
						
					 | 
					
						
						
							
							fix: update package name
						
						
						
						
						
						
					 | 
					
						2017-03-13 21:17:29 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								jiangruowei
							
						 
					 | 
					
						
						
						
						
							
						
						
							c4d0ae07fa
							
						
					 | 
					
						
						
							
							style: fix lint
						
						
						
						
						
						
					 | 
					
						2017-03-13 21:16:24 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								jiangruowei
							
						 
					 | 
					
						
						
						
						
							
						
						
							5f7e98a547
							
						
					 | 
					
						
						
							
							feat: 添加progress
						
						
						
						
						
						
					 | 
					
						2017-03-13 21:12:02 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								cookfront
							
						 
					 | 
					
						
						
						
						
							
						
						
							3696fadc25
							
						
					 | 
					
						
						
							
							fix picker
						
						
						
						
						
						
					 | 
					
						2017-03-13 19:40:25 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								cookfront
							
						 
					 | 
					
						
						
						
						
							
						
						
							2db76f207f
							
						
					 | 
					
						
						
							
							Merge branch 'master' of gitlab.qima-inc.com:fe/zanui-vue
						
						
						
						
						
						
					 | 
					
						2017-03-13 14:30:29 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								cookfront
							
						 
					 | 
					
						
						
						
						
							
						
						
							ec77685afc
							
						
					 | 
					
						
						
							
							fix card
						
						
						
						
						
						
					 | 
					
						2017-03-13 14:30:21 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								pangxie1991
							
						 
					 | 
					
						
						
						
						
							
						
						
							a2a62c89f1
							
						
					 | 
					
						
						
							
							waterfall
						
						
						
						
						
						
					 | 
					
						2017-03-10 21:51:16 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								cookfront
							
						 
					 | 
					
						
						
						
						
							
						
						
							237c44c77b
							
						
					 | 
					
						
						
							
							[build] 0.0.30
						
						
						
						
						
						
					 | 
					
						2017-03-10 17:44:37 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								cookfront
							
						 
					 | 
					
						
						
						
						
							
						
						
							1e557a2a17
							
						
					 | 
					
						
						
							
							[build] 0.0.29
						
						
						
						
						
						
					 | 
					
						2017-03-10 17:31:31 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								cookfront
							
						 
					 | 
					
						
						
						
						
							
						
						
							2f234b540e
							
						
					 | 
					
						
						
							
							[build] 0.0.28
						
						
						
						
						
						
					 | 
					
						2017-03-10 17:23:46 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								cookfront
							
						 
					 | 
					
						
						
						
						
							
						
						
							040bcbb915
							
						
					 | 
					
						
						
							
							[build] 0.0.27
						
						
						
						
						
						
					 | 
					
						2017-03-10 17:17:13 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								cookfront
							
						 
					 | 
					
						
						
						
						
							
						
						
							ac64514076
							
						
					 | 
					
						
						
							
							[build] 0.0.26
						
						
						
						
						
						
					 | 
					
						2017-03-10 16:53:32 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								cookfront
							
						 
					 | 
					
						
						
						
						
							
						
						
							f6b3eb8365
							
						
					 | 
					
						
						
							
							quantity component
						
						
						
						
						
						
					 | 
					
						2017-03-10 15:09:10 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								cookfront
							
						 
					 | 
					
						
						
						
						
							
						
						
							917071b1e9
							
						
					 | 
					
						
						
							
							[build] 0.0.25
						
						
						
						
						
						
					 | 
					
						2017-03-09 21:02:35 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								cookfront
							
						 
					 | 
					
						
						
						
						
							
						
						
							5387aaae29
							
						
					 | 
					
						
						
							
							fix filed and step
						
						
						
						
						
						
					 | 
					
						2017-03-09 17:32:44 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								cookfront
							
						 
					 | 
					
						
						
						
						
							
						
						
							c96fa4c35b
							
						
					 | 
					
						
						
							
							action sheet component
						
						
						
						
						
						
					 | 
					
						2017-03-09 16:01:40 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								cookfront
							
						 
					 | 
					
						
						
						
						
							
						
						
							b063d8f9ba
							
						
					 | 
					
						
						
							
							[build] 0.0.24
						
						
						
						
						
						
					 | 
					
						2017-03-09 10:54:40 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								cookfront
							
						 
					 | 
					
						
						
						
						
							
						
						
							bbb0baa763
							
						
					 | 
					
						
						
							
							fix checkbox
						
						
						
						
						
						
					 | 
					
						2017-03-09 10:53:46 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								cookfront
							
						 
					 | 
					
						
						
						
						
							
						
						
							fa73fa8a7c
							
						
					 | 
					
						
						
							
							[build] 0.0.23
						
						
						
						
						
						
					 | 
					
						2017-03-08 21:17:37 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								cookfront
							
						 
					 | 
					
						
						
						
						
							
						
						
							8dff910c64
							
						
					 | 
					
						
						
							
							popup
						
						
						
						
						
						
					 | 
					
						2017-03-08 21:15:44 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								cookfront
							
						 
					 | 
					
						
						
						
						
							
						
						
							8c0808ff94
							
						
					 | 
					
						
						
							
							[build] 0.0.22
						
						
						
						
						
						
					 | 
					
						2017-03-08 20:40:00 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								cookfront
							
						 
					 | 
					
						
						
						
						
							
						
						
							a4988f99bc
							
						
					 | 
					
						
						
							
							popup
						
						
						
						
						
						
					 | 
					
						2017-03-08 20:39:09 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								cookfront
							
						 
					 | 
					
						
						
						
						
							
						
						
							099be6c4b7
							
						
					 | 
					
						
						
							
							[build] 0.0.21
						
						
						
						
						
						
					 | 
					
						2017-03-08 20:09:15 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								cookfront
							
						 
					 | 
					
						
						
						
						
							
						
						
							8b9674843c
							
						
					 | 
					
						
						
							
							[build] 0.0.20
						
						
						
						
						
						
					 | 
					
						2017-03-08 17:32:29 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								cookfront
							
						 
					 | 
					
						
						
						
						
							
						
						
							7278df2f00
							
						
					 | 
					
						
						
							
							checkbox label click event
						
						
						
						
						
						
					 | 
					
						2017-03-08 17:30:55 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								cookfront
							
						 
					 | 
					
						
						
						
						
							
						
						
							c11ed958f9
							
						
					 | 
					
						
						
							
							[build] 0.0.19
						
						
						
						
						
						
					 | 
					
						2017-03-08 15:25:43 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zhangmin
							
						 
					 | 
					
						
						
						
						
							
						
						
							9bb76ae8cd
							
						
					 | 
					
						
						
							
							Merge branch 'feature/tabs_lazyload' into 'master'
						
						
						
						
						
						
						
						Feature/tabs lazyload
review一下
See merge request !9 
						
						
					 | 
					
						2017-03-08 15:24:36 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								cookfront
							
						 
					 | 
					
						
						
						
						
							
						
						
							61999ca6e3
							
						
					 | 
					
						
						
							
							[build] 0.0.18
						
						
						
						
						
						
					 | 
					
						2017-03-08 15:03:18 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								cookfront
							
						 
					 | 
					
						
						
						
						
							
						
						
							6551e81ec8
							
						
					 | 
					
						
						
							
							picker toolbar
						
						
						
						
						
						
					 | 
					
						2017-03-08 15:00:57 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zhuxiang
							
						 
					 | 
					
						
						
						
						
							
						
						
							43e79ccc65
							
						
					 | 
					
						
						
							
							eslint done
						
						
						
						
						
						
					 | 
					
						2017-03-08 12:59:44 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								cookfront
							
						 
					 | 
					
						
						
						
						
							
						
						
							1bf07c40e9
							
						
					 | 
					
						
						
							
							[build] 0.0.17
						
						
						
						
						
						
					 | 
					
						2017-03-07 17:58:45 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zhuxiang
							
						 
					 | 
					
						
						
						
						
							
						
						
							14110f6c90
							
						
					 | 
					
						
						
							
							done
						
						
						
						
						
						
					 | 
					
						2017-03-07 16:40:06 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zhuxiang
							
						 
					 | 
					
						
						
						
						
							
						
						
							fdf2868cc7
							
						
					 | 
					
						
						
							
							done
						
						
						
						
						
						
					 | 
					
						2017-03-07 15:00:05 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zhuxiang
							
						 
					 | 
					
						
						
						
						
							
						
						
							847e509244
							
						
					 | 
					
						
						
							
							done
						
						
						
						
						
						
					 | 
					
						2017-03-07 14:56:47 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								cookfront
							
						 
					 | 
					
						
						
						
						
							
						
						
							c37e3f0c98
							
						
					 | 
					
						
						
							
							[build] 0.0.15
						
						
						
						
						
						
					 | 
					
						2017-03-07 10:32:01 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								cookfront
							
						 
					 | 
					
						
						
						
						
							
						
						
							0ba9333634
							
						
					 | 
					
						
						
							
							fix lint
						
						
						
						
						
						
					 | 
					
						2017-03-07 10:30:32 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								cookfront
							
						 
					 | 
					
						
						
						
						
							
						
						
							7890938a1d
							
						
					 | 
					
						
						
							
							build docs
						
						
						
						
						
						
					 | 
					
						2017-03-06 21:49:41 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								cookfront
							
						 
					 | 
					
						
						
						
						
							
						
						
							7093f1772f
							
						
					 | 
					
						
						
							
							文档优化
						
						
						
						
						
						
					 | 
					
						2017-03-06 15:16:02 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								cookfront
							
						 
					 | 
					
						
						
						
						
							
						
						
							019bb5c7d8
							
						
					 | 
					
						
						
							
							action sheet
						
						
						
						
						
						
					 | 
					
						2017-03-06 11:21:27 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								cookfront
							
						 
					 | 
					
						
						
						
						
							
						
						
							6f3f98c601
							
						
					 | 
					
						
						
							
							Merge branch 'master' of gitlab.qima-inc.com:fe/zanui-vue
						
						
						
						
						
						
					 | 
					
						2017-03-05 16:58:18 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								cookfront
							
						 
					 | 
					
						
						
						
						
							
						
						
							8856af91fd
							
						
					 | 
					
						
						
							
							image preview
						
						
						
						
						
						
					 | 
					
						2017-03-05 16:57:50 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								niunai
							
						 
					 | 
					
						
						
						
						
							
						
						
							5e976c8e20
							
						
					 | 
					
						
						
							
							Merge branch 'master' of gitlab.qima-inc.com:fe/zanui-vue
						
						
						
						
						
						
						
						Conflicts:
	packages/zanui-css/src/index.css 
						
						
					 | 
					
						2017-03-03 17:58:36 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								niunai
							
						 
					 | 
					
						
						
						
						
							
						
						
							e918c52fd0
							
						
					 | 
					
						
						
							
							增加zan-layout
						
						
						
						
						
						
					 | 
					
						2017-03-03 17:58:08 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								cookfront
							
						 
					 | 
					
						
						
						
						
							
						
						
							8a6b3b796e
							
						
					 | 
					
						
						
							
							[build] 0.0.14
						
						
						
						
						
						
					 | 
					
						2017-03-03 16:48:45 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								cookfront
							
						 
					 | 
					
						
						
						
						
							
						
						
							082b23927b
							
						
					 | 
					
						
						
							
							fix lint
						
						
						
						
						
						
					 | 
					
						2017-03-03 16:42:53 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								cookfront
							
						 
					 | 
					
						
						
						
						
							
						
						
							05edb4a391
							
						
					 | 
					
						
						
							
							fix lint
						
						
						
						
						
						
					 | 
					
						2017-03-03 16:40:48 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								cookfront
							
						 
					 | 
					
						
						
						
						
							
						
						
							1cf5490f99
							
						
					 | 
					
						
						
							
							image preview component
						
						
						
						
						
						
					 | 
					
						2017-03-03 15:46:26 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zhuxiang
							
						 
					 | 
					
						
						
						
						
							
						
						
							4ab5c331b7
							
						
					 | 
					
						
						
							
							lazyload start
						
						
						
						
						
						
					 | 
					
						2017-03-03 14:13:17 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zhuxiang
							
						 
					 | 
					
						
						
						
						
							
						
						
							522830aac5
							
						
					 | 
					
						
						
							
							tabs almost
						
						
						
						
						
						
					 | 
					
						2017-03-03 14:08:33 +08:00 | 
					
					
						
						
							
							
							
						
					 |