Commit Graph

24131 Commits

Author SHA1 Message Date
afc163
e92c06f739 Merge branch 'develop-1.0.0' of https://github.com/freestyle21/ant-design into freestyle21-develop-1.0.0 2016-04-15 23:48:53 +08:00
afc163
728c3c2d6a Merge branch master into develop-1.0.0 2016-04-15 23:45:28 +08:00
afc163
278b5d83e1 update docs 2016-04-15 23:40:01 +08:00
afc163
8a9a1d2334 fix checkbox style 2016-04-15 23:34:40 +08:00
afc163
c6cba5a2a1 Make steps layout more flexible, close #1099 2016-04-15 23:04:06 +08:00
afc163
cc2f93a4e1 loading button should not be transparent 2016-04-15 16:21:08 +08:00
qubaoming
2d72bc58d2 adjust props position & range-picker add showTime options 2016-04-15 14:47:39 +08:00
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
7fffcffdb2 Merge branch 'develop-1.0.0' of https://github.com/freestyle21/ant-design into freestyle21-develop-1.0.0 2016-04-15 12:06:54 +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
c8df93466b Merge branch 'wizawu-develop-1.0.0' into develop-1.0.0 2016-04-15 11:53:11 +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
2517b08e1f chore: fix strict mode 2016-04-14 11:54:27 +08:00
Benjy Cui
0e156385da fix: revert delete defaultValue 2016-04-14 11:43:26 +08:00
Benjy Cui
7a6485d1ab chore: update lint scripts 2016-04-14 11:39:02 +08:00
Benjy Cui
9d95313d03 chore: suppress warning 2016-04-14 11:22:53 +08:00
Benjy Cui
431dffa116 chore: fix webpack config 2016-04-14 10:33:01 +08:00
afc163
63f7a1896c update carousel style 2016-04-13 23:34:56 +08:00
afc163
1f4aa4b07f Merge branch 'develop-1.0.0' of github.com:ant-design/ant-design into develop-1.0.0 2016-04-13 20:57:53 +08:00
afc163
00a2e97f23 fix test cases 2016-04-13 20:56:50 +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
偏右
ff2c26f7eb Merge branch 'master' of github.com:ant-design/ant-design 2016-04-13 17:03:06 +08:00
afc163
0e506b653a Improve selected item style (#1364)
* Add check style for selected item

* change selected style of Select, Cascader, TimePicker

* fix typo style
2016-04-13 17:00:29 +08:00
afc163
5c6237f6fe Merge branch 'develop-1.0.0' of github.com:ant-design/ant-design into develop-1.0.0 2016-04-13 16:59:28 +08:00
afc163
e8f98671c1 Merge branch master into develop-1.0.0 2016-04-13 16:58:16 +08:00
Benjy Cui
7340871aaf site: fix 2016-04-13 16:55:27 +08:00
afc163
f08331dae5 bump 0.12.14 2016-04-13 16:55:17 +08:00
afc163
981e3964fb use a css trick to fix #953 again 2016-04-13 16:54:53 +08:00
Benjy Cui
2fc97f4ada site: refactor 2016-04-13 16:48:56 +08:00