Commit Graph

2218 Commits

Author SHA1 Message Date
afc163
71e026467a Merge branch 'queue-anim' of github.com:ant-design/ant-design into queue-anim 2015-10-22 21:26:21 +08:00
jljsj
d2cf91d837 update queue-anim interval 2015-10-21 18:15:17 +08:00
jljsj
dc2c720cec update queue-anim enter-leave state.show 2015-10-21 17:56:42 +08:00
jljsj
ba34a49f79 update queue-anim demo 2015-10-21 17:53:38 +08:00
afc163
e5bed684eb Remove enter-animation document 2015-10-19 16:21:26 +08:00
afc163
ca595c68f5 deprecate EnterAnimation 2015-10-19 16:20:30 +08:00
afc163
0ae67d96d8 use React for react-dom temporarily, wait 0.14 support, ref #243 2015-10-19 15:58:18 +08:00
jljsj
bf1d703274 queue-anim demo 2015-10-19 15:36:32 +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
偏右
50231d9c46 Merge pull request #390 from ant-design/upgrade-input-number
upgrade input-number to 2.1.x
2015-10-14 16:31:20 +08:00
afc163
6092ca2319 upgrade input-number to 2.1.x 2015-10-14 16:27:06 +08:00
afc163
59e5ff25ae Add color tint and color transform tool 2015-10-14 16:02:32 +08:00
偏右
8c55c16194 Merge pull request #383 from kevyu/master
fix text-color typo in popover.less
2015-10-14 13:58:19 +08:00
Haibin Yu
3faa1535db fix text-color typo in popover.less 2015-10-14 13:28:37 +08:00
afc163
a3b2ad5791 #380 2015-10-14 10:29:15 +08:00
yiminghe
fb43a1b86d fix anim server render 2015-10-13 12:52:41 +08:00
afc163
ecb98d8787 Merge branch 'master' into develop-0.10.0 2015-10-12 10:21:16 +08:00
afc163
a085adcf05 Add react to devDeps 2015-10-12 10:20:17 +08:00
afc163
dfab1e274d Merge branch 'develop-0.10.0' of github.com:ant-design/ant-design into develop-0.10.0 2015-10-11 17:54:18 +08:00
afc163
70448f45cb fix doc style 2015-10-11 17:49:17 +08:00
偏右
842c7bb33d Merge pull request #370 from benjycui/feature-button
feat: add support for `htmlType`
2015-10-11 15:21:53 +08:00
afc163
37da0caf2c Remove importing jquery 2015-10-10 14:20:22 +08:00
afc163
100adfc69a update row select argument name 2015-10-10 11:35:31 +08:00