Commit Graph

2450 Commits

Author SHA1 Message Date
afc163
8a422ba2cd update demo 2016-04-15 23:54:47 +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
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
afc163
db0c909ccd Merge branch master into develop-1.0.0 2016-04-11 14:34:18 +08:00
afc163
d4cfd369b7 update demo 2016-04-11 14:20:05 +08:00
afc163
95fabf0c00 update demo 2016-04-11 14:03:31 +08:00
afc163
04a413df3e Merge branch 'develop-1.0.0' of github.com:ant-design/ant-design into develop-1.0.0 2016-04-11 11:56:13 +08:00
afc163
3b1f95c346 Fix site style 2016-04-11 11:55:44 +08:00
Benjy Cui
d9f7a57439 docs: update docs 2016-04-11 11:52:17 +08:00
afc163
bb1c6b862c Merge branch master into develop-1.0.0 2016-04-11 11:31:35 +08:00
afc163
76f14b4bd2 Fix BreadCrumb IndexRoute support, close #1375 & #571 2016-04-11 11:16:31 +08:00
afc163
e3834829e4 update menu doc 2016-04-11 10:57:58 +08:00
然则
06403c560d change tree,tree-select api 2016-04-10 16:26:31 +08:00
afc163
299a30d4e7 fix layout demo style 2016-04-10 15:39:24 +08:00
afc163
700a07047b Add card borderd prop 2016-04-10 15:38:52 +08:00
afc163
ac4358024c refactor notification code style 2016-04-10 13:08:56 +08:00
afc163
76935c9630 a little perfermance 2016-04-09 16:30:53 +08:00
afc163
0a55eb8c43 reuse getColumnKey 2016-04-09 15:30:24 +08:00
yiminghe
f2cd294e38 Merge pull request #1363 from ant-design/site-debug-mode
site: support import style respectivly
2016-04-08 15:36:44 +08:00
afc163
dab3ce4513 Add focused style to Select & TreeSelect 2016-04-08 15:30:49 +08:00
Benjy Cui
71e4a6fb7d site: support import style respectivly 2016-04-08 15:29:04 +08:00
afc163
13e404e9a6 Merge branch 'develop-1.0.0' of github.com:ant-design/ant-design into develop-1.0.0 2016-04-08 11:16:42 +08:00
Benjy Cui
59cb0a8fbb site: fix parse errors.. 2016-04-08 09:33:09 +08:00
afc163
905ee5e6f9 Merge branch 'develop-1.0.0' of github.com:ant-design/ant-design into develop-1.0.0 2016-04-07 20:47:32 +08:00
然则
f7652fa504 improve tree, tree-select 2016-04-07 18:16:49 +08:00
afc163
b155ba15cb fix react@15 warning, ref #1340 2016-04-07 18:07:18 +08:00
afc163
1abf831ae8 Merge branch master into develop-1.0.0 2016-04-07 17:55:06 +08:00
afc163
f726979af9 fix(DatePicker): showTime locale problem
close #1356
2016-04-07 17:44:13 +08:00
afc163
761e5534c0 fix test cases 2016-04-07 16:56:13 +08:00
afc163
fa776b9481 improve code style 2016-04-07 16:43:00 +08:00
jljsj
10d650ee59 re popover demo 2016-04-07 15:54:02 +08:00
jljsj
6fdb4e013f add tooltip anim origin 2016-04-07 15:54:02 +08:00
Benjy Cui
bcba08a124 docs: update docs format 2016-04-07 15:36:55 +08:00
Benjy Cui
e76030e0c9 site: style should be placed in less files 2016-04-07 15:36:55 +08:00
afc163
a5b6bc50be Merge branch 'develop-1.0.0' of github.com:ant-design/ant-design into develop-1.0.0 2016-04-07 12:13:21 +08:00
afc163
bb627e8e75 Merge branch master into develop-1.0.0 2016-04-07 12:10:21 +08:00
afc163
ed4d2460fe update slider demo 2016-04-07 12:04:06 +08:00
afc163
5ffc934596 update slider demo 2016-04-07 11:43:23 +08:00
tom
6614fb9746 fix bug 2016-04-07 11:39:23 +08:00
tom
353f2cb004 this未绑定 2016-04-07 11:18:32 +08:00
afc163
e46d60cc2a Merge branch master into develop-1.0.0 2016-04-06 23:58:14 +08:00
afc163
6f1bbfb30d fix menu style, close #1347 2016-04-06 23:50:51 +08:00
afc163
79f817466e fix(table): radio selection can not be controlled
close #1346
2016-04-06 23:29:32 +08:00
afc163
378ba4b9af update form demo 2016-04-06 19:30:23 +08:00
afc163
fd850b9607 Add Input onPressEnter prop, ref #978 2016-04-06 18:12:41 +08:00
afc163
0220ab5522 update error step icon 2016-04-06 17:50:51 +08:00
afc163
93adb528ed Add error step, close #1098 2016-04-06 17:07:22 +08:00
afc163
60ebf2922c update steps doc 2016-04-06 16:17:11 +08:00
afc163
51369ec82b upgrade steps demos 2016-04-06 16:16:46 +08:00
afc163
9f33b18336 update steps doc 2016-04-06 16:16:36 +08:00
afc163
e4c3faeabc fix size propTypes 2016-04-06 15:52:38 +08:00
afc163
41182f5619 fix prefixCls 2016-04-06 15:50:58 +08:00
afc163
611665fa6d button contains icon only should has smaller padding 2016-04-06 15:43:50 +08:00
afc163
ba2b08b492 Fix layout responsive 2016-04-06 13:45:36 +08:00
afc163
b3f519ac52 update form style for advanced-search-form demo 2016-04-06 12:08:40 +08:00
afc163
e5c8179189 Merge branch master into develop-1.0.0 2016-04-06 11:57:17 +08:00
afc163
b9b4e30ac1 fix tabs demo 2016-04-06 11:49:02 +08:00
afc163
35b6618597 update form demo 2016-04-06 11:29:28 +08:00
afc163
910203a554 update form index.md 2016-04-06 11:29:06 +08:00
afc163
5b1ccce554 fix button demo 2016-04-05 19:33:26 +08:00
afc163
e39c5e53ed update rate doc 2016-04-05 19:14:21 +08:00
afc163
aa6a1762b7 rename Progress files 2016-04-05 17:13:09 +08:00
afc163
befe1fc521 Merge circle into line component 2016-04-05 17:13:09 +08:00
afc163
ae87f60075 remove Modal align in API document 2016-04-05 13:42:02 +08:00
afc163
1fd31771b3 fix hidden demo 2016-04-05 13:34:44 +08:00
afc163
b27c6ccc24 rebase and add demo & docs 2016-04-05 12:30:14 +08:00
afc163
71ee13a2a8 Fix Modal animation 2016-04-05 11:58:46 +08:00
Bruce Mitchener
0a4bcfa1a7 Spell deprecated correctly. 2016-04-01 22:06:38 +07:00
afc163
28b36d571c fix Input document undefined error, close #1321 2016-04-01 18:42:45 +08:00
afc163
2ed55a4900 move deperated warning into componentDidMount 2016-04-01 14:29:11 +08:00
afc163
be8d19628b Popover prop content => overlay, ref #978 2016-04-01 14:28:35 +08:00
afc163
3df1e27ca4 Merge branch 'master' into develop-1.0.0 2016-04-01 14:17:51 +08:00
afc163
c02c9a2e5b update popover index.md 2016-04-01 14:14:34 +08:00
afc163
655e4d5a7d Add LocaleProvider support for RangePicker 2016-04-01 13:53:37 +08:00
afc163
0f3c3c7e5a Fix cascader placeholder, close #1312 2016-04-01 13:51:26 +08:00
Benjy Cui
bc2b086862 docs: update demo format 2016-04-01 10:12:02 +08:00
Benjy Cui
df3ba36720 docs: remove useless newline in documentation 2016-04-01 10:08:19 +08:00
afc163
30be05e570 Fix popover prefixCls 2016-04-01 01:37:17 +08:00
afc163
4a29f0afd0 Merge branch 'develop-1.0.0' of github.com:ant-design/ant-design into develop-1.0.0 2016-04-01 01:10:01 +08:00
afc163
84b731df0f Merge branch master into develop-1.0.0 2016-04-01 01:09:24 +08:00
afc163
29ceb8862d fix: controlled pagination.current should not respond user interaction
ref #1311
2016-04-01 00:57:03 +08:00
Bruce Mitchener
fa65f25b1e Switch RangePicker to ES6 class. 2016-03-31 20:23:39 +07:00
Bruce Mitchener
50d61eb7de Fix RangePicker handleChange callback.
There was a minor typo in 2e86463a6a
which broke the handleChange callback (this.props was replaced with
props.props rather than just props).
2016-03-31 19:32:43 +07:00
Benjy Cui
794783d1c2 style: enable react/no-multi-comp 2016-03-31 17:46:35 +08:00
afc163
bb287e2e4e Merge branch 'develop-1.0.0' of github.com:ant-design/ant-design into develop-1.0.0 2016-03-31 17:38:29 +08:00
afc163
eba37c9ef7 Add LocaleProvider support for Calendar 2016-03-31 17:37:24 +08:00
Benjy Cui
2a3febfe4c deps: remove useless dependencies 2016-03-31 16:47:03 +08:00
afc163
d75c0d0b24 Merge pull request #1307 from ant-design/docs-format
Update docs format
2016-03-31 15:48:38 +08:00
afc163
5c884a64c4 Remove Button type PropTypes limit, close #1308 2016-03-31 14:57:29 +08:00
afc163
9f342a0568 update button group demo 2016-03-31 14:55:12 +08:00
afc163
bd97bff665 improve rate style & demos 2016-03-31 14:43:38 +08:00
Benjy Cui
d5a6932c15 docs: update documentation format 2016-03-31 14:17:09 +08:00
Benjy Cui
03d09b66e8 docs: update demo format 2016-03-31 09:40:55 +08:00
afc163
f13e40b887 Fix: isomorphic badge & spin
close #1300 again
2016-03-30 23:02:11 +08:00
afc163
3aab04d4a5 update demo 2016-03-30 20:37:17 +08:00
afc163
06de76b7f4 spanRender => nameRender, ref #1304 2016-03-30 19:46:54 +08:00
afc163
d5e038845f Merge pull request #1304 from queimadus/breadcrumb-span-render
Parameterize Breadcrumb span rendering
2016-03-30 19:43:00 +08:00
afc163
7d700b01cc Fix server render difference
close #1300

