Commit Graph

3424 Commits

Author SHA1 Message Date
tjz
ca4a6b9160 fix 2018-02-03 19:48:03 +08:00
tjz
b88193e31d fix 2018-02-03 11:20:05 +08:00
tangjinzhou
35a8c72c0c fix 2018-02-02 19:09:38 +08:00
tangjinzhou
b2394d66b7 Merge branch 'master' of https://github.com/vueComponent/ant-design 2018-02-02 17:42:20 +08:00
tangjinzhou
0c4c3100f6 fix 2018-02-02 17:42:05 +08:00
wangxueliang
553037d161 add collapse header slot 2018-02-02 17:19:42 +08:00
wangxueliang
1b50707da8 fix collapse 2018-02-02 16:34:27 +08:00
wangxueliang
aa519f6014 fix 格式化 2018-02-01 18:32:17 +08:00
wangxueliang
fdc40264b4 add collapse and demo 2018-02-01 18:18:05 +08:00
tangjinzhou
8401441e4e fix chrome bug 2018-02-01 17:07:44 +08:00
tangjinzhou
12035c048c fix 2018-01-31 11:38:31 +08:00
tangjinzhou
9b2669ba99 fix 2018-01-31 10:30:09 +08:00
tangjinzhou
5cf383987c add divider 2018-01-30 18:22:41 +08:00
tangjinzhou
94311c3b48 fix 2018-01-30 17:59:34 +08:00
tangjinzhou
bd0e0b4653 fix 2018-01-30 17:17:40 +08:00
tangjinzhou
6b7b035a84 fix 2018-01-30 17:13:44 +08:00
tangjinzhou
d01d6eac06 update style 2018-01-30 16:52:56 +08:00
tangjinzhou
7da25d6075 fix 2018-01-29 19:05:36 +08:00
tangjinzhou
bbc4a235a2 fix 2018-01-29 19:02:18 +08:00
tangjinzhou
804a1eba18 add dropdown 2018-01-29 18:57:20 +08:00
wangxueliang
aa1bcfe5db fix card dynamic demo 2018-01-29 09:55:57 +08:00
wangxueliang
8a91d4a17b fix card dynamic 2018-01-28 20:30:25 +08:00
wangxueliang
4042b51761 Merge branch 'master' of https://github.com/vueComponent/ant-design 2018-01-26 14:29:32 +08:00
wangxueliang
33b936bc9c card demo 2018-01-26 13:48:20 +08:00
tangjinzhou
8135892318 fix 2018-01-25 18:27:41 +08:00
tangjinzhou
d6a0c48383 fix 2018-01-25 18:23:40 +08:00
tangjinzhou
17373b2578 fix 2018-01-25 17:51:23 +08:00
tangjinzhou
fd31801281 fix 2018-01-25 17:40:46 +08:00
tangjinzhou
ebc5d64604 Merge branch 'master' of https://github.com/vueComponent/ant-design 2018-01-25 16:29:40 +08:00
tangjinzhou
5cfc8d4ece add theme 2018-01-25 16:29:23 +08:00
wangxueliang
004764b5f8 merge 2018-01-25 15:29:34 +08:00
wangxueliang
eb86d20fde fix card and routes.js 2018-01-25 15:26:10 +08:00
tjz
46ba224658 fix button demo 2018-01-24 22:53:45 +08:00
tangjinzhou
3bd2eb0b8e fix md 2018-01-24 15:39:21 +08:00
tangjinzhou
cf9c8e585c fix demo 2018-01-23 19:00:20 +08:00
tangjinzhou
864118b47c fix site 2018-01-23 18:55:39 +08:00
tjz
2244a5e550 add 2018-01-22 21:27:37 +08:00
tjz
4d4caa3bc4 fix 2018-01-22 21:26:23 +08:00
tangjinzhou
1ed718b67f
Delete tooltip.vue 2018-01-22 21:24:07 +08:00
tangjinzhou
b15c4c9779
Delete pagination.vue 2018-01-22 21:23:38 +08:00
tjz
9aa3347204 git config core.ignorecase false 2018-01-22 21:18:49 +08:00
tangjinzhou
28866a8eca fix 2018-01-22 11:15:32 +08:00
tjz
c328718acb fix 2018-01-21 11:52:34 +08:00
tjz
12facb0623 tabs support size large 2018-01-20 20:55:37 +08:00
tjz
2a76d2582c fix 2018-01-20 20:32:27 +08:00
tjz
f3c23a2bc1 优化 trigger 2018-01-20 20:24:42 +08:00
wangxueliang
bc61e0f99d card 2018-01-20 14:33:42 +08:00
tangjinzhou
90fd428942 fix 2018-01-19 18:18:17 +08:00
tangjinzhou
e8daeb3f26 add menu demo 2018-01-19 18:01:43 +08:00
tangjinzhou
3d5d001d77 fix 2018-01-19 12:14:07 +08:00
tangjinzhou
c4bc2bf7e5 fix tabs 2018-01-19 11:47:06 +08:00
tangjinzhou
aebed8b169 fix 2018-01-18 18:58:36 +08:00
tangjinzhou
d9c893edb5 fix 2018-01-18 10:43:39 +08:00
tangjinzhou
f9a85a6c41 add menu demo 2018-01-17 19:15:18 +08:00
tangjinzhou
3af108ffcb add menu 2018-01-17 16:12:53 +08:00
tangjinzhou
94b420dbc3 update menu 2018-01-16 19:15:07 +08:00
tangjinzhou
6e3caa6011 fix 2018-01-16 15:42:56 +08:00
tangjinzhou
1b8ecf5656 fix 2018-01-16 15:41:00 +08:00
wangxueliang
d6a8a880c0 merge 2018-01-16 11:15:44 +08:00
wangxueliang
ce13c6db19 fix css 2018-01-16 11:13:22 +08:00
tangjinzhou
127a67d53d fix 2018-01-16 10:42:16 +08:00
tangjinzhou
c8d5082ab6 fix 2018-01-15 19:07:01 +08:00
tangjinzhou
e4d4073ee8 update to 3.1 2018-01-15 18:54:26 +08:00
tangjinzhou
b9dacbb8e4 Merge branch 'master' of https://github.com/vueComponent/ant-design 2018-01-15 17:34:02 +08:00
tangjinzhou
b1e17a0004 add popconfirm 2018-01-15 17:33:34 +08:00
wangxueliang
a40f741f95 merge 2018-01-15 10:57:10 +08:00
wangxueliang
1bbfccae19 breadcrumb 2018-01-15 10:52:16 +08:00
tangjinzhou
5d4f905a2f add popconfirm 2018-01-12 19:04:42 +08:00
tangjinzhou
8612331300 优化 tabs 2018-01-12 17:06:01 +08:00
tangjinzhou
728e26548f add popover 2018-01-12 16:10:41 +08:00
tangjinzhou
0d217db984 fix md 2018-01-11 18:58:58 +08:00
tangjinzhou
9a8eb4d277 add toolTip 2018-01-11 18:53:51 +08:00
tangjinzhou
2c164770b6 add keydown 2018-01-09 14:21:15 +08:00
tangjinzhou
c782de1fe1 fix 2018-01-08 19:10:59 +08:00
tangjinzhou
bbcf1981d1 fix 2018-01-08 19:09:03 +08:00
tangjinzhou
8341fe44fc fix 2018-01-08 18:31:04 +08:00
tangjinzhou
b985efc438 fix 2018-01-04 19:06:54 +08:00
tangjinzhou
066c727e49 fix 2018-01-04 10:35:45 +08:00
tangjinzhou
98240df7a3 fix 2018-01-03 18:30:12 +08:00
tangjinzhou
f8be36593d fix 2018-01-02 19:05:02 +08:00
tangjinzhou
baec906d5c add menu 2017-12-29 18:45:11 +08:00
tangjinzhou
c8d6e4b039 fix 2017-12-29 17:05:12 +08:00
tangjinzhou
280af6d07a Merge branch 'master' of https://github.com/vueComponent/ant-design 2017-12-29 16:52:58 +08:00
tangjinzhou
d070be113b 优化button 2017-12-29 16:51:06 +08:00
wangxueliang
c7c530d6c2 fix demo 2017-12-28 18:46:31 +08:00
tangjinzhou
0df2d31eed fix trigger bug 2017-12-27 18:39:02 +08:00
tangjinzhou
68f1bc65fc add hasProp 2017-12-27 18:15:11 +08:00
tangjinzhou
7d52bd4852 fix 2017-12-27 16:46:45 +08:00
tangjinzhou
9f47ad14d7 fix 2017-12-27 16:45:32 +08:00
tangjinzhou
63ff2f83aa trigger 2017-12-27 16:13:26 +08:00
tangjinzhou
b9fe970682 fix 2017-12-26 19:04:28 +08:00
tangjinzhou
2e07f98d40 trigger 2017-12-25 18:08:36 +08:00
tangjinzhou
78d3332bb3 add trigger 2017-12-22 18:43:28 +08:00
wangxueliang
4337af9308 fix demo 2017-12-20 10:56:21 +08:00
tangjinzhou
693b033b46 add md 2017-12-15 12:12:34 +08:00
tangjinzhou
a8c4f7662a fix 2017-12-14 12:15:48 +08:00
tangjinzhou
d1a8d0d8c3 fix 2017-12-14 12:13:15 +08:00
wangxueliang
bdafa72319 fix 2017-12-14 10:17:07 +08:00
wangxueliang
13d5f32bd8 Merge branch 'master' of https://github.com/vueComponent/ant-design 2017-12-14 10:12:33 +08:00
tangjinzhou
55048539c5 fix 2017-12-14 10:13:30 +08:00
wangxueliang
844c3043e3 fix rate 2017-12-14 10:12:19 +08:00
wangxueliang
3b78524e5d fix rate 2017-12-13 17:58:05 +08:00
tangjinzhou
37b40bcd38 fix 2017-12-13 10:06:26 +08:00
tangjinzhou
8736a23884 add align 2017-12-12 15:05:45 +08:00
tangjinzhou
e918a45e03 fix menu 2017-12-12 13:49:02 +08:00
tangjinzhou
fb4a9970ef fix 2017-12-12 11:14:31 +08:00
tangjinzhou
4204283766 优化 2017-12-12 11:08:56 +08:00
tangjinzhou
09500d37eb add menu 2017-12-08 14:31:53 +08:00
tangjinzhou
dfaec7f076 fix tabs 2017-12-08 11:46:53 +08:00
tangjinzhou
4fc9d027f5 fix noop 2017-12-08 09:49:47 +08:00
tangjinzhou
4f9ccead27 add util 2017-12-07 18:33:33 +08:00
tangjinzhou
155624173d fix 2017-12-07 15:11:12 +08:00
tangjinzhou
cbde527457 fix tabs bug 2017-12-07 15:05:33 +08:00
tangjinzhou
f1b6d1d3d1 add input demo 2017-12-07 12:31:12 +08:00
tangjinzhou
b2a4d8c231 fix input 2017-12-07 10:28:17 +08:00
tangjinzhou
f82be7e667 add input 2017-12-06 18:54:20 +08:00
tangjinzhou
fa98dd8086 fix 2017-12-04 11:27:15 +08:00
tangjinzhou
be97d8cd9f fix 2017-12-04 11:13:27 +08:00
tangjinzhou
014b5df5e9 delete refmixin 2017-12-01 19:03:12 +08:00
tangjinzhou
a9a7240c04 add forceRender 2017-12-01 19:02:01 +08:00
tangjinzhou
d2d2f5b173 add demo 2017-12-01 18:48:16 +08:00
tangjinzhou
350001ea14 fix 2017-12-01 12:21:43 +08:00
tangjinzhou
a51b25d920 fix 2017-11-30 19:11:42 +08:00
tangjinzhou
837d4cadeb fix 2017-11-22 15:45:43 +08:00
tangjinzhou
d1d56eedcd fix 2017-11-22 15:05:53 +08:00
tangjinzhou
6156c38200 tabs 2017-11-21 19:15:41 +08:00
wangxueliang
27e9234203 badge init for v1.0 2017-11-16 18:29:02 +08:00
wangxueliang
e57344a4ff fix pagination 2017-11-13 18:49:03 +08:00
wangxueliang
7132ecabf9 fix avatar 2017-11-10 10:28:49 +08:00
wangxueliang
76cbfcc4b2 avatar and fix rate 2017-11-09 18:57:34 +08:00
tangjinzhou
7708672f59 fix rate 2017-11-09 17:24:00 +08:00
tangjinzhou
81e7976a16 add tag 2017-11-09 15:58:53 +08:00
wanlei
8b48d381ce fix: [switch] removed 2017-11-09 10:19:38 +08:00
wanlei
e712274bd1 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
wangxueliang
205c9345d6 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
ba012c2ea6 merge master 2017-11-07 12:02:33 +08:00
tangjinzhou
13d0ae378e 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
tangjinzhou
f2ea0ccc0f 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
wanlei
59f1d5b4db 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
e33d11ab7e 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
tangjinzhou
beefc338b3 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
wanlei
09382b3e50 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
a971c21460 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
0874dd1640 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
tangjinzhou
c78a5977b3 fix 2017-11-03 12:06:47 +08:00
tangjinzhou
9921ed1859 vue router 2017-11-03 12:04:39 +08:00
wangxueliang
65b36f3bff init pagination 2017-11-03 11:08:46 +08:00
wanlei
0548c36866 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	components/index.js
#	examples/index.js
2017-11-02 19:42:03 +08:00
wanlei
c0c2a1894c update: [Tooltip] unsolved animation & transition 2017-11-02 19:40:49 +08:00
wangxueliang
a074865dee fix 2017-11-02 15:19:32 +08:00
wangxueliang
9d7169bf7b optimizion 2017-11-02 15:05:31 +08:00
tangjinzhou
b7d855ba7b Merge branch 'master' of https://github.com/vueComponent/ant-design 2017-11-02 12:07:45 +08:00
tangjinzhou
cf8809864b defaultValue 2017-11-02 12:07:20 +08:00
tangjinzhou
4af93c1207 fix 2017-11-02 11:48:38 +08:00
wangxueliang
ca6be11e2d optimize rate component 2017-11-02 10:56:18 +08:00
tangjinzhou
896fc8e41a Merge branch 'master' of https://github.com/vueComponent/ant-design 2017-11-02 10:42:46 +08:00
tangjinzhou
8a5aa92e72 tab 2017-11-02 10:42:34 +08:00
wangxueliang
8a267f0e32 rate 2017-11-01 17:03:42 +08:00
wanlei
89ac16c28a Merge branch 'test-build'
# Conflicts:
#	.babelrc
#	components/index.js
#	examples/index.js
2017-10-27 15:17:53 +08:00
tangjinzhou
a1c62ad773 radio 2017-10-27 14:56:23 +08:00
tangjinzhou
82c46afe9e radio 2017-10-27 14:04:48 +08:00
wanlei
1301b85bc7 update: [Grid] merged from vue-component/grid 2017-10-27 13:24:22 +08:00
tangjinzhou
9ec6439cca button checkbox 2017-10-26 15:18:08 +08:00