zhangmin
							
						 
					 | 
					
						
						
						
						
							
						
						
							12832511c9
							
						
					 | 
					
						
						
							
							Merge branch 'feature/uploader' into 'master'
						
						
						
						
						
						
						
						Feature/uploader
See merge request !11 
						
						
							
						
					 | 
					
						2017-03-15 10:51:41 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								taiyong
							
						 
					 | 
					
						
						
						
						
							
						
						
							b653859f61
							
						
					 | 
					
						
						
							
							merge: master
						
						
						
						
						
						
							
						
					 | 
					
						2017-03-15 10:50:19 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								taiyong
							
						 
					 | 
					
						
						
						
						
							
						
						
							72ab1fe73b
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/master'
						
						
						
						
						
						
							
						
					 | 
					
						2017-03-15 10:43:48 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								cookfront
							
						 
					 | 
					
						
						
						
						
							
						
						
							0eaf6bef5c
							
						
					 | 
					
						
						
							
							[release] 0.0.31
						
						
						
						
						
						
							
 v0.0.31
						
					 | 
					
						2017-03-15 10:24:57 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								cookfront
							
						 
					 | 
					
						
						
						
						
							
						
						
							1169b399ac
							
						
					 | 
					
						
						
							
							[build] 0.0.31
						
						
						
						
						
						
							
						
					 | 
					
						2017-03-15 10:24:56 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								cookfront
							
						 
					 | 
					
						
						
						
						
							
						
						
							e976efffe9
							
						
					 | 
					
						
						
							
							build docs
						
						
						
						
						
						
							
						
					 | 
					
						2017-03-15 10:24:00 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								jiangruowei
							
						 
					 | 
					
						
						
						
						
							
						
						
							2de6435873
							
						
					 | 
					
						
						
							
							feat: add toast
						
						
						
						
						
						
							
						
					 | 
					
						2017-03-15 10:10:31 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								cookfront
							
						 
					 | 
					
						
						
						
						
							
						
						
							bfa472e6e5
							
						
					 | 
					
						
						
							
							swipe
						
						
						
						
						
						
							
						
					 | 
					
						2017-03-14 22:53:04 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								taiyong
							
						 
					 | 
					
						
						
						
						
							
						
						
							b235b9ac7b
							
						
					 | 
					
						
						
							
							uploader
						
						
						
						
						
						
							
						
					 | 
					
						2017-03-14 18:03:28 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								taiyong
							
						 
					 | 
					
						
						
						
						
							
						
						
							c1e1abd158
							
						
					 | 
					
						
						
							
							uploader
						
						
						
						
						
						
							
						
					 | 
					
						2017-03-14 18:03:05 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								taiyong
							
						 
					 | 
					
						
						
						
						
							
						
						
							7d5b336fac
							
						
					 | 
					
						
						
							
							uploader
						
						
						
						
						
						
							
						
					 | 
					
						2017-03-14 18:00:39 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								cookfront
							
						 
					 | 
					
						
						
						
						
							
						
						
							7674d8d562
							
						
					 | 
					
						
						
							
							fix radio
						
						
						
						
						
						
							
						
					 | 
					
						2017-03-14 16:58:20 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								cookfront
							
						 
					 | 
					
						
						
						
						
							
						
						
							f6c2eec07a
							
						
					 | 
					
						
						
							
							Merge branch 'master' of gitlab.qima-inc.com:fe/zanui-vue
						
						
						
						
						
						
							
						
					 | 
					
						2017-03-14 16:28:31 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								cookfront
							
						 
					 | 
					
						
						
						
						
							
						
						
							2915c36507
							
						
					 | 
					
						
						
							
							fix css
						
						
						
						
						
						
							
						
					 | 
					
						2017-03-14 16:28:22 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								niunai
							
						 
					 | 
					
						
						
						
						
							
						
						
							6f30cd1404
							
						
					 | 
					
						
						
							
							点击时抛出event对象
						
						
						
						
						
						
							
						
					 | 
					
						2017-03-14 15:58:10 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								cookfront
							
						 
					 | 
					
						
						
						
						
							
						
						
							fcec8efae6
							
						
					 | 
					
						
						
							
							fix popup
						
						
						
						
						
						
							
						
					 | 
					
						2017-03-14 15:42:22 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								cookfront
							
						 
					 | 
					
						
						
						
						
							
						
						
							902c520268
							
						
					 | 
					
						
						
							
							fix field
						
						
						
						
						
						
							
						
					 | 
					
						2017-03-14 15:31:18 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								cookfront
							
						 
					 | 
					
						
						
						
						
							
						
						
							93b2267a50
							
						
					 | 
					
						
						
							
							border field
						
						
						
						
						
						
							
						
					 | 
					
						2017-03-14 15:24:09 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								taiyong
							
						 
					 | 
					
						
						
						
						
							
						
						
							a8d75dc0ab
							
						
					 | 
					
						
						
							
							Merge branch 'master' of gitlab.qima-inc.com:fe/zanui-vue
						
						
						
						
						
						
							
						
					 | 
					
						2017-03-14 10:33:32 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								cookfront
							
						 
					 | 
					
						
						
						
						
							
						
						
							b02ebc90d9
							
						
					 | 
					
						
						
							
							build docs
						
						
						
						
						
						
							
						
					 | 
					
						2017-03-14 09:58:22 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zhangmin
							
						 
					 | 
					
						
						
						
						
							
						
						
							7d27e94ded
							
						
					 | 
					
						
						
							
							Merge branch 'feature/progress' into 'master'
						
						
						
						
						
						
						
						Feature/progress