ref #215
2016-03-30 19:39:20 +08:00
afc163
fbee9d9dd9 update code style 2016-03-30 19:36:29 +08:00
afc163
921d3bce46 hidden breadcrumb href in Doc 2016-03-30 19:30:16 +08:00
afc163
261661bffe update card style 2016-03-30 19:06:05 +08:00
afc163
578605f230 Merge pull request #1294 from ant-design/feat-controlled-filter-and-soter
Feat controlled filters and sorter
2016-03-30 18:51:51 +08:00
afc163
178f593612 Merge pull request #1301 from ant-design/chore-eslintrc
style: enable react/jsx-no-bind
2016-03-30 18:51:46 +08:00
Bruno Maia
03c4c73471 Parameterize span rendering 2016-03-30 11:50:38 +01:00
afc163
b4a75ddcc9 fix sort and filter perf 2016-03-30 17:56:37 +08:00
afc163
2651d80fc2 Individual controlled filter 2016-03-30 17:49:36 +08:00
Benjy Cui
fd3406bd03 style: enable react/jsx-no-bind 2016-03-30 17:06:19 +08:00
yiminghe
afdbe4544c remove velocity-anim 2016-03-30 16:33:47 +08:00
afc163
ae9f8d0365 Add docs for sortOrder & filteredValue 2016-03-30 14:39:21 +08:00
afc163
137d57da08 controlled filters 2016-03-30 14:39:21 +08:00
afc163
0dbc69ea8e sorted => sortOrder 2016-03-30 14:39:21 +08:00
afc163
94234a7749 Fix sort state 2016-03-30 14:39:21 +08:00
afc163
6d2b9b249c Make column.sorted be a controlled prop 2016-03-30 14:39:21 +08:00
afc163
5ce99d7c07 get initial sorted state from columns 2016-03-30 14:39:21 +08:00
afc163
4ee09de3b9 Add demo, confirm related API 2016-03-30 14:39:21 +08:00
yiminghe
8c3a70ab0b add rate 2016-03-30 13:20:03 +08:00
afc163
c47fdeaf8f Merge branch 'master' into develop-1.0.0 2016-03-30 11:17:39 +08:00
afc163
9584cf0af3 Merge pull request #1295 from waywardmonkeys/more-class-conversion
Convert more createClass over to extending Component.
2016-03-30 11:11:50 +08:00
afc163
fd1d54cfb2 Merge pull request #1298 from ant-design/refactor-datepicker-hoc
refactor: remove mixin
2016-03-30 11:11:24 +08:00
afc163
f89d2dba7e Merge pull request #1296 from ant-design/deperated-queue-anim
Mark QueueAnim deperated
2016-03-30 11:11:20 +08:00
afc163
1d1d0bac0d Add style for Form & FormItem
close #1290
2016-03-30 11:01:09 +08:00
afc163
c10fbaed6f fix some className issues 2016-03-30 10:58:37 +08:00
Benjy Cui
2e86463a6a refactor: remove mixin 2016-03-30 10:52:15 +08:00
Benjy Cui
6157d21089 refactor: DatePicker 2016-03-30 09:50:44 +08:00
Benjy Cui
193ba74bff style: update code style 2016-03-30 09:41:18 +08:00
afc163
f79c8c028b Fix QueueAnim demo 2016-03-29 20:29:41 +08:00
afc163
e0d486bbe6 Mark QueueAnim deperated 2016-03-29 19:50:05 +08:00
afc163
74f462e8a8 update docs 2016-03-29 18:21:57 +08:00
afc163
376d1efc04 Add some api in docs 2016-03-29 18:05:08 +08:00
afc163
b6de2765bf Add some api in docs 2016-03-29 18:02:01 +08:00
afc163
590692d101 Merge branch 'develop-1.0.0' of github.com:ant-design/ant-design into develop-1.0.0 2016-03-29 17:37:31 +08:00
afc163
ba8d9b7dc3 Merge branch 'master' into develop-1.0.0 2016-03-29 17:36:58 +08:00
Bruce Mitchener
0acce38f08 Convert more createClass over to extending Component. 2016-03-29 16:33:37 +07:00
afc163
ec6ac78e15 simplify table demo 2016-03-29 17:32:03 +08:00
afc163
3eb52e5498 fix a stupid className error 2016-03-29 17:19:31 +08:00
yiminghe
55f23c9d34 Merge pull request #1292 from waywardmonkeys/static-members
Use static class members for propTypes and friends.
2016-03-29 16:36:30 +08:00
Benjy Cui
b0f7df547a docs: update docs for Form.create 2016-03-29 15:24:22 +08:00
Bruce Mitchener
273e527201 Use static class members for propTypes and friends. 2016-03-29 13:01:10 +07:00
Bruce Mitchener
ba965dc746 Convert several React.createClass usages to classes. 2016-03-29 11:13:04 +07:00
Bruce Mitchener
71594b0e5c Remove manual binding for 'this'.
Use ES7 style class members for event handlers so that 'this' is
automatically bound and each definition site doesn't need to manually
invoke 'bind'.

This makes all existing ES2015 class usages in components use the
same mechanism for binding.
2016-03-28 20:36:11 +07:00
afc163
7692bf3d42 update site style 2016-03-28 19:12:51 +08:00
afc163
1df8bccf26 Remove deperated progress form usage 2016-03-28 18:51:30 +08:00
afc163
6b2c0e96a9 Add deperated code for xxx.warn 2016-03-28 18:03:00 +08:00
afc163
09b27ed288 warn => warning, close #1225 2016-03-28 17:43:38 +08:00
afc163
b3e1bd9e5a Merge pull request #1279 from waywardmonkeys/no-direct-import-component
Don't directly import Component, use React.Component.
2016-03-28 17:40:48 +08:00
afc163
9d0dfe07b3 Merge pull request #1284 from ant-design/feat-date-picker-args
Add dateString to DatePicker & TimePicker onChange
2016-03-28 17:40:19 +08:00