cookfront
							
						 
					 | 
					
						
						
						
						
							
						
						
							6376b0b1ab
							
						
					 | 
					
						
						
							
							popup
						
						
						
						
						
						
					 | 
					
						2017-03-08 19:48:27 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								cookfront
							
						 
					 | 
					
						
						
						
						
							
						
						
							8b9674843c
							
						
					 | 
					
						
						
							
							[build] 0.0.20
						
						
						
						
						
						
					 | 
					
						2017-03-08 17:32:29 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								cookfront
							
						 
					 | 
					
						
						
						
						
							
						
						
							c11ed958f9
							
						
					 | 
					
						
						
							
							[build] 0.0.19
						
						
						
						
						
						
					 | 
					
						2017-03-08 15:25:43 +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
							
						 
					 | 
					
						
						
						
						
							
						
						
							61999ca6e3
							
						
					 | 
					
						
						
							
							[build] 0.0.18
						
						
						
						
						
						
					 | 
					
						2017-03-08 15:03:18 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								cookfront
							
						 
					 | 
					
						
						
						
						
							
						
						
							1bf07c40e9
							
						
					 | 
					
						
						
							
							[build] 0.0.17
						
						
						
						
						
						
					 | 
					
						2017-03-07 17:58:45 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zhuxiang
							
						 
					 | 
					
						
						
						
						
							
						
						
							14110f6c90
							
						
					 | 
					
						
						
							
							done
						
						
						
						
						
						
					 | 
					
						2017-03-07 16:40:06 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zhuxiang
							
						 
					 | 
					
						
						
						
						
							
						
						
							fdf2868cc7
							
						
					 | 
					
						
						
							
							done
						
						
						
						
						
						
					 | 
					
						2017-03-07 15:00:05 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								cookfront
							
						 
					 | 
					
						
						
						
						
							
						
						
							c37e3f0c98
							
						
					 | 
					
						
						
							
							[build] 0.0.15
						
						
						
						
						
						
					 | 
					
						2017-03-07 10:32:01 +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
							
						 
					 | 
					
						
						
						
						
							
						
						
							8a6b3b796e
							
						
					 | 
					
						
						
							
							[build] 0.0.14
						
						
						
						
						
						
					 | 
					
						2017-03-03 16:48:45 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								cookfront
							
						 
					 | 
					
						
						
						
						
							
						
						
							05edb4a391
							
						
					 | 
					
						
						
							
							fix lint
						
						
						
						
						
						
					 | 
					
						2017-03-03 16:40:48 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zhuxiang
							
						 
					 | 
					
						
						
						
						
							
						
						
							522830aac5
							
						
					 | 
					
						
						
							
							tabs almost
						
						
						
						
						
						
					 | 
					
						2017-03-03 14:08:33 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								cookfront
							
						 
					 | 
					
						
						
						
						
							
						
						
							b9d34f95b5
							
						
					 | 
					
						
						
							
							[build] 0.0.12
						
						
						
						
						
						
					 | 
					
						2017-03-02 19:43:03 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								cookfront
							
						 
					 | 
					
						
						
						
						
							
						
						
							448d920c64
							
						
					 | 
					
						
						
							
							fix lint
						
						
						
						
						
						
					 | 
					
						2017-03-02 19:39:26 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								cookfront
							
						 
					 | 
					
						
						
						
						
							
						
						
							b69dce095d
							
						
					 | 
					
						
						
							
							[build] 0.0.11
						
						
						
						
						
						
					 | 
					
						2017-03-02 16:18:45 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								cookfront
							
						 
					 | 
					
						
						
						
						
							
						
						
							d2168b8143
							
						
					 | 
					
						
						
							
							[build] 0.0.10
						
						
						
						
						
						
					 | 
					
						2017-03-02 14:00:05 +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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								cookfront
							
						 
					 | 
					
						
						
						
						
							
						
						
							e0be5b962e
							
						
					 | 
					
						
						
							
							checkbox component
						
						
						
						
						
						
					 | 
					
						2017-03-01 11:15:15 +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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								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
							
						 
					 | 
					
						
						
						
						
							
						
						
							7f6d7a24dd
							
						
					 | 
					
						
						
							
							fix popup
						
						
						
						
						
						
					 | 
					
						2017-02-28 11:55:18 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zhuxiang
							
						 
					 | 
					
						
						
						
						
							
						
						
							c78fe71177
							
						
					 | 
					
						
						
							
							done
						
						
						
						
						
						
					 | 
					
						2017-02-28 10:24:33 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								niunai
							
						 
					 | 
					
						
						
						
						
							
						
						
							ec16d5246d
							
						
					 | 
					
						
						
							
							[build] 0.0.4
						
						
						
						
						
						
					 | 
					
						2017-02-27 21:13:13 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								niunai
							
						 
					 | 
					
						
						
						
						
							
						
						
							2c83089f81
							
						
					 | 
					
						
						
							
							[build] 0.0.3
						
						
						
						
						
						
					 | 
					
						2017-02-27 21:11:53 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								niunai
							
						 
					 | 
					
						
						
						
						
							
						
						
							4e5ec463a0
							
						
					 | 
					
						
						
							
							[build] 0.0.2
						
						
						
						
						
						
					 | 
					
						2017-02-27 21:10:56 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								niunai
							
						 
					 | 
					
						
						
						
						
							
						
						
							5c085f2fb7
							
						
					 | 
					
						
						
							
							fix dev
						
						
						
						
						
						
					 | 
					
						2017-02-27 20:23:53 +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
							
						 
					 | 
					
						
						
						
						
							
						
						
							9ee6c4bf59
							
						
					 | 
					
						
						
							
							card component
						
						
						
						
						
						
					 | 
					
						2017-02-26 18:50:34 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								pangxie1991
							
						 
					 | 
					
						
						
						
						
							
						
						
							787ff255b8
							
						
					 | 
					
						
						
							
							瀑布流加载功能实现 && 文档补全
						
						
						
						
						
						
					 | 
					
						2017-02-26 17:22:53 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zhuxiang
							
						 
					 | 
					
						
						
						
						
							
						
						
							44600789dc
							
						
					 | 
					
						
						
							
							badge css done
						
						
						
						
						
						
					 | 
					
						2017-02-26 15:42:19 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								cookfront
							
						 
					 | 
					
						
						
						
						
							
						
						
							e9a105b76d
							
						
					 | 
					
						
						
							
							popup component
						
						
						
						
						
						
					 | 
					
						2017-02-24 19:32:08 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								cookfront
							
						 
					 | 
					
						
						
						
						
							
						
						
							042b286583
							
						
					 | 
					
						
						
							
							popup component
						
						
						
						
						
						
					 | 
					
						2017-02-24 19:26:30 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								cookfront
							
						 
					 | 
					
						
						
						
						
							
						
						
							75b86832f0
							
						
					 | 
					
						
						
							
							remove popup scrollbar width
						
						
						
						
						
						
					 | 
					
						2017-02-24 19:13:14 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								cookfront
							
						 
					 | 
					
						
						
						
						
							
						
						
							eac9f12614
							
						
					 | 
					
						
						
							
							remove popup scrollbar width
						
						
						
						
						
						
					 | 
					
						2017-02-24 19:12:05 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								cookfront
							
						 
					 | 
					
						
						
						
						
							
						
						
							f524d6ccd2
							
						
					 | 
					
						
						
							
							zanui css build
						
						
						
						
						
						
					 | 
					
						2017-02-24 17:46:56 +08:00 | 
					
					
						
						
							
							
							
						
					 |