Commit Graph

9851 Commits

Author SHA1 Message Date
nikogu
95245c21a7 bump 2.13.2 2017-09-17 00:56:30 +08:00
Shubham Kanodia
989b2e2041 Added react and react-dom as peerDeps (#7592)
* Added react and react-dom as peerDeps

* Added react ~0.14.0 as a valid peerDependency
2017-09-16 23:44:20 +08:00
afc163
30c437c83e Fix simple pagination style, close #7634 2017-09-16 13:20:35 +08:00
Khalifa Lame
429a9714d5 Update Avatar English doc (#7627)
fixed typos.
2017-09-16 11:29:51 +08:00
Khalifa Lame
81e3429955 Update Badge English doc (#7628)
* Update Badge English doc

Fixed typos.

* Update index.en-US.md

Reverted some changes after studying the component.
2017-09-16 11:29:38 +08:00
Khalifa Lame
05fbdd0959 Update Calendar English doc (#7629)
Fixed typos.
2017-09-16 11:29:05 +08:00
Khalifa Lame
a4637526b9 Update Card English doc (#7630)
Fixed typos.
2017-09-16 11:28:18 +08:00
Khalifa Lame
11c0683baa Update Carousel English doc (#7631)
Fixed typos.
2017-09-16 11:27:46 +08:00
Khalifa Lame
eb663f0084 Update Collapse English doc (#7632)
Fixed typos.
2017-09-16 11:27:15 +08:00
Khalifa Lame
fdfb4ba843 Update Popover English doc (#7633)
Fixed typos.
2017-09-16 11:26:22 +08:00
afc163
b59d776554 Merge branch 'antd-3.0' of github.com:ant-design/ant-design into antd-3.0 2017-09-15 22:53:43 +08:00
afc163
0a3f6822f6 Fix zIndex types, ref #7624 2017-09-15 22:51:55 +08:00
afc163
ea2c113530 Fix zIndex types, ref #7624 2017-09-15 22:51:03 +08:00
afc163
823e07bc75 Merge branch 'master' into antd-3.0 2017-09-15 21:44:39 +08:00
afc163
11a6cd51a2 Fix zIndex types, close #7622 2017-09-15 21:41:32 +08:00
afc163
5f938a6818 update template.html 2017-09-15 21:40:13 +08:00
afc163
641f1ddeeb Add link 2017-09-15 21:37:17 +08:00
afc163
f36bc02ac3 Add next.js demo link 2017-09-15 21:14:29 +08:00
afc163
6236641c74 Fix broken collapsed MenuGroup, close #7109 2017-09-15 20:37:11 +08:00
偏右
dab6f43c02 Feat search enter button (#7620)
* Add enterButton for Input.Search

close #7596

* update snapshot
2017-09-15 17:03:43 +08:00
Wei Zhu
250c7a9c68 Revert "Mock rc-trigger"
This reverts commit 9d2c91598b.
2017-09-15 16:42:25 +08:00
Wei Zhu
9d2c91598b Mock rc-trigger
Ref #5522
2017-09-15 16:14:26 +08:00
delesseps
174c98cdca Add focus and blur support to InputNumber (#7615)
* Add focus support to InputNumber

* Convert string ref to private ref

* Added blur method and fixed linting
2017-09-15 15:47:06 +08:00
afc163
ea5ccce90d Merge branch 'master' into antd-3.0 2017-09-15 11:16:19 +08:00
afc163
9df6e06d70 fix lint 2017-09-15 11:14:22 +08:00
afc163
5ac468167d Fix title and extra content position of narrow card
close #7604
2017-09-15 10:57:08 +08:00
afc163
b36df9da2b update tree controlled demo 2017-09-15 10:57:07 +08:00
Wei Zhu
6acf6fc643 Use snapshot test for grid 2017-09-15 10:56:00 +08:00
Wei Zhu
2437ca419e Use snapshot test 2017-09-15 10:50:45 +08:00
Wei Zhu
579becd894 Update snapshot 2017-09-15 10:03:46 +08:00
afc163
eb62c44564 Fix #7587 2017-09-15 09:55:00 +08:00
afc163
9e319990d2 update snapshot 2017-09-14 18:09:30 +08:00
afc163
ae87b663bf Tweak tree demo 2017-09-13 22:18:44 +08:00
afc163
89ce2254af Improve tree node loading icon position, close #7584 2017-09-13 22:17:13 +08:00
afc163
77d64971e5 Refactor tree loadData demo 2017-09-13 22:06:53 +08:00
afc163
461470ebc6 fix demo snapshot 2017-09-13 19:43:05 +08:00
afc163
9b715f0b90 Fix form demo, close #7547 2017-09-13 18:03:56 +08:00
Mitchell Demler
298a60f13b chore: add validateFirst to fieldDecorator options (#7573) 2017-09-13 14:49:59 +08:00
afc163
2e8e9ccf61 Merge branch 'master' into antd-3.0 2017-09-13 14:29:01 +08:00
afc163
f321596e04 Revert empty style of table
ref #7142

close https://github.com/react-component/table/issues/163
2017-09-13 14:26:02 +08:00
偏右
e57cf5ff80 Update README.md 2017-09-12 19:00:09 +08:00
jljsj
aea18c3627 add padding !important, restore menu retraction animate
Conflicts:
	components/menu/style/index.less
2017-09-12 16:51:17 +08:00
jiang
2570ba8fe6 Menu anim (#7567)
* update menu icon animate

* add padding !important, restore menu retraction animate

* update dropdown arrow
2017-09-12 16:46:33 +08:00
Wei Zhu
2a4adeef46 Upgrade antd-tools 2017-09-12 11:51:43 +08:00
afc163
b24483545c Merge branch 'master' into antd-3.0 2017-09-12 09:41:51 +08:00
Stefan Paunovic
0ac7ccaa8f feat: add is_IS locale (#7561) 2017-09-12 09:10:42 +08:00
Bilal Sirazitdinov
5bb45279bb chore: GetFieldDecoratorOptions missing property - normalize (#7562) 2017-09-12 09:08:47 +08:00
afc163
9f484f9bf0 react-codemirror => react-codemirror2 2017-09-11 16:24:09 +08:00
afc163
bb2c2036ba update button size demo 2017-09-11 15:29:23 +08:00
Wei Zhu
1cdf0d9141 Fix issue link 2017-09-11 14:39:38 +08:00