Commit Graph

26739 Commits

Author SHA1 Message Date
勤拭
c2e67f72ed standard format 2015-10-29 16:23:09 +08:00
勤拭
e9cfca0d89 support colspan and rowspan 2015-10-29 15:38:59 +08:00
afc163
3a68e2fe1f update tabs demo 2015-10-29 15:27:43 +08:00
afc163
d375942e4b update tabs demo 2015-10-29 15:23:58 +08:00
偏右
f528017412 Merge pull request #438 from ant-design/develop-0.10.0fortreedynamic
Dynamic Tree
2015-10-29 14:19:30 +08:00
ioldfish
a63360734c demo中去掉propTypes 2015-10-29 14:02:51 +08:00
ioldfish
97942c6f2d Merge branch 'develop-0.10.0' of https://github.com/ant-design/ant-design into develop-0.10.0
Conflicts:
	package.json
2015-10-29 13:42:40 +08:00
偏右
bf28819158 Merge pull request #445 from kevyu/master
remove state items in uploadList.jsx
2015-10-29 10:20:46 +08:00
ioldfish
01bf42d712 Merge branch 'develop-0.10.0' of https://github.com/ant-design/ant-design into develop-0.10.0
Conflicts:
	package.json
2015-10-29 09:55:47 +08:00
Haibin Yu
0d2c6b2505 remove state items in uploadList.jsx 2015-10-29 00:06:39 +08:00
KgTong
852377b6b3 ES6 syntax for spin demo code 2015-10-28 21:40:05 +08:00
afc163
753c01ae18 ES6 syntax for demo code
fix antd.notification
2015-10-28 20:55:49 +08:00
afc163
dffbda521c update datepicker demo 2015-10-28 19:48:32 +08:00
KgTong
7ad9db3eb3 fix IE version logic 2015-10-28 19:39:36 +08:00
KgTong
2e67eae9dd Merge remote-tracking branch 'ant/develop-0.10.0' into feature-spin 2015-10-28 19:33:45 +08:00
KgTong
89517f6e45 support align center and fix compatibility for IE 2015-10-28 19:33:25 +08:00
afc163
fce8ab5e64 0.10.0-beta8 2015-10-28 19:09:15 +08:00
afc163
17afda5028 update demo start-end 2015-10-28 18:35:56 +08:00
afc163
735ed1f89f update iconfont code sample 2015-10-28 18:13:15 +08:00
偏右
1d30992de2 Merge pull request #440 from ant-design/layout-component
layout 组件化
2015-10-28 18:10:55 +08:00
pizn
90c8d17bbe feat: 重构下 className 的写法,支持原有的 className 2015-10-28 18:04:56 +08:00
偏右
5ab1a16a32 Merge pull request #443 from coderhaoxin/fix-badge-count
fix: get count from props
2015-10-28 17:51:14 +08:00
haoxin
147ffa4209 fix: get count from props 2015-10-28 17:47:28 +08:00
afc163
ec9dee8e6b Fix marks style 2015-10-28 17:42:11 +08:00
afc163
56cc2716c1 remove datepicker focus style 2015-10-28 17:30:54 +08:00
pizn
68a952fb62 update: 修改 flex demo 2015-10-28 17:24:35 +08:00
afc163
dac4b51ea5 Fix calendar 2015-10-28 16:31:28 +08:00
afc163
8f7c7350e8 Remove today hover color 2015-10-28 15:53:30 +08:00
afc163
7c9892a9c7 Add Button propsType 2015-10-28 15:45:31 +08:00
偏右
b52cb83295 Merge pull request #441 from benjycui/fix-button
fix: hide loading icon at first
2015-10-28 10:40:51 +08:00
Benjy Cui
3c962e16d2 fix: hide loading icon at first 2015-10-28 10:35:48 +08:00
pizn
d1e60798af udpate... 2015-10-28 00:02:31 +08:00
pizn
69aaa6c296 Add layout componet for antd 2015-10-27 23:52:17 +08:00
yiminghe
2114718bdf update examples 2015-10-27 22:17:54 +08:00
afc163
98bf948710 update CHANGELOG 2015-10-27 20:50:33 +08:00
afc163
2ae668abb3 upgrade rc-table 2015-10-27 20:13:11 +08:00
偏右
0071f2bac3 Merge pull request #436 from benjycui/feature-react@0.14.x
deps: upgrade React Components
2015-10-27 20:06:11 +08:00
偏右
59c511fe19 Merge pull request #437 from ant-design/ie8-button-radius-support
support border radius in ie8 via css3pie
2015-10-27 20:05:26 +08:00
afc163
e19186f783 confirmLoading is fully controlled by props now, fix #392 2015-10-27 19:57:18 +08:00
afc163
0193df102b update table ajax demo 2015-10-27 19:37:39 +08:00
afc163
f7ef12acf1 Remove some demo 2015-10-27 19:19:09 +08:00
afc163
64b4031d7a Fix key warning in table demo 2015-10-27 17:27:11 +08:00
ioldfish
2fefd5d103 Merge branch 'develop-0.10.0' of https://github.com/ant-design/ant-design into develop-0.10.0
Conflicts:
	package.json
2015-10-27 16:44:31 +08:00
ioldfish
49c019f86d Merge branch 'develop-0.10.0' of https://github.com/ant-design/ant-design into develop-0.10.0
Conflicts:
	package.json
2015-10-27 16:28:00 +08:00
afc163
602c2d1f9d support border radius in ie8 via css3pie 2015-10-27 16:26:56 +08:00
ioldfish
8f887d3879 update ant-tree dynamic 2015-10-27 15:47:01 +08:00
KgTong
0f4b4ae39f fix table loading when removing type attrite of spin 2015-10-27 15:15:24 +08:00
KgTong
322d250aa0 Merge remote-tracking branch 'ant/develop-0.10.0' into feature-spin 2015-10-27 14:59:55 +08:00
KgTong
686a21df78 remove type attribute of spin 2015-10-27 14:58:04 +08:00
afc163
9266bbeaed Merge master 2015-10-27 14:36:31 +08:00