Commit Graph

5506 Commits

Author SHA1 Message Date
偏右
9b3b20ae3e Merge branch 'master' of github.com:ant-design/ant-design 2016-05-23 13:21:01 +08:00
afc163
145e0f5257 update Changelog 2016-05-23 13:20:08 +08:00
afc163
25c1dc1cde update Changelog 2016-05-23 12:02:31 +08:00
偏右
e78d424854 Merge branch 'master' of gitlab.alipay-inc.com:react-ui/ant-design 2016-05-23 11:52:19 +08:00
偏右
4ba3cd847d Merge branch 'master' of github.com:ant-design/ant-design 2016-05-23 11:39:25 +08:00
afc163
057713c889 Fix site style 2016-05-23 11:35:09 +08:00
afc163
a2736da2bd fix new version Modal 2016-05-22 14:30:22 +08:00
afc163
b06cdd08c3 Fix row-flex-space-around, close #1781 2016-05-22 01:52:26 +08:00
afc163
b2cb8a0f01 Merge branch 'ecofe-master' 2016-05-21 21:45:42 +08:00
afc163
5960ecab7a fix code style 2016-05-21 21:45:07 +08:00
afc163
2464d2acfc Merge branch 'master' of https://github.com/ecofe/ant-design into ecofe-master 2016-05-21 21:44:01 +08:00
afc163
43cf39d9a0 put icon into emptyText, close #1759 2016-05-21 18:53:49 +08:00
afc163
6944a8e7c1 Fix fixed Table align and bordered style, close #1740 2016-05-21 18:08:09 +08:00
afc163
74c0cb97ab fix link 2016-05-20 17:27:25 +08:00
afc163
a8fd9fc1ba code style 2016-05-20 14:26:44 +08:00
afc163
800b6801e8 support other props like style in Spin 2016-05-20 14:25:02 +08:00
afc163
91a8712bfa Merge branch 'master' of github.com:ant-design/ant-design 2016-05-20 14:19:41 +08:00
ddcat1115
102ae62f45 fix #1643 (#1785) 2016-05-20 14:19:09 +08:00
afc163
e524f16361 improve Row children render (#1746) 2016-05-20 13:55:00 +08:00
afc163
c9e8423c7e Fix site style, close #1789 2016-05-20 13:23:51 +08:00
afc163
01705e264e revert d450db8 2016-05-20 11:20:34 +08:00
afc163
115e064a5b revert package main field 2016-05-20 11:06:36 +08:00
afc163
4bdc02b5d2 Merge branch 'master' of github.com:ant-design/ant-design 2016-05-19 23:51:10 +08:00
afc163
d450db8bd4 remove unused babelrc 2016-05-19 23:49:47 +08:00
Leon Shi
f15a28c9f0 docs: update Select's documentation (#1780) 2016-05-19 23:37:22 +08:00
Wei Zhu
b9cbb21f55 defaultDuration should be 4.5 seconds (#1778) 2016-05-19 20:40:47 +08:00
afc163
5c9b4b4296 update select demo 2016-05-19 18:05:35 +08:00
Eric
8ba9f0be54 docs : set select width to fit its container (#1775) 2016-05-19 16:32:41 +08:00
afc163
57e5b4f382 Merge branch 'master' of github.com:ant-design/ant-design 2016-05-19 15:38:37 +08:00
afc163
6a1e7278fa Fix combobox Select optionLabelProp, close #1773 2016-05-19 15:37:33 +08:00
Leon Shi
25acdfd29a Update Changelog (#1770) 2016-05-19 15:28:45 +08:00
afc163
b15ae59101 Fix lots of Form style 2016-05-19 15:21:48 +08:00
afc163
568e79d878 fix select placeholder position 2016-05-19 15:08:02 +08:00
afc163
05c67d6f01 update input demo 2016-05-19 14:43:10 +08:00
afc163
a73e28ca6c InputGroup width 100%, close #1769 2016-05-19 14:43:01 +08:00
Leon Shi
a5c50ec1c7 Merge pull request #1767 from ddcat1115/fix#1695
fix #1695 add demo & doc
2016-05-19 13:53:09 +08:00
ddcat1115
02ce67d44c fix #1695 add demo & doc 2016-05-19 13:45:18 +08:00
偏右
0fc1cebd5b Add si yml 2016-05-19 12:08:23 +08:00
afc163
239eaca72c fix doc, close #1761 2016-05-19 11:19:09 +08:00
afc163
f1817e1a9e clear style 2016-05-19 11:12:05 +08:00
Leon Shi
069ce42565 Merge pull request #1756 from superRaytin/changelog-for-1.1.0
Update 1.1.0 Changelog
2016-05-18 21:36:31 +08:00
Leon Shi
813feaa860 Update 1.1.0 Changelog 2016-05-18 21:24:05 +08:00
Leon Shi
8eb9da7cf4 bump 1.1.0 2016-05-18 21:05:50 +08:00
Leon Shi
57ed9102f9 Merge pull request #1755 from superRaytin/changelog-for-1.1.0
Add 1.1.0 Changelog
2016-05-18 21:03:11 +08:00
Leon Shi
87e8cb7f5c Merge pull request #1722 from kagawagao/master
fix Form style bug
2016-05-18 21:00:25 +08:00
Leon Shi
e930c5c918 Update 1.1.0 Changelog 2016-05-18 20:37:19 +08:00
Leon Shi
f2d04adf4d Add 1.1.0 Changelog 2016-05-18 20:28:23 +08:00
afc163
884f6510b2 Fix confirm icon color, close #1753 2016-05-18 19:07:14 +08:00
afc163
a15b601e6d Fix fixed modal, close #1751 2016-05-18 18:55:50 +08:00
Leon Shi
208392a6aa Merge pull request #1735 from ant-design/fix-input-size
fix: Input[size] should be configurable, close: #1732
2016-05-18 17:36:29 +08:00