| 
							
							
								 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 |  | 
			
				
					| 
							
							
								 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 | 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 | 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 | 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 | 09cf3d1c25 | fix:switch方向改变&rename | 2017-02-28 11:35:56 +08:00 |  | 
			
				
					| 
							
							
								 niunai | 1c81270de2 | build docs | 2017-02-28 10:40:15 +08:00 |  | 
			
				
					| 
							
							
								 pangxie1991 | 5cb93982b4 | 文档修改 | 2017-02-28 10:29:46 +08:00 |  | 
			
				
					| 
							
							
								 zhuxiang | c78fe71177 | done | 2017-02-28 10:24:33 +08:00 |  | 
			
				
					| 
							
							
								 cookfront | 837d5249c0 | zanui router redirect | 2017-02-28 10:20:01 +08:00 |  | 
			
				
					| 
							
							
								 cookfront | 39b5472f6a | build docs | 2017-02-27 21:39:48 +08:00 |  | 
			
				
					| 
							
							
								 cookfront | d016b9e335 | remove demo block | 2017-02-27 21:36:36 +08:00 |  | 
			
				
					| 
							
							
								 cookfront | 10ed5982f6 | remove demo block | 2017-02-27 21:35:17 +08:00 |  | 
			
				
					| 
							
							
								 niunai | 5c085f2fb7 | fix dev | 2017-02-27 20:23:53 +08:00 |  | 
			
				
					| 
							
							
								 cookfront | c5d8ed2600 | rename zanui | 2017-02-27 18:10:46 +08:00 |  | 
			
				
					| 
							
							
								 cookfront | cf3e73bf0d | zanui demos | 2017-02-27 17:40:47 +08:00 |  | 
			
				
					| 
							
							
								 cookfront | fc45374d54 | demos | 2017-02-27 17:12:47 +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 |  | 
			
				
					| 
							
							
								 pangxie1991 | 787ff255b8 | 瀑布流加载功能实现 && 文档补全 | 2017-02-26 17:22:53 +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 |  | 
			
				
					| 
							
							
								 cookfront | cc44781dc0 | Merge branch 'master' of gitlab.qima-inc.com:fe/oxygen | 2017-02-24 19:07:52 +08:00 |  | 
			
				
					| 
							
							
								 cookfront | 333012b8d2 | components package.json | 2017-02-24 19:07:43 +08:00 |  | 
			
				
					| 
							
							
								 niunai | bdf8db4212 | Merge branch 'master' of gitlab.qima-inc.com:fe/oxygen | 2017-02-24 18:08:17 +08:00 |  |