Commit Graph

2293 Commits

Author SHA1 Message Date
qubaoming
bf1ee0b1c8 Merge remote-tracking branch 'upstream/develop-1.0.0' into develop-1.0.0 2016-04-15 14:22:12 +08:00
afc163
403bf41e82 Merge branch 'develop-1.0.0' of github.com:ant-design/ant-design into develop-1.0.0 2016-04-15 11:53:33 +08:00
afc163
5100fed2bd Add warning console for spinning change 2016-04-15 11:52:15 +08:00
然则
6eefc065a1 correct api 2016-04-15 11:41:22 +08:00
afc163
28a3e706ee Merge branch 'develop-1.0.0' of https://github.com/wizawu/ant-design into wizawu-develop-1.0.0 2016-04-15 11:37:50 +08:00
afc163
736193eeb5 Merge branch master into develop-1.0.0 2016-04-15 11:23:57 +08:00
afc163
ef5ac96b49 update tree-select doc 2016-04-15 11:17:30 +08:00
然则
72f8e1f5dc correct tree-select doc 2016-04-14 18:47:37 +08:00
qubaoming
94e0488812 adjust props position 2016-04-14 16:48:34 +08:00
qubaoming
fc66d27042 change timepicker options to rctimepicker options 2016-04-14 15:48:16 +08:00
qubaoming
6b3a97b902 change timepicker options to rctimepicker options 2016-04-14 15:42:03 +08:00
wizawu
577663d185 Replace property spining with spinning 2016-04-14 15:26:55 +08:00
qubaoming
a674657287 data-picker extent options 2016-04-14 15:14:17 +08:00
qubaoming
c4bdf93a33 Merge remote-tracking branch 'upstream/develop-1.0.0' into develop-1.0.0 2016-04-14 15:10:43 +08:00
afc163
4835471210 update Table initial current page 2016-04-14 14:47:39 +08:00
afc163
6e00ea8945 Merge branch 'develop-1.0.0' of github.com:ant-design/ant-design into develop-1.0.0 2016-04-14 14:24:15 +08:00
afc163
e59715f98d fix checkbox and radio empty span 2016-04-14 14:23:12 +08:00
Benjy Cui
3677339646 fix: revert 2016-04-14 14:20:18 +08:00
qubaoming
fd57f4c12d date-picker extend options 2016-04-14 12:32:25 +08:00
Ma Tianxiao
be39bca93a fix input value/defaultValue prop (#1414)
Input elements must be either controlled or uncontrolled, specify either the value prop, or the defaultValue prop, but not both.
2016-04-14 11:58:01 +08:00
plandem
9af3e4fc55 ru locale (#1411) 2016-04-14 11:57:59 +08:00
Benjy Cui
0e156385da fix: revert delete defaultValue 2016-04-14 11:43:26 +08:00
Benjy Cui
9d95313d03 chore: suppress warning 2016-04-14 11:22:53 +08:00
然则
9b847b896f correct filterTreeNode api description 2016-04-13 20:46:54 +08:00
afc163
4a6337060e fix demo 2016-04-13 17:55:24 +08:00
Benjy Cui
047bfc2574 style: enable react/prefer-stateless-function 2016-04-13 17:38:53 +08:00
Benjy Cui
0ebf6c2ecc style: enable react/prefer-es6-class 2016-04-13 17:23:14 +08:00
afc163
ec04fcac36 Merge branch master into develop-1.0.0 2016-04-13 15:33:44 +08:00
Benjy Cui
883699f3dc fix: update Tag's margin 2016-04-13 15:15:02 +08:00
afc163
861808469a fix code highlight 2016-04-13 15:00:47 +08:00
afc163
f75deafc6e Merge branch 'master' of github.com:ant-design/ant-design 2016-04-13 14:37:33 +08:00
afc163
455d3654b8 Fix dateInput format of DatePicker, close #1403 2016-04-13 14:36:43 +08:00
Benjy Cui
70b8a83a74 fix: remove Tag's margin 2016-04-13 14:10:18 +08:00
afc163
87f8d1f334 Change current to defaultCurrent 2016-04-13 11:39:56 +08:00
Benjy Cui
208ecf5081 docs: update docs for MonthPicker 2016-04-13 09:25:29 +08:00
afc163
960ea425b9 Merge branch master into develop-1.0.0 2016-04-12 19:44:38 +08:00
afc163
9a7a620ec7 Fix filter menu value type 2016-04-12 19:43:10 +08:00
afc163
9774181979 Fix Table pagination.size, close #1396 2016-04-12 18:19:27 +08:00
Benjy Cui
d0ad1b4b0a docs: update docs for Form 2016-04-12 17:08:01 +08:00
afc163
603c6238cd update card style 2016-04-12 16:42:15 +08:00
afc163
026d720aaf update form demo format 2016-04-12 16:12:13 +08:00
afc163
d39da4bfb7 Merge branch 'master' into develop-1.0.0 2016-04-12 16:09:13 +08:00
afc163
a9af1b3bc8 rollback for bad commit b3f519a
close #1392
2016-04-12 16:06:34 +08:00
Benjy Cui
10edd74f33 docs: update demos of Form 2016-04-12 15:18:57 +08:00
afc163
0a0d16ff61 Fix form input style 2016-04-12 14:55:02 +08:00
afc163
b4be06f816 improve button loading animation 2016-04-12 12:17:03 +08:00
afc163
5f0b1ef006 Fix button text span wrap 2016-04-12 11:56:14 +08:00
afc163
be700df612 update pagination demo 2016-04-11 15:07:14 +08:00
afc163
5ee64fe105 Add Modal.warning 2016-04-11 14:59:37 +08:00
afc163
4c60da7316 Modal.confirm, iconClassName => iconType 2016-04-11 14:57:29 +08:00