cookfront
							
						 
					 | 
					
						
						
						
						
							
						
						
							e448bb080d
							
						
					 | 
					
						
						
							
							[build] 0.0.13
						
						
						
						
						
						
					 | 
					
						2017-03-03 10:22:55 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								cookfront
							
						 
					 | 
					
						
						
						
						
							
						
						
							6e6c057ffd
							
						
					 | 
					
						
						
							
							zanui vue config
						
						
						
						
						
						
					 | 
					
						2017-03-03 10:20:55 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								jiangruowei
							
						 
					 | 
					
						
						
						
						
							
						
						
							67e37c9050
							
						
					 | 
					
						
						
							
							Merge branch 'master' into hotfix/switch_loading_fix
						
						
						
						
						
						
					 | 
					
						2017-03-02 19:59:36 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								jiangruowei
							
						 
					 | 
					
						
						
						
						
							
						
						
							26babf0b13
							
						
					 | 
					
						
						
							
							feat: 更新loading
						
						
						
						
						
						
					 | 
					
						2017-03-02 19:58:26 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								cookfront
							
						 
					 | 
					
						
						
						
						
							
						
						
							b9d34f95b5
							
						
					 | 
					
						
						
							
							[build] 0.0.12
						
						
						
						
						
						
					 | 
					
						2017-03-02 19:43:03 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								cookfront
							
						 
					 | 
					
						
						
						
						
							
						
						
							98d1bc7157
							
						
					 | 
					
						
						
							
							step component
						
						
						
						
						
						
					 | 
					
						2017-03-02 19:37:10 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								jiangruowei
							
						 
					 | 
					
						
						
						
						
							
						
						
							7c6bfc6714
							
						
					 | 
					
						
						
							
							fix: minor fix
						
						
						
						
						
						
					 | 
					
						2017-03-02 17:29:50 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								jiangruowei
							
						 
					 | 
					
						
						
						
						
							
						
						
							bbf787218f
							
						
					 | 
					
						
						
							
							feat: ui tweaks
						
						
						
						
						
						
					 | 
					
						2017-03-02 17:21:20 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								cookfront
							
						 
					 | 
					
						
						
						
						
							
						
						
							b69dce095d
							
						
					 | 
					
						
						
							
							[build] 0.0.11
						
						
						
						
						
						
					 | 
					
						2017-03-02 16:18:45 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								cookfront
							
						 
					 | 
					
						
						
						
						
							
						
						
							c1135357ea
							
						
					 | 
					
						
						
							
							cell fix
						
						
						
						
						
						
					 | 
					
						2017-03-02 16:17:47 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								cookfront
							
						 
					 | 
					
						
						
						
						
							
						
						
							50f2fd88e2
							
						
					 | 
					
						
						
							
							Merge branch 'master' of gitlab.qima-inc.com:fe/zanui-vue
						
						
						
						
						
						
					 | 
					
						2017-03-02 16:07:11 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								cookfront
							
						 
					 | 
					
						
						
						
						
							
						
						
							8eff262e48
							
						
					 | 
					
						
						
							
							step component
						
						
						
						
						
						
					 | 
					
						2017-03-02 16:07:02 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								niunai
							
						 
					 | 
					
						
						
						
						
							
						
						
							7d0dfa0555
							
						
					 | 
					
						
						
							
							Merge branch 'master' of gitlab.qima-inc.com:fe/zanui-vue
						
						
						
						
						
						
					 | 
					
						2017-03-02 15:53:34 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								niunai
							
						 
					 | 
					
						
						
						
						
							
						
						
							b30b98e61c
							
						
					 | 
					
						
						
							
							when to modifier
						
						
						
						
						
						
					 | 
					
						2017-03-02 15:53:29 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								cookfront
							
						 
					 | 
					
						
						
						
						
							
						
						
							d2168b8143
							
						
					 | 
					
						
						
							
							[build] 0.0.10
						
						
						
						
						
						
					 | 
					
						2017-03-02 14:00:05 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								cookfront
							
						 
					 | 
					
						
						
						
						
							
						
						
							c8f7888dd2
							
						
					 | 
					
						
						
							
							step component
						
						
						
						
						
						
					 | 
					
						2017-03-02 13:59:27 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								cookfront
							
						 
					 | 
					
						
						
						
						
							
						
						
							ac37da54f1
							
						
					 | 
					
						
						
							
							[build] 0.0.9
						
						
						
						
						
						
					 | 
					
						2017-03-02 11:30:32 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								cookfront
							
						 
					 | 
					
						
						
						
						
							
						
						
							71397bc9d4
							
						
					 | 
					
						
						
							
							step
						
						
						
						
						
						
					 | 
					
						2017-03-02 11:29:50 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								cookfront
							
						 
					 | 
					
						
						
						
						
							
						
						
							6f2b44bb4d
							
						
					 | 
					
						
						
							
							step component
						
						
						
						
						
						
					 | 
					
						2017-03-02 11:29:01 +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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								jiangruowei
							
						 
					 | 
					
						
						
						
						
							
						
						
							ec168a9b9c
							
						
					 | 
					
						
						
							
							Merge branch 'master' into hotfix/switch_loading_fix
						
						
						
						
						
						
					 | 
					
						2017-03-01 17:04:54 +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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								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
							
						 
					 | 
					
						
						
						
						
							
						
						
							a1db2c76b4
							
						
					 | 
					
						
						
							
							[build] 0.0.7
						
						
						
						
						
						
					 | 
					
						2017-02-28 18:03:14 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zhuxiang
							
						 
					 | 
					
						
						
						
						
							
						
						
							ba405b723b
							
						
					 | 
					
						
						
							
							done
						
						
						
						
						
						
					 | 
					
						2017-02-28 17:41:30 +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 | 
					
					
						
						
							
							
							
						
					 |