cookfront
							
						 
					 | 
					
						
						
						
						
							
						
						
							71397bc9d4
							
						
					 | 
					
						
						
							
							step
						
						
						
						
						
						
							
						
					 | 
					
						2017-03-02 11:29:50 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								cookfront
							
						 
					 | 
					
						
						
						
						
							
						
						
							6f2b44bb4d
							
						
					 | 
					
						
						
							
							step component
						
						
						
						
						
						
							
						
					 | 
					
						2017-03-02 11:29:01 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								cookfront
							
						 
					 | 
					
						
						
						
						
							
						
						
							b9716a4dab
							
						
					 | 
					
						
						
							
							build docs
						
						
						
						
						
						
							
						
					 | 
					
						2017-03-01 19:27:38 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								cookfront
							
						 
					 | 
					
						
						
						
						
							
						
						
							d4ae6f8c69
							
						
					 | 
					
						
						
							
							[release] 0.0.8
						
						
						
						
						
						
							
 v0.0.8
						
					 | 
					
						2017-03-01 19:26:21 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								cookfront
							
						 
					 | 
					
						
						
						
						
							
						
						
							aceec34845
							
						
					 | 
					
						
						
							
							[build] 0.0.8
						
						
						
						
						
						
							
						
					 | 
					
						2017-03-01 19:26:20 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								cookfront
							
						 
					 | 
					
						
						
						
						
							
						
						
							e3c65c3ec8
							
						
					 | 
					
						
						
							
							step component
						
						
						
						
						
						
							
						
					 | 
					
						2017-03-01 19:24:54 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zhangmin
							
						 
					 | 
					
						
						
						
						
							
						
						
							bd24b22203
							
						
					 | 
					
						
						
							
							Merge branch 'hotfix/switch_loading_fix' into 'master'
						
						
						
						
						
						
						
						Hotfix/switch loading fix
See merge request !6 
						
						
							
						
					 | 
					
						2017-03-01 17:06:43 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								jiangruowei
							
						 
					 | 
					
						
						
						
						
							
						
						
							ec168a9b9c
							
						
					 | 
					
						
						
							
							Merge branch 'master' into hotfix/switch_loading_fix
						
						
						
						
						
						
							
						
					 | 
					
						2017-03-01 17:04:54 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zhangmin
							
						 
					 | 
					
						
						
						
						
							
						
						
							f5564a0d61
							
						
					 | 
					
						
						
							
							Merge branch 'dev/badge_search' into 'master'
						
						
						
						
						
						
						
						Dev/badge search
张大哥合一下我的组件
See merge request !7 
						
						
							
						
					 | 
					
						2017-03-01 17:01:29 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zhuxiang
							
						 
					 | 
					
						
						
						
						
							
						
						
							a9b4b6a27b
							
						
					 | 
					
						
						
							
							done
						
						
						
						
						
						
							
						
					 | 
					
						2017-03-01 15:51:31 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zhuxiang
							
						 
					 | 
					
						
						
						
						
							
						
						
							dc2d685a34
							
						
					 | 
					
						
						
							
							done
						
						
						
						
						
						
							
						
					 | 
					
						2017-03-01 15:40:08 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								cookfront
							
						 
					 | 
					
						
						
						
						
							
						
						
							7a3785c31b
							
						
					 | 
					
						
						
							
							fix css
						
						
						
						
						
						
							
						
					 | 
					
						2017-03-01 15:21:31 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zhuxiang
							
						 
					 | 
					
						
						
						
						
							
						
						
							abc876b254
							
						
					 | 
					
						
						
							
							adjust
						
						
						
						
						
						
							
						
					 | 
					
						2017-03-01 15:10:03 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zhuxiang
							
						 
					 | 
					
						
						
						
						
							
						
						
							5b34ea74ec
							
						
					 | 
					
						
						
							
							Merge branch 'master' into dev/badge_search
						
						
						
						
						
						
						
						# Conflicts:
