Commit Graph

2236 Commits

Author SHA1 Message Date
afc163
aed7eae2bc Fix confirmLoading 2015-10-20 10:45:49 +08:00
白羊座小葛
b66545284d Merge pull request #375 from ant-design/develop-0.10.0-datepicker-validation
Develop 0.10.0 datepicker and inputnumber validation
2015-10-20 09:53:30 +08:00
羽航
999e8a0e53 fix conflict 2015-10-20 09:50:47 +08:00
afc163
c2f26f9bf6 Merge branch 'master' into develop-0.10.0 2015-10-19 19:51:56 +08:00
afc163
704c8dbacc update 404.html 2015-10-19 19:51:28 +08:00
afc163
d3e865a8df update 404.html 2015-10-19 19:50:55 +08:00
afc163
1acbca031d Merge branch 'master' into develop-0.10.0 2015-10-19 19:41:35 +08:00
afc163
16500c9936 404 page 2015-10-19 19:40:38 +08:00
afc163
7e5630f97d Fix key warnings 2015-10-19 19:40:28 +08:00
afc163
22192bd283 404 page 2015-10-19 19:39:59 +08:00
afc163
67778ffa5a Fix key warnings 2015-10-19 19:27:06 +08:00
afc163
db4257e748 Merge branch 'master' into develop-0.10.0 2015-10-19 18:15:08 +08:00
afc163
6135242dc3 fix version select order 2015-10-19 18:05:06 +08:00
afc163
1ea1a62d19 fix version select order 2015-10-19 18:04:54 +08:00
afc163
f26bbc1cd5 Add document version switch in footer, #406 2015-10-19 17:58:56 +08:00
afc163
4978cbe914 Add document version switch in footer, #406 2015-10-19 17:57:44 +08:00
偏右
a2b07e2a3b Merge pull request #408 from ant-design/feature-header-anchor
Add link anchor to every title in markdown document
2015-10-19 17:11:36 +08:00
afc163
f469541433 Add link anchor to every title in markdown document 2015-10-19 17:11:03 +08:00
afc163
44cb11a2bd Fix color tint tool 2015-10-19 16:54:32 +08:00
afc163
925d75dd1e upgrade rc-slider 2015-10-19 16:54:19 +08:00
chencheng (云谦)
a976b65ab1 remove react external 2015-10-19 16:09:18 +08:00
afc163
c06b0d7ba8 Change default README to english version 2015-10-19 16:06:15 +08:00
afc163
6b6176b4aa Merge master 2015-10-19 15:03:26 +08:00
Benjy Cui
d12425a11e chore: upgrade react-slick in order to work with React@0.14.x 2015-10-19 15:01:30 +08:00
Benjy Cui
3be9ad0ad0 refactor: joinClasses is removed in React@0.14.x 2015-10-19 15:01:17 +08:00
afc163
bd8c903e08 remove antd.confirm, please use antd.Modal.confirm 2015-10-19 13:58:33 +08:00
afc163
a69aae8696 Merge branch 'master' into develop-0.10.0 2015-10-19 13:56:31 +08:00
afc163
f0e76c2470 Merge branch 'master' into develop-0.10.0 2015-10-19 13:55:43 +08:00
偏右
27477784ee Merge pull request #407 from coderhaoxin/fix-menu-z-index
fix menu z-index, to be smaller than 1000 (dialog, mask, modal)
2015-10-19 13:54:11 +08:00
haoxin
57ff6037af fix menu z-index, to be smaller than 1000 (dialog, mask, modal) 2015-10-19 13:12:39 +08:00
afc163
dc47b1cd5b fix reqwest 2015-10-19 11:34:44 +08:00
yiminghe
d3421b6bf4 Merge pull request #397 from ant-design/develop-0.10.0fortree
Develop 0.10.0fortree
2015-10-17 00:17:20 +08:00
afc163
cfbd7bd85d upgrade to reqwest@2.0.5, ref ded/reqwest#217 2015-10-16 13:56:37 +08:00
simaQ
b35a7a9a15 Merge pull request #401 from kevyu/master
fix btn-group mixin bug
2015-10-16 12:01:31 +08:00
Haibin Yu
469231c5e7 fix btn-group mixin bug 2015-10-15 23:36:48 +08:00
SimaQ
718cb5a9dd Merge branch 'develop-0.10.0' of https://github.com/ant-design/ant-design into develop-0.10.0 2015-10-15 19:59:53 +08:00
SimaQ
89bb950663 fix: 添加 ant-input-number 的校验样式支持。 Closes #377。 2015-10-15 19:59:21 +08:00
SimaQ
6698341280 fix: 添加 ant-input-number 的校验样式支持。 Closes#377。 2015-10-15 19:55:19 +08:00
ioldfish
b3351715f3 Merge branch 'develop-0.10.0' of https://github.com/ant-design/ant-design into develop-0.10.0 2015-10-15 14:38:12 +08:00
afc163
8e00cdedf4 Merge branch 'master' into develop-0.10.0 2015-10-15 11:26:32 +08:00
afc163
ed7114e25e update modal info 2015-10-15 11:26:07 +08:00
ioldfish
d700a53543 Merge branch 'develop-0.10.0' of https://github.com/ant-design/ant-design into develop-0.10.0 2015-10-15 10:40:01 +08:00
ioldfish
aca09cf191 update ant-tree 2015-10-15 10:38:14 +08:00
偏右
d546830405 Merge pull request #393 from ant-design/ibigbug-patch-1
Update offset.md
2015-10-15 00:11:14 +08:00
Yuwei Ba
60987b0112 Update offset.md
Typo
2015-10-15 00:10:01 +08:00
afc163
9ef14500f3 Fix datepicker defaultValue, closes #391 2015-10-14 18:09:28 +08:00
偏右
bb30d5a778 Merge pull request #389 from ant-design/color-tint-tool
Add color tint and color transform tool
2015-10-14 16:46:47 +08:00
afc163
5fd6d98217 Merge branch 'develop-0.10.0' of github.com:ant-design/ant-design into develop-0.10.0 2015-10-14 16:46:01 +08:00
afc163
164c01b5ba Merge branch 'master' into develop-0.10.0 2015-10-14 16:44:52 +08:00
afc163
d1f7fcfecc Fix font spec page style 2015-10-14 16:44:30 +08:00