cookfront
							
						 
					 | 
					
						
						
						
						
							
						
						
							a4988f99bc
							
						
					 | 
					
						
						
							
							popup
						
						
						
						
						
						
					 | 
					
						2017-03-08 20:39:09 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								cookfront
							
						 
					 | 
					
						
						
						
						
							
						
						
							6376b0b1ab
							
						
					 | 
					
						
						
							
							popup
						
						
						
						
						
						
					 | 
					
						2017-03-08 19:48:27 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								cookfront
							
						 
					 | 
					
						
						
						
						
							
						
						
							068f6e6ecf
							
						
					 | 
					
						
						
							
							build docs
						
						
						
						
						
						
					 | 
					
						2017-03-08 17:31:41 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								cookfront
							
						 
					 | 
					
						
						
						
						
							
						
						
							99bf210b62
							
						
					 | 
					
						
						
							
							popup
						
						
						
						
						
						
					 | 
					
						2017-03-08 17:20:20 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								cookfront
							
						 
					 | 
					
						
						
						
						
							
						
						
							6d925908bd
							
						
					 | 
					
						
						
							
							build docs
						
						
						
						
						
						
					 | 
					
						2017-03-08 15:26:32 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								cookfront
							
						 
					 | 
					
						
						
						
						
							
						
						
							45c6a8d9ac
							
						
					 | 
					
						
						
							
							build docs
						
						
						
						
						
						
					 | 
					
						2017-03-08 15:26:23 +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
							
						 
					 | 
					
						
						
						
						
							
						
						
							a9e807b976
							
						
					 | 
					
						
						
							
							build docs
						
						
						
						
						
						
					 | 
					
						2017-03-08 15:02:05 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								cookfront
							
						 
					 | 
					
						
						
						
						
							
						
						
							6551e81ec8
							
						
					 | 
					
						
						
							
							picker toolbar
						
						
						
						
						
						
					 | 
					
						2017-03-08 15:00:57 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zhuxiang
							
						 
					 | 
					
						
						
						
						
							
						
						
							89e7d332dc
							
						
					 | 
					
						
						
							
							RM done
						
						
						
						
						
						
					 | 
					
						2017-03-08 13:01:09 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zhuxiang
							
						 
					 | 
					
						
						
						
						
							
						
						
							43e79ccc65
							
						
					 | 
					
						
						
							
							eslint done
						
						
						
						
						
						
					 | 
					
						2017-03-08 12:59:44 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								cookfront
							
						 
					 | 
					
						
						
						
						
							
						
						
							b88b859d8d
							
						
					 | 
					
						
						
							
							build docs
						
						
						
						
						
						
					 | 
					
						2017-03-07 17:57:53 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zhuxiang
							
						 
					 | 
					
						
						
						
						
							
						
						
							14110f6c90
							
						
					 | 
					
						
						
							
							done
						
						
						
						
						
						
					 | 
					
						2017-03-07 16:40:06 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								cookfront
							
						 
					 | 
					
						
						
						
						
							
						
						
							3c66da6f0c
							
						
					 | 
					
						
						
							
							build docs
						
						
						
						
						
						
					 | 
					
						2017-03-07 16:07:28 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zhuxiang
							
						 
					 | 
					
						
						
						
						
							
						
						
							fdf2868cc7
							
						
					 | 
					
						
						
							
							done
						
						
						
						
						
						
					 | 
					
						2017-03-07 15:00:05 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								cookfront
							
						 
					 | 
					
						
						
						
						
							
						
						
							3e474ef451
							
						
					 | 
					
						
						
							
							popup md
						
						
						
						
						
						
					 | 
					
						2017-03-07 11:22:47 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								cookfront
							
						 
					 | 
					
						
						
						
						
							
						
						
							569f0e957f
							
						
					 | 
					
						
						
							
							popup md
						
						
						
						
						
						
					 | 
					
						2017-03-07 11:20:00 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								cookfront
							
						 
					 | 
					
						
						
						
						
							
						
						
							f731d896e0
							
						
					 | 
					
						
						
							
							build docs
						
						
						
						
						
						
					 | 
					
						2017-03-06 22:27:44 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								cookfront
							
						 
					 | 
					
						
						
						
						
							
						
						
							7890938a1d
							
						
					 | 
					
						
						
							
							build docs
						
						
						
						
						
						
					 | 
					
						2017-03-06 21:49:41 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								cookfront
							
						 
					 | 
					
						
						
						
						
							
						
						
							fb4bd2eaea
							
						
					 | 
					
						
						
							
							docs build
						
						
						
						
						
						
					 | 
					
						2017-03-06 19:29:18 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								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
							
						 
					 | 
					
						
						
						
						
							
						
						
							b8a16cabc2
							
						
					 | 
					
						
						
							
							components build
						
						
						
						
						
						
					 | 
					
						2017-03-03 16:13:18 +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
							
						 
					 | 
					
						
						
						
						
							
						
						
							d3f47bc14f
							
						
					 | 
					
						
						
							
							step component
						
						
						
						
						
						
					 | 
					
						2017-03-02 19:37:43 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								cookfront
							
						 
					 | 
					
						
						
						
						
							
						
						
							98d1bc7157
							
						
					 | 
					
						
						
							
							step component
						
						
						
						
						
						
					 | 
					
						2017-03-02 19:37:10 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								cookfront
							
						 
					 | 
					
						
						
						
						
							
						
						
							f03698bc12
							
						
					 | 
					
						
						
							
							build docs
						
						
						
						
						
						
					 | 
					
						2017-03-02 19:28:10 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								cookfront
							
						 
					 | 
					
						
						
						
						
							
						
						
							6dd1675fce
							
						
					 | 
					
						
						
							
							build docs
						
						
						
						
						
						
					 | 
					
						2017-03-02 19:27:40 +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
							
						 
					 | 
					
						
						
						
						
							
						
						
							c8f7888dd2
							
						
					 | 
					
						
						
							
							step component
						
						
						
						
						
						
					 | 
					
						2017-03-02 13:59:27 +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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								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 | 
					
					
						
						
							
							
							
						
					 |