See merge request !10 
						
						
							
						
					 | 
					
						2017-03-13 21:20:18 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								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
							
						 
					 | 
					
						
						
						
						
							
						
						
							43e936cbd1
							
						
					 | 
					
						
						
							
							build docs
						
						
						
						
						
						
							
						
					 | 
					
						2017-03-13 19:41:31 +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
							
						 
					 | 
					
						
						
						
						
							
						
						
							e7610239a6
							
						
					 | 
					
						
						
							
							[release] 0.0.30
						
						
						
						
						
						
							
 v0.0.30
						
					 | 
					
						2017-03-10 17:44:38 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								cookfront
							
						 
					 | 
					
						
						
						
						
							
						
						
							237c44c77b
							
						
					 | 
					
						
						
							
							[build] 0.0.30
						
						
						
						
						
						
							
						
					 | 
					
						2017-03-10 17:44:37 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								cookfront
							
						 
					 | 
					
						
						
						
						
							
						
						
							2849fa64ce
							
						
					 | 
					
						
						
							
							[release] 0.0.29
						
						
						
						
						
						
							
 v0.0.29
						
					 | 
					
						2017-03-10 17:31:32 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								cookfront
							
						 
					 | 
					
						
						
						
						
							
						
						
							1e557a2a17
							
						
					 | 
					
						
						
							
							[build] 0.0.29
						
						
						
						
						
						
							
						
					 | 
					
						2017-03-10 17:31:31 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								cookfront
							
						 
					 | 
					
						
						
						
						
							
						
						
							97a593ff69
							
						
					 | 
					
						
						
							
							fix popup manager
						
						
						
						
						
						
							
						
					 | 
					
						2017-03-10 17:30:45 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								cookfront
							
						 
					 | 
					
						
						
						
						
							
						
						
							370a16383a
							
						
					 | 
					
						
						
							
							[release] 0.0.28
						
						
						
						
						
						
							
 v0.0.28
						
					 | 
					
						2017-03-10 17:23:47 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								cookfront
							
						 
					 | 
					
						
						
						
						
							
						
						
							2f234b540e
							
						
					 | 
					
						
						
							
							[build] 0.0.28
						
						
						
						
						
						
							
						
					 | 
					
						2017-03-10 17:23:46 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								cookfront
							
						 
					 | 
					
						
						
						
						
							
						
						
							c5d5c90c06
							
						
					 | 
					
						
						
							
							fix popup manager
						
						
						
						
						
						
							
						
					 | 
					
						2017-03-10 17:22:47 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								cookfront
							
						 
					 | 
					
						
						
						
						
							
						
						
							24e1caca32
							
						
					 | 
					
						
						
							
							[release] 0.0.27
						
						
						
						
						
						
							
 v0.0.27
						
					 | 
					
						2017-03-10 17:17:14 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								cookfront
							
						 
					 | 
					
						
						
						
						
							
						
						
							040bcbb915
							
						
					 | 
					
						
						
							
							[build] 0.0.27
						
						
						
						
						
						
							
						
					 | 
					
						2017-03-10 17:17:13 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								cookfront
							
						 
					 | 
					
						
						
						
						
							
						
						
							b2cf1d1eb2
							
						
					 | 
					
						
						
							
							fix popup
						
						
						
						
						
						
							
						
					 | 
					
						2017-03-10 17:16:22 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								cookfront
							
						 
					 | 
					
						
						
						
						
							
						
						
							ba53bc4c56
							
						
					 | 
					
						
						
							
							[release] 0.0.26
						
						
						
						
						
						
							
 v0.0.26
						
					 | 
					
						2017-03-10 16:53:32 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								cookfront
							
						 
					 | 
					
						
						
						
						
							
						
						
							ac64514076
							
						
					 | 
					
						
						
							
							[build] 0.0.26
						
						
						
						
						
						
							
						
					 | 
					
						2017-03-10 16:53:32 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								cookfront
							
						 
					 | 
					
						
						
						
						
							
						
						
							366ce6f575
							
						
					 | 
					
						
						
							
							build docs
						
						
						
						
						
						
							
						
					 | 
					
						2017-03-10 16:51:52 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								cookfront
							
						 
					 | 
					
						
						
						
						
							
						
						
							5e1d604c11
							
						
					 | 
					
						
						
							
							popup manager fix
						
						
						
						
						
						
							
						
					 | 
					
						2017-03-10 16:51:08 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								cookfront
							
						 
					 | 
					
						
						
						
						
							
						
						
							66db79484d
							
						
					 | 
					
						
						
							
							component unit test
						
						
						
						
						
						
							
						
					 | 
					
						2017-03-10 16:07:36 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								cookfront
							
						 
					 | 
					
						
						
						
						
							
						
						
							56fe6b5704
							
						
					 | 
					
						
						
							
							docs
						
						
						
						
						
						
							
						
					 | 
					
						2017-03-10 15:23:11 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								cookfront
							
						 
					 | 
					
						
						
						
						
							
						
						
							09467b6d90
							
						
					 | 
					
						
						
							
							build docs
						
						
						
						
						
						
							
						
					 | 
					
						2017-03-10 15:10:04 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								cookfront
							
						 
					 | 
					
						
						
						
						
							
						
						
							f6b3eb8365
							
						
					 | 
					
						
						
							
							quantity component
						
						
						
						
						
						
							
						
					 | 
					
						2017-03-10 15:09:10 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								cookfront
							
						 
					 | 
					
						
						
						
						
							
						
						
							4935ca66ac
							
						
					 | 
					
						
						
							
							build docs
						
						
						
						
						
						
							
						
					 | 
					
						2017-03-09 21:36:53 +08:00 | 
					
					
						
						
							
							
							
						
					 |