Commit Graph

638 Commits

Author SHA1 Message Date
tangjinzhou
fe12a8da37 fix 2017-11-08 17:39:16 +08:00
wanlei
e712274bd1 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	components/index.js
2017-11-07 14:43:48 +08:00
wanlei
0c3b3ad344 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	components/index.js
2017-11-07 14:43:48 +08:00
wanlei
7e6374fc3c update: [grid] full demo supported :octocat: 2017-11-07 14:41:41 +08:00
wanlei
748c8dc782 update: [grid] full demo supported :octocat: 2017-11-07 14:41:41 +08:00
wangxueliang
205c9345d6 pagination showTotal 2017-11-07 14:16:17 +08:00
wangxueliang
b838be1d3e pagination showTotal 2017-11-07 14:16:17 +08:00
wangxueliang
94fe1545c4 Merge branch 'master' of https://github.com/vueComponent/ant-design 2017-11-07 12:03:00 +08:00
tangjinzhou
284126e91d add radio demo 2017-11-07 12:04:50 +08:00
wangxueliang
192a3fb1d6 Merge branch 'master' of https://github.com/vueComponent/ant-design 2017-11-07 12:03:00 +08:00
tangjinzhou
68c976cc39 add radio demo 2017-11-07 12:04:50 +08:00
wangxueliang
ba012c2ea6 merge master 2017-11-07 12:02:33 +08:00
wangxueliang
78da34587d merge master 2017-11-07 12:02:33 +08:00
tangjinzhou
13d0ae378e add radio demo 2017-11-07 11:58:47 +08:00
tangjinzhou
efcf89fd91 add radio demo 2017-11-07 11:58:47 +08:00
wangxueliang
c6f6bcfe9a pagination@v0.0.1 2017-11-07 11:57:16 +08:00
wangxueliang
922f6fbdd3 pagination@v0.0.1 2017-11-07 11:57:16 +08:00
tangjinzhou
f2ea0ccc0f Merge branch 'master' of https://github.com/vueComponent/ant-design 2017-11-06 17:55:27 +08:00
tangjinzhou
e01fac4a5d Merge branch 'master' of https://github.com/vueComponent/ant-design 2017-11-06 17:55:27 +08:00
tangjinzhou
f364b5bcb6 add context 2017-11-06 17:46:08 +08:00
tangjinzhou
373d073aad add context 2017-11-06 17:46:08 +08:00
wanlei
59f1d5b4db update: [tooltip] more API supported 2017-11-06 12:13:36 +08:00
wanlei
d79ac1e85d update: [tooltip] more API supported 2017-11-06 12:13:36 +08:00
wanlei
7427f8099f fix: [tooltip] new formula 2017-11-03 20:55:41 +08:00
wanlei
3f09f3f6dc fix: [tooltip] new formula 2017-11-03 20:55:41 +08:00
wanlei
e33d11ab7e Merge remote-tracking branch 'origin/master' 2017-11-03 20:53:22 +08:00
wanlei
b4c38ea7a9 Merge remote-tracking branch 'origin/master' 2017-11-03 20:53:22 +08:00
wanlei
c0c246ed11 fix: [tooltip] different placement 2017-11-03 20:53:01 +08:00
wanlei
08ad3bc78a fix: [tooltip] different placement 2017-11-03 20:53:01 +08:00
tangjinzhou
beefc338b3 Merge branch 'master' of https://github.com/vueComponent/ant-design 2017-11-03 18:46:28 +08:00
tangjinzhou
d4a40b44d0 Merge branch 'master' of https://github.com/vueComponent/ant-design 2017-11-03 18:46:28 +08:00
tangjinzhou
ba79c3eee1 fix demo 2017-11-03 18:46:18 +08:00
tangjinzhou
036d0087ee fix demo 2017-11-03 18:46:18 +08:00
wanlei
09382b3e50 fix: [tooltip] mount every time 2017-11-03 18:06:00 +08:00
wanlei
ad756499b3 fix: [tooltip] mount every time 2017-11-03 18:06:00 +08:00
wangxueliang
2122b29134 Merge branches 'master' and 'master' of https://github.com/vueComponent/ant-design 2017-11-03 17:11:24 +08:00
wangxueliang
c5cb89277b Merge branches 'master' and 'master' of https://github.com/vueComponent/ant-design 2017-11-03 17:11:24 +08:00
wangxueliang
a971c21460 add rate demo 2017-11-03 17:10:38 +08:00
wangxueliang
bff24a4c9d add rate demo 2017-11-03 17:10:38 +08:00
wanlei
67b357893a fix: [typo] case 2017-11-03 15:52:22 +08:00
wanlei
6c2f36b908 fix: [typo] case 2017-11-03 15:52:22 +08:00
wanlei
0874dd1640 Merge remote-tracking branch 'origin/master' 2017-11-03 15:37:05 +08:00
wanlei
1da593a32a Merge remote-tracking branch 'origin/master' 2017-11-03 15:37:05 +08:00
wanlei
0651911ce7 update: [Tooltip] receive updates 2017-11-03 15:35:25 +08:00
wanlei
238135552b update: [Tooltip] receive updates 2017-11-03 15:35:25 +08:00
tangjinzhou
c78a5977b3 fix 2017-11-03 12:06:47 +08:00
tangjinzhou
c038b9daa7 fix 2017-11-03 12:06:47 +08:00
tangjinzhou
9921ed1859 vue router 2017-11-03 12:04:39 +08:00
tangjinzhou
679d87b75b vue router 2017-11-03 12:04:39 +08:00
wangxueliang
65b36f3bff init pagination 2017-11-03 11:08:46 +08:00