Commit Graph

16770 Commits

Author SHA1 Message Date
afc163
25368de60b update button demo style 2015-10-30 17:04:22 +08:00
afc163
f526703bf8 update disabled button demo 2015-10-30 17:00:06 +08:00
afc163
53687c2ba5 Merge branch 'develop-0.10.0' of github.com:ant-design/ant-design into develop-0.10.0 2015-10-30 16:49:55 +08:00
偏右
483446b28f Merge pull request #455 from ant-design/feature-delStyleAlign
del align
2015-10-30 16:48:11 +08:00
勤拭
cc58106186 del align 2015-10-30 16:45:10 +08:00
偏右
9a326d35c3 Merge pull request #454 from benjycui/docs-validation
docs: 增加多选 `Select` 校验的 demo
2015-10-30 16:30:36 +08:00
afc163
33aed8d45e update nico-jsx 2015-10-30 16:26:23 +08:00
Benjy Cui
21231c50a1 docs: 增加多选 Select 校验的 demo 2015-10-30 16:06:27 +08:00
afc163
5a97860d7c update deps 2015-10-30 15:35:23 +08:00
afc163
ab4cd86221 Merge branch 'develop-0.10.0' of github.com:ant-design/ant-design into develop-0.10.0 2015-10-30 15:29:15 +08:00
偏右
c1076b03c0 Merge pull request #453 from benjycui/deps-rc
deps: upgrade React Components
2015-10-30 15:26:11 +08:00
Benjy Cui
1fbd07d7a6 deps: upgrade React Components 2015-10-30 15:22:25 +08:00
afc163
f1576b9c84 upgrade babel version 2015-10-30 14:51:40 +08:00
偏右
b74a1475a0 Merge pull request #450 from benjycui/docs-slider
docs: update Slider's docs
2015-10-30 14:25:43 +08:00
Benjy Cui
46452912c1 docs: update Slider's docs 2015-10-30 14:09:15 +08:00
KgTong
fa55d3a442 delete the loading attribute in spin/index.md 2015-10-30 13:16:51 +08:00
KgTong
b0bad43bf8 Merge remote-tracking branch 'ant/develop-0.10.0' into feature-spin 2015-10-30 13:11:39 +08:00
KgTong
ed91ce0931 use animation judge function, and remove the loading attribute 2015-10-30 11:56:23 +08:00
偏右
4eef432425 Update index.md 2015-10-29 23:17:25 +08:00
afc163
fee949cd04 update code style 2015-10-29 20:15:44 +08:00
afc163
3a5f301fad update code style 2015-10-29 20:14:08 +08:00
afc163
67c0e2ad0e update document 2015-10-29 20:10:44 +08:00
偏右
ba023f3f05 Merge pull request #447 from ant-design/feature-colspan-rowspan
support colspan and rowspan
2015-10-29 20:00:15 +08:00
afc163
e246dfeb06 update datepicker style 2015-10-29 19:59:48 +08:00
afc163
bd61bad5ee date null is meaning value 2015-10-29 19:37:39 +08:00
afc163
0c96016708 update datepicker style 2015-10-29 19:01:10 +08:00
afc163
3a414505e8 Merge branch 'develop-0.10.0' of github.com:ant-design/ant-design into develop-0.10.0 2015-10-29 18:19:49 +08:00
afc163
25b365d64f update clear btn style of datepicker 2015-10-29 18:19:30 +08:00
勤拭
7664a41f9b 调整格式 2015-10-29 17:31:47 +08:00
勤拭
6e184378bf 文档逗号改为中文格式 2015-10-29 17:03:15 +08:00
sorrycc
f9db243f50 update getting-started.md 2015-10-29 16:31:16 +08:00
勤拭
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