cookfront
							
						 
					 | 
					
						
						
						
						
							
						
						
							6b825e0718
							
						
					 | 
					
						
						
							
							add auto generate example js
						
						
						
						
						
						
					 | 
					
						2017-03-06 18:56:23 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								cookfront
							
						 
					 | 
					
						
						
						
						
							
						
						
							b388aeaa02
							
						
					 | 
					
						
						
							
							docs
						
						
						
						
						
						
					 | 
					
						2017-03-06 15:57:10 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								cookfront
							
						 
					 | 
					
						
						
						
						
							
						
						
							7093f1772f
							
						
					 | 
					
						
						
							
							文档优化
						
						
						
						
						
						
					 | 
					
						2017-03-06 15:16:02 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								cookfront
							
						 
					 | 
					
						
						
						
						
							
						
						
							76fa89a49c
							
						
					 | 
					
						
						
							
							docs
						
						
						
						
						
						
					 | 
					
						2017-03-06 12:45:03 +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
							
						 
					 | 
					
						
						
						
						
							
						
						
							1cf5490f99
							
						
					 | 
					
						
						
							
							image preview component
						
						
						
						
						
						
					 | 
					
						2017-03-03 15:46:26 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zhuxiang
							
						 
					 | 
					
						
						
						
						
							
						
						
							522830aac5
							
						
					 | 
					
						
						
							
							tabs almost
						
						
						
						
						
						
					 | 
					
						2017-03-03 14:08:33 +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
							
						 
					 | 
					
						
						
						
						
							
						
						
							6dd1675fce
							
						
					 | 
					
						
						
							
							build docs
						
						
						
						
						
						
					 | 
					
						2017-03-02 19:27:40 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								cookfront
							
						 
					 | 
					
						
						
						
						
							
						
						
							8eff262e48
							
						
					 | 
					
						
						
							
							step component
						
						
						
						
						
						
					 | 
					
						2017-03-02 16:07:02 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								cookfront
							
						 
					 | 
					
						
						
						
						
							
						
						
							6f2b44bb4d
							
						
					 | 
					
						
						
							
							step component
						
						
						
						
						
						
					 | 
					
						2017-03-02 11:29:01 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								jiangruowei
							
						 
					 | 
					
						
						
						
						
							
						
						
							ec168a9b9c
							
						
					 | 
					
						
						
							
							Merge branch 'master' into hotfix/switch_loading_fix
						
						
						
						
						
						
					 | 
					
						2017-03-01 17:04:54 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zhuxiang
							
						 
					 | 
					
						
						
						
						
							
						
						
							dc2d685a34
							
						
					 | 
					
						
						
							
							done
						
						
						
						
						
						
					 | 
					
						2017-03-01 15:40:08 +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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								cookfront
							
						 
					 | 
					
						
						
						
						
							
						
						
							d4950678e6
							
						
					 | 
					
						
						
							
							checkbox component
						
						
						
						
						
						
					 | 
					
						2017-03-01 11:31:52 +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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zhuxiang
							
						 
					 | 
					
						
						
						
						
							
						
						
							ba405b723b
							
						
					 | 
					
						
						
							
							done
						
						
						
						
						
						
					 | 
					
						2017-02-28 17:41:30 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								cookfront
							
						 
					 | 
					
						
						
						
						
							
						
						
							048049d506
							
						
					 | 
					
						
						
							
							z- to zan-
						
						
						
						
						
						
					 | 
					
						2017-02-28 17:12:02 +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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								jiangruowei
							
						 
					 | 
					
						
						
						
						
							
						
						
							09cf3d1c25
							
						
					 | 
					
						
						
							
							fix:switch方向改变&rename
						
						
						
						
						
						
					 | 
					
						2017-02-28 11:35:56 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zhuxiang
							
						 
					 | 
					
						
						
						
						
							
						
						
							c78fe71177
							
						
					 | 
					
						
						
							
							done
						
						
						
						
						
						
					 | 
					
						2017-02-28 10:24:33 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								cookfront
							
						 
					 | 
					
						
						
						
						
							
						
						
							8cc5fa5007
							
						
					 | 
					
						
						
							
							zanui demos
						
						
						
						
						
						
					 | 
					
						2017-02-27 16:54:37 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								pangxie1991
							
						 
					 | 
					
						
						
						
						
							
						
						
							7d95d626a5
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/master' into hotfix/waterfall
						
						
						
						
						
						
					 | 
					
						2017-02-27 10:35:19 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								cookfront
							
						 
					 | 
					
						
						
						
						
							
						
						
							a8bbc42cda
							
						
					 | 
					
						
						
							
							panel component
						
						
						
						
						
						
					 | 
					
						2017-02-26 19:30:40 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								cookfront
							
						 
					 | 
					
						
						
						
						
							
						
						
							9ee6c4bf59
							
						
					 | 
					
						
						
							
							card component
						
						
						
						
						
						
					 | 
					
						2017-02-26 18:50:34 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zhuxiang
							
						 
					 | 
					
						
						
						
						
							
						
						
							44600789dc
							
						
					 | 
					
						
						
							
							badge css done
						
						
						
						
						
						
					 | 
					
						2017-02-26 15:42:19 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								cookfront
							
						 
					 | 
					
						
						
						
						
							
						
						
							7bfc4f4323
							
						
					 | 
					
						
						
							
							build config
						
						
						
						
						
						
					 | 
					
						2017-02-26 11:55:16 +08:00 | 
					
					
						
						
							
							
							
						
					 |