21 Commits

Author	SHA1	Message	Date
jiangruowei	c515965358	merge: merge master	2017-03-15 16:31:00 +08:00
jiangruowei	98071b8634	feat: update toast doc	2017-03-15 16:26:12 +08:00
taiyong	b653859f61	merge: master	2017-03-15 10:50:19 +08:00
cookfront	bfa472e6e5	swipe	2017-03-14 22:53:04 +08:00
taiyong	7d5b336fac	uploader	2017-03-14 18:00:39 +08:00
jiangruowei	5f7e98a547	feat: 添加progress	2017-03-13 21:12:02 +08:00
cookfront	f6b3eb8365	quantity component	2017-03-10 15:09:10 +08:00
zhuxiang	fdf2868cc7	done	2017-03-07 15:00:05 +08:00
cookfront	019bb5c7d8	action sheet	2017-03-06 11:21:27 +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
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	474a324988	tag component	2017-02-28 21:08:50 +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
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	f524d6ccd2	zanui css build	2017-02-24 17:46:56 +08:00