#	components.json
#	packages/zanui-css/src/index.css
#	src/index.js 
						
						
							
						
					 | 
					
						2017-03-01 14:54:32 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zhuxiang
							
						 
					 | 
					
						
						
						
						
							
						
						
							6808b06372
							
						
					 | 
					
						
						
							
							done
						
						
						
						
						
						
							
						
					 | 
					
						2017-03-01 14:51:27 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zhuxiang
							
						 
					 | 
					
						
						
						
						
							
						
						
							0abb184056
							
						
					 | 
					
						
						
							
							done
						
						
						
						
						
						
							
						
					 | 
					
						2017-03-01 14:28:10 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								jiangruowei
							
						 
					 | 
					
						
						
						
						
							
						
						
							deeffc35a8
							
						
					 | 
					
						
						
							
							fix: fix doc
						
						
						
						
						
						
							
						
					 | 
					
						2017-03-01 11:52:26 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								jiangruowei
							
						 
					 | 
					
						
						
						
						
							
						
						
							d7e78352b7
							
						
					 | 
					
						
						
							
							fix: 修复loading偏移问题
						
						
						
						
						
						
							
						
					 | 
					
						2017-03-01 11:48:15 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								jiangruowei
							
						 
					 | 
					
						
						
						
						
							
						
						
							a6c3e4becd
							
						
					 | 
					
						
						
							
							fix: loading style change
						
						
						
						
						
						
							
						
					 | 
					
						2017-03-01 11:43:39 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								cookfront
							
						 
					 | 
					
						
						
						
						
							
						
						
							d4950678e6
							
						
					 | 
					
						
						
							
							checkbox component
						
						
						
						
						
						
							
						
					 | 
					
						2017-03-01 11:31:52 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								cookfront
							
						 
					 | 
					
						
						
						
						
							
						
						
							c2a46edeae
							
						
					 | 
					
						
						
							
							checkbox component
						
						
						
						
						
						
							
						
					 | 
					
						2017-03-01 11:17:21 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								cookfront
							
						 
					 | 
					
						
						
						
						
							
						
						
							e0be5b962e
							
						
					 | 
					
						
						
							
							checkbox component
						
						
						
						
						
						
							
						
					 | 
					
						2017-03-01 11:15:15 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								jiangruowei
							
						 
					 | 
					
						
						
						
						
							
						
						
							456cf908af
							
						
					 | 
					
						
						
							
							feat: update switch style
						
						
						
						
						
						
							
						
					 | 
					
						2017-03-01 11:12:16 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								cookfront
							
						 
					 | 
					
						
						
						
						
							
						
						
							38d6771e72
							
						
					 | 
					
						
						
							
							build docs
						
						
						
						
						
						
							
						
					 | 
					
						2017-02-28 21:31:40 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								cookfront
							
						 
					 | 
					
						
						
						
						
							
						
						
							b33f319015
							
						
					 | 
					
						
						
							
							docs use hash
						
						
						
						
						
						
							
						
					 | 
					
						2017-02-28 21:30:04 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								cookfront
							
						 
					 | 
					
						
						
						
						
							
						
						
							afc7ba6f99
							
						
					 | 
					
						
						
							
							build docs
						
						
						
						
						
						
							
						
					 | 
					
						2017-02-28 21:25:56 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								pangxie1991
							
						 
					 | 
					
						
						
						
						
							
						
						
							662d4b174b
							
						
					 | 
					
						
						
							
							z -> zan
						
						
						
						
						
						
							
						
					 | 
					
						2017-02-28 21:13:13 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								pangxie1991
							
						 
					 | 
					
						
						
						
						
							
						
						
							edb63cac01
							
						
					 | 
					
						
						
							
							Merge branch 'master' of gitlab.qima-inc.com:fe/zanui-vue
						
						
						
						
						
						
							
						
					 | 
					
						2017-02-28 21:08:56 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								pangxie1991
							
						 
					 | 
					
						
						
						
						
							
						
						
							474a324988
							
						
					 | 
					
						
						
							
							tag component
						
						
						
						
						
						
							
						
					 | 
					
						2017-02-28 21:08:50 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								cookfront
							
						 
					 | 
					
						
						
						
						
							
						
						
							1518379767
							
						
					 | 
					
						
						
							
							[release] 0.0.7
						
						
						
						
						
						
							
 v0.0.7
						
					 | 
					
						2017-02-28 18:03:15 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								cookfront
							
						 
					 | 
					
						
						
						
						
							
						
						
							a1db2c76b4
							
						
					 | 
					
						
						
							
							[build] 0.0.7
						
						
						
						
						
						
							
						
					 | 
					
						2017-02-28 18:03:14 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								cookfront
							
						 
					 | 
					
						
						
						
						
							
						
						
							0e113c9a34
							
						
					 | 
					
						
						
							
							build docs
						
						
						
						
						
						
							
						
					 | 
					
						2017-02-28 17:53:30 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zhuxiang
							
						 
					 | 
					
						
						
						
						
							
						
						
							ba405b723b
							
						
					 | 
					
						
						
							
							done
						
						
						
						
						
						
							
						
					 | 
					
						2017-02-28 17:41:30 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								cookfront
							
						 
					 | 
					
						
						
						
						
							
						
						
							e5ce5b052f
							
						
					 | 
					
						
						
							
							build config
						
						
						
						
						
						
							
						
					 | 
					
						2017-02-28 17:29:27 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								cookfront
							
						 
					 | 
					
						
						
						
						
							
						
						
							315bdd74a5
							
						
					 | 
					
						
						
							
							fix lint
						
						
						
						
						
						
							
						
					 | 
					
						2017-02-28 17:25:24 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								cookfront
							
						 
					 | 
					
						
						
						
						
							
						
						
							86ee2eaedc
							
						
					 | 
					
						
						
							
							z- to zan-
						
						
						
						
						
						
							
						
					 | 
					
						2017-02-28 17:19:42 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								cookfront
							
						 
					 | 
					
						
						
						
						
							
						
						
							048049d506
							
						
					 | 
					
						
						
							
							z- to zan-
						
						
						
						
						
						
							
						
					 | 
					
						2017-02-28 17:12:02 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								cookfront
							
						 
					 | 
					
						
						
						
						
							
						
						
							d5e174b632
							
						
					 | 
					
						
						
							
							cell css
						
						
						
						
						
						
							
						
					 | 
					
						2017-02-28 16:54:40 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								cookfront
							
						 
					 | 
					
						
						
						
						
							
						
						
							b34bb4d7a8
							
						
					 | 
					
						
						
							
							radio component
						
						
						
						
						
						
							
						
					 | 
					
						2017-02-28 16:51:20 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								cookfront
							
						 
					 | 
					
						
						
						
						
							
						
						
							5235ba42be
							
						
					 | 
					
						
						
							
							radio component
						
						
						
						
						
						
							
						
					 | 
					
						2017-02-28 16:50:09 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								jiangruowei
							
						 
					 | 
					
						
						
						
						
							
						
						
							9a4dc8fb64
							
						
					 | 
					
						
						
							
							Merge branch 'master' into hotfix/switch_loading_fix
						
						
						
						
						
						
							
						
					 | 
					
						2017-02-28 16:45:13 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								cookfront
							
						 
					 | 
					
						
						
						
						
							
						
						
							f2260deaa3
							
						
					 | 
					
						
						
							
							radio component
						
						
						
						
						
						
							
						
					 | 
					
						2017-02-28 16:32:26 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								jiangruowei
							
						 
					 | 
					
						
						
						
						
							
						
						
							06e60122d0
							
						
					 | 
					
						
						
							
							fix: update loading
						
						
						
						
						
						
							
						
					 | 
					
						2017-02-28 16:24:51 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								cookfront
							
						 
					 | 
					
						
						
						
						
							
						
						
							5de064caf4
							
						
					 | 
					
						
						
							
							radio component
						
						
						
						
						
						
							
						
					 | 
					
						2017-02-28 15:13:57 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zhuxiang
							
						 
					 | 
					
						
						
						
						
							
						
						
							04712433c0
							
						
					 | 
					
						
						
							
							done
						
						
						
						
						
						
							
						
					 | 
					
						2017-02-28 15:10:20 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								cookfront
							
						 
					 | 
					
						
						
						
						
							
						
						
							36e1710e33
							
						
					 | 
					
						
						
							
							Merge branch 'master' of gitlab.qima-inc.com:fe/zanui-vue
						
						
						
						
						
						
							
						
					 | 
					
						2017-02-28 11:55:27 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								cookfront
							
						 
					 | 
					
						
						
						
						
							
						
						
							7f6d7a24dd
							
						
					 | 
					
						
						
							
							fix popup
						
						
						
						
						
						
							
						
					 | 
					
						2017-02-28 11:55:18 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								jiangruowei
							
						 
					 | 
					
						
						
						
						
							
						
						
							0606925698
							
						
					 | 
					
						
						
							
							style: use BEM style
						
						
						
						
						
						
							
						
					 | 
					
						2017-02-28 11:36:46 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								jiangruowei
							
						 
					 | 
					
						
						
						
						
							
						
						
							09cf3d1c25
							
						
					 | 
					
						
						
							
							fix:switch方向改变&rename
						
						
						
						
						
						
							
						
					 | 
					
						2017-02-28 11:35:56 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								niunai
							
						 
					 | 
					
						
						
						
						
							
						
						
							1c81270de2
							
						
					 | 
					
						
						
							
							build docs
						
						
						
						
						
						
							
						
					 | 
					
						2017-02-28 10:40:15 +08:00 | 
					
					
						
						
							
							
							
						
					 |