22 Commits

Author SHA1 Message Date
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
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
cookfront
f2260deaa3 radio component 2017-02-28 16:32:26 +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
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