198 Commits

Author SHA1 Message Date
niunai
aa361a0ca6 Merge branch 'master' of gitlab.qima-inc.com:fe/zanui-vue 2017-03-03 14:45:06 +08:00
niunai
ef57909f09 更新eslint规则 2017-03-03 14:45:03 +08:00
cookfront
c794949c8d [release] 0.0.13 v0.0.13 2017-03-03 10:22:56 +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
zhangmin
0e8b918f3e Merge branch 'hotfix/switch_loading_fix' into 'master'
Hotfix/switch loading fix

loading switch 更新

See merge request !8
2017-03-02 20:01:26 +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
8442a34f92 [release] 0.0.12 v0.0.12 2017-03-02 19:43:04 +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
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
jiangruowei
7c6bfc6714 fix: minor fix 2017-03-02 17:29:50 +08:00
jiangruowei
bbf787218f feat: ui tweaks 2017-03-02 17:21:20 +08:00
cookfront
1096a4da00 [release] 0.0.11 v0.0.11 2017-03-02 16:18:46 +08:00
cookfront
b69dce095d [build] 0.0.11 2017-03-02 16:18:45 +08:00
cookfront
c1135357ea cell fix 2017-03-02 16:17:47 +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
3fa1e1021b [release] 0.0.10 v0.0.10 2017-03-02 14:00:06 +08:00
cookfront
d2168b8143 [build] 0.0.10 2017-03-02 14:00:05 +08:00
cookfront
c8f7888dd2 step component 2017-03-02 13:59:27 +08:00
cookfront
12c80402a8 [release] 0.0.9 v0.0.9 2017-03-02 11:30:33 +08:00
cookfront
ac37da54f1 [build] 0.0.9 2017-03-02 11:30:32 +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
b9716a4dab build docs 2017-03-01 19:27:38 +08:00
cookfront
d4ae6f8c69 [release] 0.0.8 v0.0.8 2017-03-01 19:26:21 +08:00
cookfront
aceec34845 [build] 0.0.8 2017-03-01 19:26:20 +08:00
cookfront
e3c65c3ec8 step component 2017-03-01 19:24:54 +08:00
zhangmin
bd24b22203 Merge branch 'hotfix/switch_loading_fix' into 'master'
Hotfix/switch loading fix



See merge request !6
2017-03-01 17:06:43 +08:00
jiangruowei
ec168a9b9c Merge branch 'master' into hotfix/switch_loading_fix 2017-03-01 17:04:54 +08:00
zhangmin
f5564a0d61 Merge branch 'dev/badge_search' into 'master'
Dev/badge search

张大哥合一下我的组件

See merge request !7
2017-03-01 17:01:29 +08:00
zhuxiang
a9b4b6a27b done 2017-03-01 15:51:31 +08:00
zhuxiang
dc2d685a34 done 2017-03-01 15:40:08 +08:00
cookfront
7a3785c31b fix css 2017-03-01 15:21:31 +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
jiangruowei
deeffc35a8 fix: fix doc 2017-03-01 11:52:26 +08:00
jiangruowei
d7e78352b7 fix: 修复loading偏移问题 2017-03-01 11:48:15 +08:00
jiangruowei
a6c3e4becd fix: loading style change 2017-03-01 11:43:39 +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