Commit Graph

14287 Commits

Author SHA1 Message Date
afc163
59db4e46c6 fix demo code lint bug 2015-11-26 12:07:27 +08:00
afc163
bd14d75419 Merge pull request #584 from ant-design/feat-button-text
Add i18n for `Table` `Modal` `Popconfirm`
2015-11-26 11:59:20 +08:00
Daqi Song
38b51372e6 move mock data to demo 2015-11-26 11:18:37 +08:00
Daqi Song
27dc9bc853 init transfer 2015-11-25 23:17:06 +08:00
afc163
d1d3329674 fix boolean attribute lint errors 2015-11-25 18:10:35 +08:00
afc163
16abf46071 Fix markdown eslint errors, update .eslintrc 2015-11-25 18:10:34 +08:00
afc163
69433ebf9c Merge branch 'master' of github.com:ant-design/ant-design 2015-11-25 17:50:16 +08:00
afc163
2f2928979b Merge pull request #592 from ant-design/fix-input-number
fix: InputNumber should support `className`
2015-11-25 17:05:27 +08:00
shelwin
042f016dd4 update modal confirm demo 2015-11-25 16:17:58 +08:00
Benjy Cui
75fc99f0ad fix: InputNumber should support className 2015-11-25 15:58:38 +08:00
afc163
e88fcd2839 Merge branch 'master' of github.com:ant-design/ant-design 2015-11-25 11:42:51 +08:00
Benjy Cui
2b3878549a docs: update Slider docs for tipFormatter 2015-11-25 11:34:55 +08:00
afc163
7388b7e93a Merge branch 'master' of github.com:ant-design/ant-design 2015-11-25 11:12:53 +08:00
afc163
a1e2099d4a update ScrollNumber render 2015-11-25 11:08:26 +08:00
SimaQ
a86a3b9a5b fix: fixes #586. 2015-11-25 10:46:38 +08:00
afc163
ce76ebfe9b replace rcUtil.classSet by classnames, ref react-component/util#1 2015-11-24 20:03:57 +08:00
afc163
a6197a4836 Merge pull request #565 from ant-design/badge-anim
Badge anim
2015-11-24 19:37:48 +08:00
afc163
62b50c76d7 adjust datepicker and timepicker style to fit each other 2015-11-24 17:43:58 +08:00
afc163
8cd65dcdba update timepicker demo 2015-11-24 17:33:14 +08:00
afc163
83d047466b Add datepicker and timepicer usage demo 2015-11-24 17:25:32 +08:00
xiaosheng.lj
871be19528 fix upload multiple #579 2015-11-24 17:00:34 +08:00
Benjy Cui
dba62729b0 refactor: set okText cancel defaultValue 2015-11-24 16:48:21 +08:00
Benjy Cui
b110b8787b docs: update demos 2015-11-24 16:39:16 +08:00
Benjy Cui
998fa8816e feat: Table should support i18n 2015-11-24 15:58:50 +08:00
afc163
47c8f3de69 improve badge anim 2015-11-24 15:29:57 +08:00
Benjy Cui
51a2798eb5 feat: Popconfirm should support i18n 2015-11-24 11:21:37 +08:00
Benjy Cui
fdd9ef7d18 feat: Modal should support internationalization 2015-11-24 11:01:36 +08:00
afc163
9d4aa291f3 Refactor ant scroll number 2015-11-23 23:01:04 +08:00
afc163
3768e49597 improve code style 2015-11-23 17:19:35 +08:00
Benjy Cui
5bbf9369fb deps: update rc-slider and demo 2015-11-23 16:18:55 +08:00
jljsj
8026a92974 update transition-duration 2015-11-23 15:39:55 +08:00
jljsj
64be14e89e update 2015-11-23 15:21:52 +08:00
jljsj
f7176f31f4 Merge branch 'badge-anim' of github.com:ant-design/ant-design into badge-anim 2015-11-23 15:19:00 +08:00
jljsj
23b5bf0cb0 update badge getTranslateY 2015-11-23 15:08:19 +08:00
afc163
c14dcc7e40 fix #571 2015-11-23 11:01:17 +08:00
Benjy Cui
bbadcc34c1 refactor: cache the result of getLocale() 2015-11-21 16:48:35 +08:00
afc163
250836371b improve code style 2015-11-20 21:44:05 +08:00
afc163
162253b232 Merge branch 'master' of github.com:ant-design/ant-design 2015-11-20 21:08:03 +08:00
afc163
bb897c17ec fix datepicker placeholder 2015-11-20 21:07:29 +08:00
afc163
c416d40b81 Fix datepicker style prop, close #564 2015-11-20 21:05:46 +08:00
afc163
7eb2f5b58a Add support for degrade usage of form 2015-11-20 18:51:12 +08:00
afc163
184e378e79 move col row input into indepent dirctories, remove antd.ButtonGroup 2015-11-20 18:21:59 +08:00
afc163
97b6ff7f92 update timepicker index.md 2015-11-20 18:01:02 +08:00
afc163
21dc8811c9 update table doc 2015-11-20 17:16:56 +08:00
jljsj
7ce4a11d62 update badge number 2015-11-20 17:00:39 +08:00
jljsj
b08513a082 update badge number utils 2015-11-20 17:00:39 +08:00
jljsj
a834a9f83e update badge anim demo 2015-11-20 17:00:39 +08:00
jljsj
75d2d21b0b update badge anim 2015-11-20 17:00:39 +08:00
jljsj
55b9ec3feb update badge open max 99 2015-11-20 17:00:38 +08:00
jljsj
0a1c8ba811 update badge anim 0-9, 9-0 2015-11-20 17:00:38 +08:00
jljsj
ae287a2b68 update badge change.md 2015-11-20 17:00:38 +08:00
jljsj
57cde4ab18 update badge number 2015-11-20 17:00:38 +08:00
jljsj
a52567bee6 add badge the number scroll anim 2015-11-20 17:00:38 +08:00
afc163
2b6b294fb0 Merge pull request #562 from ant-design/update-timepicker
update timepicker component and fix a bug when clear input.
2015-11-20 15:06:26 +08:00
MG12
df180f942c update timepicker component and fix a bug when clear input. 2015-11-20 15:01:22 +08:00
afc163
ffcf55d241 Fix dropdown click usecase, ref #535 2015-11-20 14:26:59 +08:00
afc163
9268a0befd Fix eslint 2015-11-20 14:15:33 +08:00
afc163
e07a116659 update iconfont index.md 2015-11-20 11:30:21 +08:00
afc163
e058e67cb4 fix iconfont 2015-11-20 11:05:34 +08:00
afc163
3597e6a576 move matchMedia polyfill to carousel 2015-11-20 10:57:08 +08:00
afc163
5b65625a3b fix placeholder again 2015-11-19 19:28:36 +08:00
afc163
e42729f165 fix placeholder 2015-11-19 19:15:52 +08:00
afc163
ceb4761555 Fix code style 2015-11-19 19:09:51 +08:00
MG12
0bd4b783b9 remove useless file 2015-11-19 18:08:12 +08:00
MG12
8ad6479488 fix locale of default value 2015-11-19 18:02:00 +08:00
MG12
dbb8eaaa35 timepicker component feature fix 2015-11-19 18:02:00 +08:00
MG12
f65abf1d6d update less file and use variables; rename TimePicker to Timepicker 2015-11-19 18:02:00 +08:00
崖鹰
3b6745d175 add timepicker component 2015-11-19 18:02:00 +08:00
afc163
c10e7e2a49 keep placeholder can be set 2015-11-19 17:20:00 +08:00
afc163
c9a2cf2e90 update timepicker demo 2015-11-19 17:15:31 +08:00
afc163
b520982f22 update demo code style 2015-11-19 17:12:16 +08:00
afc163
ff200db6c4 fix text 2015-11-19 17:08:05 +08:00
afc163
4ba22f748d Merge pull request #553 from benjycui/deps-slider
deps: update Slider and its docs
2015-11-19 16:34:12 +08:00
afc163
8d85684b12 resume date time demo 2015-11-19 16:28:28 +08:00
afc163
2e54c5b30d return original date value in onChange 2015-11-19 15:53:40 +08:00
afc163
7733962e1a merge 2015-11-19 15:37:21 +08:00
MG12
2d84cd8a47 timepicker component feature fix 2015-11-19 15:19:40 +08:00
Benjy Cui
f51fa42353 fix: the placeholder of Datepicker 2015-11-19 15:10:48 +08:00
afc163
55bbd36c3c Add time demo into datepicker demo 2015-11-19 14:28:54 +08:00
Benjy Cui
d340910897 deps: update Slider and its docs 2015-11-19 14:25:34 +08:00
MG12
99f0a10812 update less file and use variables; rename TimePicker to Timepicker 2015-11-19 14:08:23 +08:00
崖鹰
bfb4342c0c add timepicker component 2015-11-19 14:07:31 +08:00
MG12
fbc4ad8aad update timepicker 2015-11-19 14:04:53 +08:00
MG12
30b34aa9a7 timepicker component featuer fix 2015-11-19 14:04:41 +08:00
MG12
cdb40fbbd2 update less file and use variables; rename TimePicker to Timepicker 2015-11-19 14:04:22 +08:00
崖鹰
bf4afae270 add timepicker component 2015-11-19 14:03:58 +08:00
afc163
9aaeb14fba Add props format for progress 2015-11-19 13:42:10 +08:00
afc163
c301c6b06d improve code style 2015-11-19 00:13:16 +08:00
jljsj
58f4c2f086 add badge anim 2015-11-18 23:42:01 +08:00
afc163
618d0a334a update slider demo 2015-11-18 17:50:22 +08:00
afc163
d02cd97dd9 Merge pull request #549 from benjycui/feat-slider
Feat slider
2015-11-18 17:23:26 +08:00
afc163
bf8b156413 Add badge demo 2015-11-18 17:05:56 +08:00
Benjy Cui
d4230132c1 chore: update examples 2015-11-18 16:56:22 +08:00
Benjy Cui
46f004877c feat: upgrade rc-slider 2015-11-18 16:54:38 +08:00
afc163
0e13be7500 update document 2015-11-17 16:33:47 +08:00
afc163
11555d3eb1 Update style for adjust iconfont baseline again
Finally, we can say goodbye to top:-1px and top:1px
2015-11-17 16:14:11 +08:00
afc163
268b2dd3ee fix rc-input-number 2015-11-17 14:35:43 +08:00
yiminghe
697fb5d8f9 add locale for calendar 2015-11-16 20:24:37 +08:00
yiminghe
162bcf3aca upgrade calendar 2015-11-16 20:10:29 +08:00
afc163
f18cc4dac9 fix spin type to empty 2015-11-16 17:45:58 +08:00
yiminghe
1a3a19793c add assign 2015-11-16 16:12:39 +08:00
afc163
9e5b828223 Merge branch 'develop-0.10.0' of github.com:ant-design/ant-design into develop-0.10.0 2015-11-16 15:58:22 +08:00
afc163
a4bb599e52 fix default check all, ref #533 2015-11-16 15:57:36 +08:00
afc163
f5b4ad7279 Fix selectRowKeys for rowKey demo, ref #533 2015-11-16 15:39:40 +08:00
afc163
c44feaa25b Fix iconfont wrong spell 2015-11-16 15:09:49 +08:00
血诺
37437014ae add header select minWidth style 2015-11-16 15:07:02 +08:00
afc163
4b75e9deca fix iconfont 2015-11-16 15:05:58 +08:00
afc163
83c914808a update iconfont style 2015-11-16 14:56:47 +08:00
afc163
1f000ff9da Merge pull request #534 from ant-design/feature-calendar
fix mode change when click month cell
2015-11-16 14:21:36 +08:00
afc163
d907ce62da better code style 2015-11-16 14:20:15 +08:00
血诺
d517a2d030 fix mode change when click month cell 2015-11-16 14:20:15 +08:00
yiminghe
7be9844877 add note 2015-11-16 14:13:58 +08:00
yiminghe
4aafe71030 upgrade deps 2015-11-16 14:10:42 +08:00
afc163
e9ffa37a9f update spin type 2015-11-16 11:10:15 +08:00
afc163
652195c9f7 Fix calendar controlled value 2015-11-15 21:40:01 +08:00
afc163
e54cd51162 make calendar value can be changed from outside 2015-11-15 15:46:05 +08:00
afc163
3cf2aa86bb Add dark theme demo 2015-11-14 17:38:55 +08:00
afc163
1124f746f7 add back dark theme style 2015-11-14 17:29:48 +08:00
afc163
ed1bb1b97b fix menu click 2015-11-14 16:00:56 +08:00
afc163
62243ab38b default theme 2015-11-14 14:39:32 +08:00
afc163
819bd7d216 fix iconfont style 2015-11-14 14:09:08 +08:00
zinkey
0d5e1d0957 iconfont 2015-11-14 00:13:20 +08:00
zinkey
fea3712845 iconfont 2015-11-14 00:09:43 +08:00
zinkey
6c5eb95720 iconfont 2015-11-13 23:41:08 +08:00
zinkey
33b25f1bba iconfont 2015-11-13 23:41:07 +08:00
zinkey
c3681cf9e4 iconfont 2015-11-13 23:38:02 +08:00
afc163
aee19b46d0 fix #523 2015-11-13 23:18:19 +08:00
afc163
39a3a8044b Merge branch 'develop-0.10.0' of github.com:ant-design/ant-design into develop-0.10.0 2015-11-13 22:35:22 +08:00
afc163
081be0c842 Add notice calendar demo 2015-11-13 22:34:49 +08:00
afc163
077f7de4ba improve calendar style 2015-11-13 21:24:25 +08:00
qiuyuntao
af289b9658 Merge pull request #526 from ant-design/issue/314
Issue/314  menu 视觉优化
2015-11-13 21:11:25 +08:00
yuntao.qyt
358ce21266 menu theme dark 2015-11-13 21:09:21 +08:00
zinkey
2d06ca5e95 iconfont 2015-11-13 21:09:07 +08:00
zinkey
4a47bb3e52 iconfont 2015-11-13 21:02:06 +08:00
afc163
5540ac7c9c type => mode 2015-11-13 20:32:54 +08:00
afc163
cf48526655 props.value is original Date object now 2015-11-13 20:20:54 +08:00
afc163
e8bc6f58ba rm NoteList, it should be in demo 2015-11-13 19:56:34 +08:00
afc163
4b4b2dbe36 custom render demo 2015-11-13 19:19:08 +08:00
zinkey
d14ab49918 iconfont 2015-11-13 19:13:59 +08:00
afc163
756cea0524 typo 2015-11-13 18:21:13 +08:00
afc163
1dadd262b9 update calendar 2015-11-13 18:20:22 +08:00
afc163
053cd4b158 Merge pull request #519 from ant-design/feature-calendar
improve calendar
2015-11-13 17:31:12 +08:00
血诺
4c50d5caf2 docs add onTypeChange 2015-11-13 17:27:30 +08:00
afc163
3797f1adb3 update upload 2015-11-13 16:10:27 +08:00
afc163
b6ff796e71 update upload 2015-11-13 16:09:39 +08:00
血诺
62bc47300a add onTypeChange 2015-11-13 15:11:38 +08:00
血诺
522c3fb0e7 remove selected cell style 2015-11-13 14:56:16 +08:00
afc163
e4afb5a420 fix demo 2015-11-13 11:43:12 +08:00
afc163
2ae25d1e03 hide picker when calendar overlay shown 2015-11-13 11:42:54 +08:00
血诺
1ec5bbb66f fix details 2015-11-12 23:51:38 +08:00
yuntao.qyt
29f07d0972 border && theme dark 2015-11-12 23:09:35 +08:00
血诺
d950c63c80 improve calendar 2015-11-12 21:34:33 +08:00
血诺
0c3432fd35 fix className concat 2015-11-12 21:28:02 +08:00
afc163
8a62a4d009 Merge branch 'develop-0.10.0' of github.com:ant-design/ant-design into develop-0.10.0 2015-11-12 19:12:25 +08:00
afc163
6382a14519 do not show title when there is no title in popover 2015-11-12 19:11:43 +08:00
yuntao.qyt
faf900a37f Merge branch 'develop-0.10.0' of github.com:ant-design/ant-design into issue/314 2015-11-12 14:58:42 +08:00
yuntao.qyt
9a3cfc096f theme dark 2015-11-12 14:57:54 +08:00
yiminghe
f41409f319 update docs 2015-11-12 14:16:17 +08:00
afc163
9edea2d4ff Merge pull request #503 from ant-design/feature-calendar
add components/calendar
2015-11-11 21:26:28 +08:00
afc163
60ec92fcf3 update docs 2015-11-11 17:44:16 +08:00
afc163
547db94de3 Add back calendar auto adjust style 2015-11-11 17:08:31 +08:00
afc163
f588e480df remove demo just for bug tracing 2015-11-11 15:48:02 +08:00
血诺
6c5a051d92 change listdata to listData 2015-11-11 14:32:58 +08:00
血诺
a2e7ff51fb fix details 2015-11-11 14:30:15 +08:00
血诺
a3e4043567 fix cols 2015-11-11 13:41:22 +08:00
血诺
7f4854a2c1 fix&improve 2015-11-11 13:11:47 +08:00
血诺
4db12ff733 add components/calendar 2015-11-11 13:11:47 +08:00
yiminghe
8fbd11015c fix datepicker in modal. Fixes #505 #506 2015-11-11 12:26:26 +08:00
yiminghe
42a86258cc add popupStyle for datepicker zIndex 2015-11-11 12:21:00 +08:00
xiaosheng.lj
3ea0225d61 feat add hover style 2015-11-11 00:28:05 +08:00
afc163
72a400c7e0 update API document, ref #498 2015-11-10 16:18:20 +08:00
afc163
09c208831f ref #498 2015-11-10 16:07:23 +08:00
yiminghe
56ea33a08a fix format parse 2015-11-10 15:39:59 +08:00
yiminghe
ac900e2919 update datepicker 2015-11-10 14:20:29 +08:00
yiminghe
cf503260ae upgrade calendar 2015-11-10 11:18:39 +08:00
yiminghe
d37370c144 fix lint 2015-11-09 11:13:31 +08:00
yiminghe
455441a645 fix placeholder 2015-11-09 10:58:52 +08:00
afc163
06dc2b9041 improve steps line css style 2015-11-08 15:42:33 +08:00
afc163
159b5b28e4 Add spin prefixCls, ref #435 2015-11-06 23:49:37 +08:00
afc163
2c523d7246 Add spining for better transition effect, ref #315 2015-11-06 23:43:23 +08:00
afc163
e4b0454f8b update datepicker demo 2015-11-06 22:27:58 +08:00
afc163
c05652a140 Add radio button disabled style, fix #489 2015-11-06 22:03:09 +08:00
afc163
d5acc3832a update form demo 2015-11-06 14:13:26 +08:00
afc163
cd4ec87064 fix #486 temporarily 2015-11-06 14:11:47 +08:00
afc163
b3e2855333 dataSource could be null 2015-11-05 20:06:16 +08:00
afc163
90966ea1c9 empty text should be inside spin 2015-11-05 20:02:49 +08:00
afc163
57c12fa3ae Add table column className demo 2015-11-05 19:46:29 +08:00
afc163
e323b0fc24 Remove demo text 2015-11-05 19:35:21 +08:00
afc163
516c9e1f51 Fix menu click arg 2015-11-05 19:09:33 +08:00
afc163
23b52b14f2 upgrade react-slick dep, fix carousel document, close #483 2015-11-05 18:29:44 +08:00
afc163
7a5bea24d2 update select api 2015-11-05 18:18:21 +08:00
afc163
bd04fbf354 Fix popconfirm animation, close #484 2015-11-05 18:14:20 +08:00
afc163
7ab0f7538d update validation demo 2015-11-05 18:07:24 +08:00
afc163
eb7568c8a6 update select style 2015-11-05 17:49:47 +08:00
afc163
2f18d05759 move input-number width to css 2015-11-05 17:35:21 +08:00
afc163
19c385ce58 Fix rowSelection when change dataSource 2015-11-05 17:30:24 +08:00
afc163
f2ce959d33 hide submenu on click 2015-11-05 14:18:46 +08:00
偏右
3fa30ddc43 Merge pull request #479 from ant-design/fix-popover-style
fix: delete :after of placement
2015-11-05 10:52:00 +08:00
popomore
d3e0c844a3 fix: delete :after of placement 2015-11-04 21:07:00 +08:00
afc163
f205f43bd9 update tooltip and placement demo 2015-11-04 20:48:51 +08:00
偏右
3659d8ab8e Merge pull request #474 from ant-design/feature-placement
feat: support more placement for popover
2015-11-04 20:31:33 +08:00
afc163
1742085df9 fix warnings 2015-11-04 19:40:38 +08:00
afc163
ba3a91738e Merge branch 'develop-0.10.0' of github.com:ant-design/ant-design into develop-0.10.0 2015-11-04 19:33:13 +08:00
afc163
d124dca717 better placement demo 2015-11-04 19:32:54 +08:00
yiminghe
b4830a8dd1 Merge branch 'develop-0.10.0' of github.com:ant-design/ant-design into develop-0.10.0 2015-11-04 18:08:29 +08:00
yiminghe
8005455ddd use div 2015-11-04 18:07:42 +08:00
afc163
f7c3550377 document for 0 value 2015-11-04 18:02:59 +08:00
afc163
75ca864dec document for 0 value 2015-11-04 18:02:36 +08:00
afc163
27155b5d81 hide badge when count is 0, fix #476 2015-11-04 18:00:37 +08:00
popomore
e62c4c7666 feat: support more placement for popconfirm 2015-11-04 17:50:49 +08:00
偏右
79682dd61c Merge pull request #473 from ant-design/fix-form-warning
fix: fix form demo warning. fixed #470.
2015-11-04 17:27:24 +08:00
afc163
30b6aeaa04 rowSelection getCheckboxProps, defaultValue should be defaultChecked 2015-11-04 17:23:20 +08:00
popomore
84647fa12d test: add simple testcase for popover 2015-11-04 17:22:33 +08:00
popomore
52fbd05072 feat: support more placement for popover
Ref #312
2015-11-04 17:18:40 +08:00
SimaQ
ecb1a8f447 fix: fix form demo warning. fixed #470. 2015-11-04 17:10:19 +08:00
afc163
3baeaeb0c3 rewrite iconfont demo page 2015-11-04 16:55:02 +08:00
afc163
c044f62374 update upload style 2015-11-04 12:00:49 +08:00
偏右
5616e552a4 Merge pull request #459 from ant-design/feat-upload
feat add upload progress effect
2015-11-04 11:19:03 +08:00
SimaQ
49459897d7 refine validation demo. 2015-11-03 23:34:51 +08:00
afc163
2b54004b7e update spin 2015-11-03 22:41:57 +08:00
afc163
a707df5276 Add filterMultiple in table column, close #442 2015-11-03 22:32:36 +08:00
afc163
be42f5687b update loading demo 2015-11-03 22:23:31 +08:00
yiminghe
dc1650486d fix button 2015-11-03 20:06:44 +08:00
afc163
7a9c536569 add loading prop for table 2015-11-03 18:16:16 +08:00
afc163
a3a7854cad should spin the table content, not contain pagination 2015-11-03 17:48:56 +08:00
afc163
556ec6068c Merge branch 'develop-0.10.0' of github.com:ant-design/ant-design into develop-0.10.0 2015-11-03 17:22:00 +08:00
afc163
664fb92104 update rc-table 2015-11-03 17:21:51 +08:00
yiminghe
6be657bc64 fix autocomplete 2015-11-03 17:13:05 +08:00
xiaosheng.lj
851da67f48 style uploadList to showUploadList 2015-11-03 16:59:04 +08:00
xiaosheng.lj
9cb8bef1ad feat add uploadlist config and fix color 2015-11-03 16:59:04 +08:00
xiaosheng.lj
440f69a800 style color with tint 2015-11-03 16:59:04 +08:00
xiaosheng.lj
0cc8035678 feat add upload progress effect 2015-11-03 16:59:04 +08:00
偏右
d184d87308 Merge pull request #466 from benjycui/feat-button
feat: make `Button` easy to use
2015-11-03 14:48:33 +08:00
Benjy Cui
5fd6999866 feat: make Button easy to use 2015-11-03 14:25:36 +08:00
afc163
e8c47a9fb5 update demo 2015-11-03 14:25:34 +08:00
yiminghe
052e8ee0f4 upgrade 2015-11-03 13:52:41 +08:00
afc163
9749b1692e update document 2015-11-02 16:37:40 +08:00
偏右
6a4743e7ac Merge pull request #433 from ant-design/form-modularization
form 组件
2015-11-02 16:32:04 +08:00
afc163
7c409e54b0 fix datepicker style 2015-11-02 14:46:06 +08:00
afc163
80983752c1 Merge branch 'develop-0.10.0' of github.com:ant-design/ant-design into develop-0.10.0 2015-11-01 13:00:38 +08:00
Benjy Cui
24a2e1ecca deps: upgrade rc-slider 2015-11-01 11:42:47 +08:00
afc163
b5e40560bf update demo style 2015-10-31 17:35:50 +08:00
afc163
84e71919da Datepicker upgrade 2015-10-31 15:16:05 +08:00
SimaQ
1c1bf9945a 细节修改,保持 dom 结构稳定。 2015-10-31 08:46:15 +08:00
SimaQ
26d9c64f4d fix: 修复通 Validator 结合使用输入失焦的问题。 2015-10-31 08:46:15 +08:00
SimaQ
0097b574d0 更新 Validation demo。 2015-10-31 08:46:15 +08:00
SimaQ
3a38ad40d3 更新 form 文档。 2015-10-31 08:46:14 +08:00
SimaQ
0d2a6f9c3c message 组件名更新.... 2015-10-31 08:46:14 +08:00
SimaQ
bc228af808 mv input-size.md to input.md, inputs.md to input-group.md 2015-10-31 08:46:14 +08:00
SimaQ
27a8d10f3c 更新文档。 2015-10-31 08:46:14 +08:00
SimaQ
7b675f0721 更新 form demo. 2015-10-31 08:46:14 +08:00
SimaQ
8f72f6cdcf 将 formItem 布局样式相关的属性写法同 layout 组件属性结合。 2015-10-31 08:46:14 +08:00
SimaQ
cd24f3d566 优化 Input.jsx 2015-10-31 08:45:36 +08:00
SimaQ
6d18737404 update demo. 2015-10-31 08:45:36 +08:00
SimaQ
b9bee33154 更新 validation demo. 2015-10-31 08:45:36 +08:00
SimaQ
c2e56746dc 更新 form 说明文案。 2015-10-31 08:45:36 +08:00
SimaQ
b8479d9d55 更新 form demo。 2015-10-31 08:45:35 +08:00
SimaQ
5bb37f7033 form 组建 2015-10-31 08:45:35 +08:00
SimaQ
042800c750 增加 size 定义。 2015-10-31 08:45:35 +08:00
SimaQ
e59d168453 去除 isCompact 属性,将是否添加 ant-form-item-compact 类在程序内部判断。 2015-10-31 08:45:35 +08:00
SimaQ
7ca132eca8 feat: add mixin for form. 2015-10-31 08:45:35 +08:00
SimaQ
ebab3c4199 update form demo. 2015-10-31 08:45:35 +08:00
SimaQ
6689011357 feat: Form modularization. 2015-10-31 08:44:38 +08:00
afc163
30a719f936 update document 2015-10-31 02:21:43 +08:00
afc163
e0c9da599a update table loading 2015-10-31 02:12:26 +08:00
afc163
dde31cfa1b update spin component 2015-10-31 02:00:03 +08:00
偏右
9f6ce589d6 Merge pull request #435 from KgTong/feature-spin
Feature spin
2015-10-31 00:33:06 +08:00
afc163
25368de60b update button demo style 2015-10-30 17:04:22 +08:00
afc163
f526703bf8 update disabled button demo 2015-10-30 17:00:06 +08:00
偏右
483446b28f Merge pull request #455 from ant-design/feature-delStyleAlign
del align
2015-10-30 16:48:11 +08:00
勤拭
cc58106186 del align 2015-10-30 16:45:10 +08:00
Benjy Cui
21231c50a1 docs: 增加多选 Select 校验的 demo 2015-10-30 16:06:27 +08:00
Benjy Cui
46452912c1 docs: update Slider's docs 2015-10-30 14:09:15 +08:00
KgTong
fa55d3a442 delete the loading attribute in spin/index.md 2015-10-30 13:16:51 +08:00
KgTong
b0bad43bf8 Merge remote-tracking branch 'ant/develop-0.10.0' into feature-spin 2015-10-30 13:11:39 +08:00
KgTong
ed91ce0931 use animation judge function, and remove the loading attribute 2015-10-30 11:56:23 +08:00
偏右
4eef432425 Update index.md 2015-10-29 23:17:25 +08:00
afc163
fee949cd04 update code style 2015-10-29 20:15:44 +08:00
afc163
3a5f301fad update code style 2015-10-29 20:14:08 +08:00
afc163
67c0e2ad0e update document 2015-10-29 20:10:44 +08:00
偏右
ba023f3f05 Merge pull request #447 from ant-design/feature-colspan-rowspan
support colspan and rowspan
2015-10-29 20:00:15 +08:00
afc163
e246dfeb06 update datepicker style 2015-10-29 19:59:48 +08:00
afc163
bd61bad5ee date null is meaning value 2015-10-29 19:37:39 +08:00
勤拭
7664a41f9b 调整格式 2015-10-29 17:31:47 +08:00
勤拭
6e184378bf 文档逗号改为中文格式 2015-10-29 17:03:15 +08:00
勤拭
c2e67f72ed standard format 2015-10-29 16:23:09 +08:00
勤拭
e9cfca0d89 support colspan and rowspan 2015-10-29 15:38:59 +08:00
afc163
3a68e2fe1f update tabs demo 2015-10-29 15:27:43 +08:00
afc163
d375942e4b update tabs demo 2015-10-29 15:23:58 +08:00
偏右
f528017412 Merge pull request #438 from ant-design/develop-0.10.0fortreedynamic
Dynamic Tree
2015-10-29 14:19:30 +08:00
ioldfish
a63360734c demo中去掉propTypes 2015-10-29 14:02:51 +08:00
ioldfish
97942c6f2d Merge branch 'develop-0.10.0' of https://github.com/ant-design/ant-design into develop-0.10.0
Conflicts:
	package.json
2015-10-29 13:42:40 +08:00
ioldfish
01bf42d712 Merge branch 'develop-0.10.0' of https://github.com/ant-design/ant-design into develop-0.10.0
Conflicts:
	package.json
2015-10-29 09:55:47 +08:00
Haibin Yu
0d2c6b2505 remove state items in uploadList.jsx 2015-10-29 00:06:39 +08:00
KgTong
852377b6b3 ES6 syntax for spin demo code 2015-10-28 21:40:05 +08:00
afc163
753c01ae18 ES6 syntax for demo code
fix antd.notification
2015-10-28 20:55:49 +08:00
afc163
dffbda521c update datepicker demo 2015-10-28 19:48:32 +08:00
KgTong
7ad9db3eb3 fix IE version logic 2015-10-28 19:39:36 +08:00
KgTong
2e67eae9dd Merge remote-tracking branch 'ant/develop-0.10.0' into feature-spin 2015-10-28 19:33:45 +08:00
KgTong
89517f6e45 support align center and fix compatibility for IE 2015-10-28 19:33:25 +08:00
afc163
17afda5028 update demo start-end 2015-10-28 18:35:56 +08:00
afc163
735ed1f89f update iconfont code sample 2015-10-28 18:13:15 +08:00
偏右
1d30992de2 Merge pull request #440 from ant-design/layout-component
layout 组件化
2015-10-28 18:10:55 +08:00
pizn
90c8d17bbe feat: 重构下 className 的写法,支持原有的 className 2015-10-28 18:04:56 +08:00
偏右
5ab1a16a32 Merge pull request #443 from coderhaoxin/fix-badge-count
fix: get count from props
2015-10-28 17:51:14 +08:00
haoxin
147ffa4209 fix: get count from props 2015-10-28 17:47:28 +08:00
pizn
68a952fb62 update: 修改 flex demo 2015-10-28 17:24:35 +08:00
afc163
7c9892a9c7 Add Button propsType 2015-10-28 15:45:31 +08:00
pizn
d1e60798af udpate... 2015-10-28 00:02:31 +08:00
pizn
69aaa6c296 Add layout componet for antd 2015-10-27 23:52:17 +08:00
偏右
59c511fe19 Merge pull request #437 from ant-design/ie8-button-radius-support
support border radius in ie8 via css3pie
2015-10-27 20:05:26 +08:00
afc163
e19186f783 confirmLoading is fully controlled by props now, fix #392 2015-10-27 19:57:18 +08:00
afc163
0193df102b update table ajax demo 2015-10-27 19:37:39 +08:00
afc163
f7ef12acf1 Remove some demo 2015-10-27 19:19:09 +08:00
afc163
64b4031d7a Fix key warning in table demo 2015-10-27 17:27:11 +08:00
ioldfish
2fefd5d103 Merge branch 'develop-0.10.0' of https://github.com/ant-design/ant-design into develop-0.10.0
Conflicts:
	package.json
2015-10-27 16:44:31 +08:00
ioldfish
49c019f86d Merge branch 'develop-0.10.0' of https://github.com/ant-design/ant-design into develop-0.10.0
Conflicts:
	package.json
2015-10-27 16:28:00 +08:00
afc163
602c2d1f9d support border radius in ie8 via css3pie 2015-10-27 16:26:56 +08:00
ioldfish
8f887d3879 update ant-tree dynamic 2015-10-27 15:47:01 +08:00
KgTong
0f4b4ae39f fix table loading when removing type attrite of spin 2015-10-27 15:15:24 +08:00
KgTong
686a21df78 remove type attribute of spin 2015-10-27 14:58:04 +08:00
KgTong
ea0e9b7d6a fix for code review 2015-10-27 14:01:55 +08:00
KgTong
103104b256 fix conflict 2015-10-27 11:06:15 +08:00
KgTong
b9ce4c7ddf replace the table loading with spin 2015-10-27 10:34:05 +08:00
KgTong
5c1a11710d add spin component 2015-10-27 10:10:27 +08:00
xiaoshuai
25a3a3c7b9 fix progressbar worning 2015-10-26 20:14:41 +08:00
afc163
62115e9034 just hide toottip overlay when there is no title
avoid rerender children when title is changed
2015-10-26 16:30:27 +08:00
afc163
4edb61876e Merge branch 'develop-0.10.0' of github.com:ant-design/ant-design into develop-0.10.0 2015-10-26 11:09:12 +08:00
afc163
5a50df6b78 use ghost button to match primary button 2015-10-26 11:08:36 +08:00
afc163
cad3fdff45 lg => large, sm => small 2015-10-26 11:02:48 +08:00
yiminghe
17b1ec14f8 add tabs add demo 2015-10-26 10:56:09 +08:00
afc163
7ae46cd406 no show toolitp when there is no title 2015-10-25 14:55:31 +08:00
Pyiner
776238eda9 fix _target to target 2015-10-24 15:14:53 +08:00
afc163
1e79f487c8 Read locale from deps 2015-10-23 23:50:26 +08:00
jiang
1931db6307 update route md key 2015-10-23 23:15:03 +08:00
afc163
de49cb6e1b Merge branch 'develop-0.10.0' into queue-anim 2015-10-23 22:37:49 +08:00
afc163
c4b0918872 update queue-anim demos 2015-10-23 22:37:42 +08:00
afc163
cd0703e462 remove enter-animation 2015-10-23 21:38:35 +08:00
afc163
5d7fea6c68 Add locale prop link 2015-10-23 18:17:57 +08:00
afc163
f8122309fa Add locale support for datepicker, #424 2015-10-23 17:57:02 +08:00
jljsj
894ae72f43 update router animation 2015-10-23 17:39:37 +08:00
jljsj
eedcb0ea63 remove style.md "gi" 2015-10-23 15:59:15 +08:00
afc163
b7a32da9ec update code style 2015-10-23 15:55:58 +08:00
jljsj
ac87334179 update queue-anim demo ReactDOM 2015-10-23 14:53:57 +08:00
afc163
875635e027 Fix datepicker format 2015-10-23 11:52:05 +08:00
afc163
64e54c42b4 update code style 2015-10-23 10:51:56 +08:00
afc163
6757dc8199 Hide unfinish demo 2015-10-22 23:54:56 +08:00
afc163
4bed95ef6a Merge 2015-10-22 21:30:28 +08:00
afc163
71e026467a Merge branch 'queue-anim' of github.com:ant-design/ant-design into queue-anim 2015-10-22 21:26:21 +08:00
偏右
83664dbd28 Merge pull request #422 from ant-design/unify-size-prop
unify all size prop to: large default small
2015-10-22 21:13:14 +08:00
afc163
3b6c92045c update demo style 2015-10-22 21:12:13 +08:00
afc163
415fa383e3 unify all size prop to: large default small 2015-10-22 21:01:52 +08:00
yiminghe
fdee139459 add className for table 2015-10-22 17:28:12 +08:00
afc163
75eefe533c upgrade datepicker 2015-10-22 17:16:02 +08:00
afc163
86c5ead45a Add onChange prop to Table, fix #395 2015-10-21 20:21:14 +08:00
偏右
3af6ea1639 Merge pull request #417 from ant-design/feature-vertical-tabs
Add vertical tabs, fix #398
2015-10-21 20:04:29 +08:00
afc163
b6cdeb157d Add vertical tabs, fix #398 2015-10-21 20:00:02 +08:00
jljsj
d2cf91d837 update queue-anim interval 2015-10-21 18:15:17 +08:00
Benjy Cui
f7a8b11243 chore: remove deprecated APIs 2015-10-21 17:59:57 +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
yiminghe
8c71530838 add start end demo for datepicker 2015-10-21 16:27:48 +08:00
yiminghe
1e43c9ddc5 upgrade tabs 2015-10-21 14:53:48 +08:00
afc163
eed88125f1 Fix document 2015-10-21 10:48:58 +08:00
yiminghe
8f2e8437be add calendarStyle 2015-10-20 16:50:42 +08:00
yiminghe
76b0f673ec beta2 2015-10-20 16:47:55 +08:00
afc163
aed7eae2bc Fix confirmLoading 2015-10-20 10:45:49 +08:00
羽航
999e8a0e53 fix conflict 2015-10-20 09:50:47 +08:00
afc163
f26bbc1cd5 Add document version switch in footer, #406 2015-10-19 17:58:56 +08:00
afc163
e5bed684eb Remove enter-animation document 2015-10-19 16:21:26 +08:00
jljsj
bf1d703274 queue-anim demo 2015-10-19 15:36:32 +08:00
afc163
dc47b1cd5b fix reqwest 2015-10-19 11:34:44 +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
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
afc163
164c01b5ba Merge branch 'master' into develop-0.10.0 2015-10-14 16:44:52 +08:00
afc163
a3b2ad5791 #380 2015-10-14 10:29:15 +08:00
羽航
1c9b9e8c86 fix little code style 2015-10-13 13:30:37 +08:00
羽航
dd76fe6520 增加InputNumber的Validator示例 2015-10-13 13:26:49 +08:00
yiminghe
fb43a1b86d fix anim server render 2015-10-13 12:52:41 +08:00
羽航
1efca6afa3 增加Datepicker的Validator示例 2015-10-12 17:53:32 +08:00
羽航
52edc78676 修改onSelect属性为onChange属性,以支持Validator.为向前兼容,保留了onSelect属性. 2015-10-12 17:53:01 +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
100adfc69a update row select argument name 2015-10-10 11:35:31 +08:00
afc163
d184b39450 Merge branch 'feature-#252' of https://github.com/RaoHai/ant-design into develop-0.10.0 2015-10-09 18:48:32 +08:00
RaoHai
2c1fda70d6 Table 列选择模式重构
+ 表格 `rowSelection` 支持多选
+ 表格可配置某行数据默认选中、不能选中。该配置对 ajax 载入的数据有效。
示例:
```
getCheckboxProps: function (value) {
    return {
        defaultValue: value.name === '胡彦祖ajax2', // 配置默认勾选的列
        disabled: value.name === '李大嘴ajax3'    // 配置无法勾选的列
    }
},
```
2015-10-09 17:14:09 +08:00
Benjy Cui
1e45e02e8a feat: add support for htmlType 2015-10-09 16:55:07 +08:00
Benjy Cui
f4ca0798de refactor: generate className with rcUtil.classSet 2015-10-09 16:42:08 +08:00
偏右
88f6be5855 Merge pull request #368 from benjycui/feature-button
chore: replace `button` tag with `Button` component
2015-10-09 15:47:14 +08:00
Benjy Cui
26069c33e9 chore: upgrade react-slick in order to work with React@0.14.x 2015-10-09 11:35:44 +08:00
Benjy Cui
429a4ca382 refactor: joinClasses is removed in React@0.14.x 2015-10-09 10:55:52 +08:00
Benjy Cui
5b86a4be1d refactor: replace button tag with Button component 2015-10-08 15:13:04 +08:00
afc163
93c181677a Merge branch develop-0.10.0 2015-10-06 12:55:01 +08:00
Benjy Cui
2f771b0482 feat: button should be a component 2015-10-05 15:19:07 +08:00
elrrrrrrr
c540d124a5 chore: 迁移 upload iconfont 2015-10-02 16:52:34 +08:00
elrrrrrrr
725a142669 chore: 迁移 tag iconfont 2015-10-02 16:39:15 +08:00
elrrrrrrr
b7a922a895 chore: 迁移 tabs iconfont 2015-10-02 16:36:48 +08:00
elrrrrrrr
1640a34c4c chore: 迁移 table iconfont 2015-10-02 16:31:51 +08:00
elrrrrrrr
37a1e03bc8 chore: 迁移 switch iconfont 2015-10-02 16:25:10 +08:00
elrrrrrrr
335c34aab7 chore: 迁移 slider iconfont
- 需要飞哥 review
2015-10-02 16:18:43 +08:00
elrrrrrrr
b9fa8d1a45 chore: 迁移 progress iconfont 2015-10-02 15:58:37 +08:00
elrrrrrrr
ac6505e68a chore: 迁移 notification iconfont 2015-10-02 15:48:56 +08:00
elrrrrrrr
244c3a78a5 chore: 迁移 modal iconfont
- api 接口有变
2015-10-02 15:41:04 +08:00
elrrrrrrr
f99848a5a0 chore: 迁移 message iconfont
- 需要修改组件 jsx
2015-10-02 15:32:16 +08:00
elrrrrrrr
ae5ae396ef chore: 迁移 menu iconfont 2015-10-02 15:26:18 +08:00
elrrrrrrr
d467994249 chore: 迁移 form iconfont 2015-10-02 15:17:21 +08:00
elrrrrrrr
d89cc5610b chore: 迁移 dropdown iconfont 组件 2015-10-02 15:12:07 +08:00
elrrrrrrr
bcc4265201 chore: 迁移 button iconfont
- 手动加上 margin-right 8px
2015-10-02 15:04:28 +08:00
elrrrrrrr
a85898da62 chore: 迁移 breadcrump iconfont 2015-10-02 14:25:46 +08:00
elrrrrrrr
7f701cc2b7 chore: 迁移 badge iconfont 2015-10-02 14:23:53 +08:00
elrrrrrrr
64aa7b0acb chore: 迁移 alert 组件 iconfont 2015-10-02 14:21:02 +08:00
elrrrrrrr
2ec165d2aa chore(iconfont): 根据 CR 修复代码风格 2015-09-26 01:26:30 +08:00
elrrrrrrr
6465712385 feat: 抽离 Icon 组件、支持自定义属性
fixed #307
2015-09-26 01:26:30 +08:00
afc163
05347da926 not emit fetch when there is no dataSource change, #347 2015-09-26 00:56:15 +08:00
afc163
094ae9bbbf update upload document 2015-09-24 19:43:02 +08:00
afc163
147b4ac49b Add overlayClassName to popover and tooltip 2015-09-24 18:38:31 +08:00
afc163
52b639faba Should update table data when changing pageSize
fix #317
2015-09-23 14:28:08 +08:00
afc163
74b2c8fcc1 update pagination document 2015-09-23 14:13:31 +08:00
Yuwei Ba
a08fa60930 添加 pageSize 发生变化的回调。 #317 2015-09-23 13:58:56 +08:00
afc163
67735552bb update progress index.md 2015-09-22 20:14:56 +08:00
afc163
73c1d3f595 update progress demo 2015-09-22 20:11:28 +08:00
afc163
176adab763 update modal basic demo 2015-09-22 15:11:29 +08:00
afc163
c5cab1d687 Add confirmLoading prop for Modal
You can use `confirmLoading` to cancel button loading status.

```
onOk() {
  ...
  this.setState({
    confirmLoading: false
  });
}
```

Fix #322
2015-09-22 15:06:10 +08:00
afc163
961b990f07 upgrade rc-upload to 1.6.x 2015-09-21 11:34:14 +08:00
afc163
6854a83989 get filename 2015-09-20 13:56:14 +08:00
afc163
7d82eccb41 update upload list logic 2015-09-19 17:05:41 +08:00
afc163
6474cb378b Fix upload try logic 2015-09-18 23:31:07 +08:00
afc163
63fa44867c update badge style 2015-09-18 17:24:14 +08:00
afc163
d6a4094bc4 Allow multiple confirm dialogs popup 2015-09-18 16:00:12 +08:00
afc163
d8ae9003ea Fix iconfont script url 2015-09-17 20:18:14 +08:00
yiminghe
7b4bdc8482 fix placeholder 2015-09-17 19:31:52 +08:00
羽航
05e36a4018 fix little text 2015-09-17 16:16:53 +08:00
afc163
181d20e6ff Merge branch 'master' of github.com:ant-design/ant-design 2015-09-16 20:02:51 +08:00
afc163
f266298553 update upload 2015-09-16 20:02:29 +08:00
yiminghe
0435ca60e3 update filterOption 2015-09-16 19:52:09 +08:00
afc163
74d8ecb1fd Fix IE9 file.status problem 2015-09-16 18:48:22 +08:00
afc163
78d15aabbf Fix initial maxDescriptionWidth for vertical steps 2015-09-16 18:23:51 +08:00
afc163
e4577eb1bb update steps demos 2015-09-16 16:28:57 +08:00
羽航
89c34ebceb Merge branch 'master' of github.com:ant-design/ant-design 2015-09-16 14:44:15 +08:00
羽航
f4372f3cbf update rc-steps v1.2.5 Steps组件增加current属性,可自动判断当前正在执行状态。 2015-09-16 14:44:03 +08:00
afc163
bd1f13efba show current father menu only 2015-09-16 12:18:17 +08:00
jljsj
af3b98a742 update enetr-animation from.md 2015-09-15 17:55:56 +08:00
jljsj
f4f0605a5f update basic and enter-data demo 2015-09-15 17:52:16 +08:00
jljsj
d42c248780 Merge branch 'master' of github.com:ant-design/ant-design 2015-09-15 17:41:58 +08:00
jljsj
b52b6c8bbf update enter-animation demo 2015-09-15 17:41:34 +08:00
afc163
9603413223 fix enter-animation router demo 2015-09-15 17:36:27 +08:00
afc163
961a679a9f upgrade to fit react-router@1.0.0-rc1 2015-09-15 17:35:22 +08:00
afc163
55a028ba71 useless file 2015-09-15 16:32:28 +08:00
jljsj
8a8790831a Merge branch 'master' of github.com:ant-design/ant-design 2015-09-15 14:21:01 +08:00
jljsj
a734954c65 update enter-animation index.md 2015-09-15 14:20:45 +08:00
afc163
88108b9fb9 Fix loading icon position in empty table 2015-09-15 11:40:58 +08:00
afc163
4784025149 simple demo 2015-09-14 19:55:09 +08:00
jljsj
59b0bc8ecd Merge branch 'master' of github.com:ant-design/ant-design 2015-09-14 17:01:55 +08:00
jljsj
f9b816a49e updata enetr-animation use-method 2015-09-14 17:01:35 +08:00
afc163
9c74d28933 fix iconfont page style 2015-09-14 15:19:44 +08:00
afc163
13ebd2d76d Fix pagination in table 2015-09-14 13:38:19 +08:00
afc163
fcc8c26166 Add error status for upload file item 2015-09-14 00:28:39 +08:00
afc163
6188fc3c70 update index.md 2015-09-11 18:31:59 +08:00
afc163
a1d5030174 rollback blur mask 2015-09-11 17:11:00 +08:00
jljsj
a1d9cb310a Merge branch 'master' of github.com:ant-design/ant-design 2015-09-11 16:47:08 +08:00
jljsj
9d5bc12db0 add modal bg blur, remove motion blur 2015-09-11 16:46:28 +08:00
afc163
e3f34537a1 Merge branch 'master' of github.com:ant-design/ant-design 2015-09-11 15:01:30 +08:00
偏右
27dc4e333b Merge pull request #249 from ant-design/enterAnimation0.4.0
Enter animation0.4.0
2015-09-11 14:59:49 +08:00
afc163
7d14e69f81 Merge branch 'master' of github.com:ant-design/ant-design 2015-09-11 14:57:43 +08:00
afc163
b4a2fc3524 Add instant, improve site speed 2015-09-11 14:57:32 +08:00
jljsj
c7fd8285c1 updata slide scale(.8). add zoomBig 2015-09-11 14:02:00 +08:00
jljsj
d3f40e37c5 updata enter-leave show 2015-09-11 13:38:40 +08:00
jljsj
365fc535e0 update enter-animation demo 2015-09-11 12:02:08 +08:00
jljsj
1fc30ef0c3 updata enter-animation index.md 2015-09-11 11:12:30 +08:00
jljsj
2e829690d0 update enterAnimation style is object and string 2015-09-10 16:20:24 +08:00
jljsj
d415ed4561 update enterAnimation demo 2015-09-10 11:21:23 +08:00
zhujun24
af6a8d31ee optimize 2015-09-10 11:15:36 +08:00
zhujun24
95465a6794 add expand table 2015-09-10 11:04:31 +08:00
afc163
d2fac30c7f update upload index.md 2015-09-09 22:41:51 +08:00
afc163
b35f85751b update table api 2015-09-09 22:37:22 +08:00
jljsj
bee8da2f50 update enterAnimation router.md 2015-09-09 17:08:12 +08:00
jljsj
196d2cb9cf updata enterAnimation index.md 2015-09-09 17:01:29 +08:00
jljsj
bfd173ac4e updata enterAnimation router deom text 2015-09-09 15:07:46 +08:00
jljsj
0c18be6556 updata enterAnimation demo text 2015-09-09 15:05:06 +08:00
jljsj
3dbd766c24 updata enterAnimation router.md title 2015-09-09 15:02:37 +08:00
afc163
ea1a9f0a3d Fix multiple upload onChange event 2015-09-09 14:58:17 +08:00
jljsj
9b56e3753d Merge branch 'master' of github.com:ant-design/ant-design into enterAnimation0.4.0 2015-09-09 14:52:36 +08:00
jljsj
a48acc2fab update enterAnimation router add 2015-09-09 14:52:16 +08:00
jljsj
78f298ff4b updata enterAnimation index.md 2015-09-08 18:27:47 +08:00
afc163
897315784d Fix info.fileList in multiple upload 2015-09-08 18:26:18 +08:00
jljsj
eba40467a4 Merge branch 'master' of github.com:ant-design/ant-design into enterAnimation0.4.0 2015-09-08 18:22:40 +08:00
jljsj
261835e786 update enterAnimation 2015-09-08 18:22:30 +08:00
afc163
346337936a update multiple upload demo 2015-09-08 18:05:55 +08:00
afc163
f229f86a75 Fix multiple upload 2015-09-08 17:47:07 +08:00
afc163
f0a7167a49 use button[type="button"] to prevent default submit behavior 2015-09-08 16:02:43 +08:00
afc163
ff6697b951 Remove build-in message display in Upload component 2015-09-08 15:38:28 +08:00
afc163
6dbb7ba8ba update confirm modal button text 2015-09-08 15:03:02 +08:00
afc163
0ac1f76553 Fix visible state bug in handleCancel 2015-09-08 12:38:21 +08:00
afc163
a63e2f8c0c Remove console.log 2015-09-07 21:48:30 +08:00
jljsj
dec9bc74e5 Merge branch 'master' of github.com:ant-design/ant-design into enterAnimation0.4.0 2015-09-07 18:38:05 +08:00
jljsj
59b1f1c4fa update enter-animation 2015-09-07 18:37:07 +08:00
zhujun24
29638d3d3b rename pending api 2015-09-07 15:26:42 +08:00
zhujun24
f3bbf778f8 continue api position 2015-09-07 15:13:59 +08:00
afc163
68e44f3080 update demo text 2015-09-07 12:32:31 +08:00
afc163
1e5271491e Add loading message 2015-09-07 12:27:09 +08:00
afc163
75d710a1b8 Add some info type Modal, close #244 2015-09-07 11:48:57 +08:00
afc163
579ad01fc5 rollback for reqwest 2015-09-07 11:24:28 +08:00
afc163
5a47594a86 update timeline text 2015-09-07 10:43:48 +08:00
afc163
b25b48b6e5 fix reqwest 2015-09-07 10:20:20 +08:00
zhujun24
4a61592ff6 optimize 2015-09-02 12:12:11 +08:00
afc163
9355052359 update timeline style 2015-09-01 22:20:27 +08:00
zhujun24
082104a2ae optimize code 2015-09-01 21:39:29 +08:00
zhujun24
3e3ff021b6 Merge remote-tracking branch 'upstream/master' into component-timeline 2015-09-01 21:15:40 +08:00
zhujun24
018a62886d add timeline 2015-09-01 21:15:31 +08:00
afc163
8ba3dedeec update badge index.md 2015-09-01 17:48:22 +08:00
afc163
058199ed2c update steps 2015-09-01 17:43:08 +08:00
afc163
034b561948 Fix PropTypes 2015-09-01 17:19:31 +08:00
afc163
3165da4246 update badge 2015-09-01 17:16:51 +08:00
偏右
d60ffeeafe Merge pull request #233 from zhujun24/vertical-steps
restore vertical steps
2015-09-01 16:23:07 +08:00
afc163
691b0147b1 update eslintrc and fix code 2015-09-01 16:19:39 +08:00
zhujun24
f34ed22d1a Merge remote-tracking branch 'upstream/component-timeline' into component-timeline 2015-09-01 15:41:53 +08:00
zhujun24
6f0ba9142e restore vertical steps 2015-09-01 15:30:51 +08:00
sorrycc
8cbd9ae6f9 upgrade react-slick to 0.7 2015-09-01 14:30:24 +08:00
afc163
af2425d7d5 Add component badge 2015-09-01 13:59:45 +08:00
afc163
c5be535a3e Add timeline component 2015-09-01 11:47:12 +08:00
afc163
37a9f72c0f Merge branch 'master' of github.com:ant-design/ant-design 2015-09-01 11:36:43 +08:00
yiminghe
b6ec8b9ec1 Merge pull request #226 from ant-design/upload-filelist
重构 Upload API
2015-09-01 11:29:52 +08:00
yiminghe
af30f55e7a optimize 2015-09-01 11:26:33 +08:00
afc163
8b7a2a4dee update steps index.md 2015-09-01 11:16:08 +08:00
偏右
e0f2eb214e Merge pull request #225 from zhujun24/vertical-steps
Vertical steps
2015-09-01 11:06:06 +08:00
afc163
d8384a3791 Fix datepicker can not be set to null 2015-09-01 10:59:12 +08:00
afc163
42708fe45d Refractor upload API
1. Remove limit urlResolver and onRemove
2. Remove onSuccess onProgress onError
3. Add onChange
4. Add fileList and defaultFileList props
2015-09-01 00:55:49 +08:00
afc163
f50342b2ba use onChange 2015-09-01 00:55:49 +08:00
afc163
03cc7cbffa Change variable name 2015-09-01 00:55:48 +08:00
zhujun24
663d3d02fe remove useless style 2015-08-31 20:51:45 +08:00
zhujun24
9a7814396e vertical re-stpes 1.2.1 2015-08-31 20:24:47 +08:00
yiminghe
fbad793d3d upgrade select 2015-08-31 19:41:58 +08:00
afc163
f7308fbb48 Replace reqwest via reqwest-without-xhr2
Fork reqwest to https://github.com/ant-design/reqwest,
Remove xhr2 dependency cause it is useless in browser side, it will
cause some bugs in different pack solutions, waiting offcial repo resolve this problem: https://github.com/ded/reqwest/issues/204

ref: #216
2015-08-31 17:31:12 +08:00
afc163
9dcd2a05ea update datepicker document 2015-08-31 16:45:03 +08:00
chencheng (云谦)
0c40b6af68 typo fix 2015-08-31 16:13:58 +08:00
zhujun24
d720a908a0 Merge remote-tracking branch 'upstream/master' into vertical-steps 2015-08-31 15:16:02 +08:00
afc163
5461ec5c89 Merge branch 'master' of github.com:ant-design/ant-design 2015-08-31 12:14:57 +08:00
afc163
e77cca572b Add limit prop for upload 2015-08-31 12:13:55 +08:00
yiminghe
3ec73ec965 fix open animation 2015-08-31 12:10:54 +08:00
afc163
23fce559b0 Fix autoclose duration 2015-08-29 13:02:37 +08:00
afc163
e45fbaad7f empty table should not have pagination 2015-08-28 17:30:37 +08:00
afc163
4c54644116 Add empty style for table 2015-08-28 17:20:02 +08:00
afc163
f101c3231e Add urlResolver, support display remote file url in list
拿到请求回调数据里的远程文件地址,展示在文件列表中方便下载
2015-08-28 16:12:19 +08:00
afc163
cf22c35a1d Merge branch 'master' of github.com:ant-design/ant-design 2015-08-28 15:25:45 +08:00
afc163
90e8296949 Fix table key warning 2015-08-28 15:22:09 +08:00
sorrycc
975c4d784f fix(carousel): fade 效果下不允许拖拽, Close #212 2015-08-28 13:55:36 +08:00
zhujun24
b875855652 modify style 2015-08-28 11:09:10 +08:00
yiminghe
065c16a95f fix download 2015-08-28 10:45:54 +08:00
afc163
4e89f5002b Fix eslint problems 2015-08-28 00:11:56 +08:00
afc163
6d2dcc4539 allow dataSourse controlled by parent in local mode 2015-08-27 23:55:25 +08:00
afc163
c799326e7f default pagination current page 2015-08-27 23:53:42 +08:00
afc163
9b8abb2199 loading should be in remote mode 2015-08-27 23:52:59 +08:00
yiminghe
30efa794d7 fix download 2015-08-27 17:51:21 +08:00
yiminghe
4a252ab8a8 Merge branch 'master' of github.com:ant-design/ant-design 2015-08-27 17:35:26 +08:00
yiminghe
f9450f14df remove file on file failture 2015-08-27 17:35:10 +08:00
偏右
c704569bfe Merge pull request #213 from chenjiahan/patch-1
percent拼写错误
2015-08-27 16:56:15 +08:00
yiminghe
97ac458507 add res for upload 2015-08-27 16:53:53 +08:00
Neverland
574b6992c4 percent拼写错误 2015-08-27 16:41:30 +08:00
yiminghe
3cc4a374db update docs 2015-08-27 15:57:25 +08:00
yiminghe
c2b4b60267 add onRemove for upload 2015-08-27 15:46:23 +08:00
yiminghe
61bd8abab0 add onRemove for upload 2015-08-27 15:45:38 +08:00
zhujun24
3118ee32e3 optimize code 2015-08-27 14:36:02 +08:00
yiminghe
06aa5877e2 fix children map 2015-08-27 13:34:38 +08:00
zhujun24
8a99d0bc5a add vertical steps 2015-08-27 13:20:31 +08:00
yiminghe
4bf5e4e3f4 fix children map 2015-08-27 13:18:23 +08:00
陈三
97f7be1832 fixed typo 2015-08-26 22:00:48 +08:00
zhujun24
f664275a1e add big vertical steps 2015-08-26 18:28:29 +08:00
afc163
38cbaf1239 dataSource clone config should not be overwrited by origin config, fix #200 2015-08-26 14:08:46 +08:00
afc163
461ffdf421 Fix select demo, close #195 2015-08-26 11:09:43 +08:00
afc163
35f64c436e Fix demo, #196 2015-08-26 11:02:13 +08:00
afc163
bdf13797cb update documentation 2015-08-25 20:29:34 +08:00
afc163
c33569e4d1 ref #190 2015-08-25 18:38:34 +08:00
afc163
19af7309e1 Merge branch '0.8.0' 2015-08-25 17:39:07 +08:00
yiminghe
f79273ce8b update style 2015-08-25 17:33:24 +08:00
yiminghe
109e283e15 add MonthCalendar 2015-08-25 17:33:01 +08:00
afc163
8c2c65adf4 update modal custom.md 2015-08-25 17:08:43 +08:00
afc163
e6d92e37b1 update modal default props 2015-08-25 16:56:08 +08:00
afc163
47bb3d620d update button/index.md 2015-08-25 16:49:27 +08:00
afc163
94c9081c83 default modal width change to 520px 2015-08-25 16:25:08 +08:00
afc163
1845bc0633 update index.md 2015-08-25 14:15:46 +08:00
afc163
e01c653e17 className 2015-08-25 12:01:01 +08:00
yiminghe
70d04d9d31 add open anim 2015-08-25 11:11:21 +08:00
yiminghe
afe77270c6 fix tree anim 2015-08-25 11:03:46 +08:00
afc163
f97e0c6c03 beta7 2015-08-24 21:16:00 +08:00
afc163
86c90f0109 只有 dataSource 的变化才能从外面触发新请求
另外,is-equals-shallow 的比较始终是 false,因为 props.columns 是 array
2015-08-24 21:08:00 +08:00
afc163
217a43f2ad shorter duration 2015-08-24 19:47:20 +08:00
afc163
f48dc8d086 fix safari flash bug 2015-08-24 19:34:31 +08:00
偏右
adb2843df6 Merge pull request #188 from ant-design/new-menu-animation
Add menu animation
2015-08-24 19:25:38 +08:00
afc163
583cd739ef refractor code 2015-08-24 19:21:14 +08:00
jljsj
6b66ad7dbf 去除行效果了 2015-08-24 18:32:06 +08:00
yiminghe
faf7aea2d5 add tree animation 2015-08-24 18:28:00 +08:00
jljsj
c2be1cbf81 Add menu animation 2015-08-24 18:18:46 +08:00
然则
2df2310296 Merge branch '0.8.0' of github.com:ant-design/ant-design into 0.8.0 2015-08-24 18:14:02 +08:00
然则
d29a215e74 up tree and add velocity-animate 2015-08-24 18:12:07 +08:00
jljsj
ab00daf330 updata enter-animation style 2015-08-24 18:06:47 +08:00
afc163
33c06507b4 Fix enter-animation demo 2015-08-24 18:01:41 +08:00
afc163
04cd5ff349 update tree demo 2015-08-24 16:54:42 +08:00
afc163
4008aa92bd Add slider tip animation, #134 2015-08-24 16:43:54 +08:00
afc163
ae859acc31 fix #185 typo 2015-08-24 15:36:42 +08:00
yiminghe
60c1f06bb1 expost calendar 2015-08-24 14:30:08 +08:00
yiminghe
7a6f190e9e upgrade animate 2015-08-24 00:50:22 +08:00
afc163
4a51421bfa hide notFoundContent when combobox 2015-08-23 16:00:05 +08:00
afc163
583d885b40 Fix select className 2015-08-23 15:13:21 +08:00
afc163
94a0440f42 Fix iconfont 2015-08-23 14:46:11 +08:00
afc163
e78190cb2e Fix form demo 2015-08-22 20:28:00 +08:00
afc163
dd397f8935 Fix radio group 2015-08-22 20:22:02 +08:00
afc163
fdf19520d6 Add component type 2015-08-22 20:16:24 +08:00
afc163
6905ad697c Remove nodemos meta 2015-08-22 16:36:07 +08:00
afc163
781931721f Remove unused code 2015-08-22 14:46:45 +08:00
afc163
7ae4b4ad76 use global index as upload item key 2015-08-22 14:45:03 +08:00
afc163
7909033158 className in select 2015-08-22 14:23:58 +08:00
afc163
0d33c0d9e4 Add radio button style 2015-08-21 19:16:03 +08:00
afc163
0d33a5fbb4 Add radio button in radio 2015-08-21 18:24:09 +08:00
afc163
e23372b6e8 update upload animation code style 2015-08-21 17:37:54 +08:00
afc163
3a134c7219 Fix tag closing meaning 2015-08-21 17:27:29 +08:00
jljsj
ab09f9e537 add tag and uploadlist motion 2015-08-21 17:12:42 +08:00
afc163
1fd8703767 remove file.uid 2015-08-21 16:43:18 +08:00
afc163
53ce7a25c1 Add breadcrumbName 2015-08-21 16:41:39 +08:00
afc163
727710c1eb Fix upload close file item bug 2015-08-21 16:19:28 +08:00
afc163
6313d98349 update button demo 2015-08-21 15:58:04 +08:00
afc163
e3e9c9d314 same problem as #179 2015-08-21 15:56:13 +08:00
偏右
873a78b826 Merge pull request #179 from zhujun24/fix-datepicker
fixed form demo select defaultValue
2015-08-21 15:51:09 +08:00
zhujun24
ae97429f6f fixed form demo select defaultValue 2015-08-21 15:35:51 +08:00
afc163
be1716d83a update dropdown demo 2015-08-21 15:22:09 +08:00
yiminghe
d69f22ba5d Merge branch '0.8.0' of github.com:ant-design/ant-design into 0.8.0 2015-08-21 14:54:56 +08:00
yiminghe
c4b5b186ae render to body 2015-08-21 14:54:37 +08:00
afc163
10284a997c Fix upload bug in safari and ie8/9, ref #138 2015-08-21 14:46:12 +08:00
偏右
a694d61635 Merge pull request #177 from ant-design/breadcrumb-react-router-1.x
Fit breadcrumb to react-router@1.x, close #172
2015-08-20 19:56:25 +08:00
afc163
bec1c69669 Fit breadcrumb to react-router@1.x, close #172 2015-08-20 19:52:56 +08:00
SimaQ
972ceadc4a Merge branch '0.8.0' of https://github.com/ant-design/ant-design into 0.8.0 2015-08-20 18:57:07 +08:00
SimaQ
680b36c3e9 fix: forbid copy paste event on password validation, and optimize the interacitve. 2015-08-20 18:56:21 +08:00
yiminghe
fd0083e6e3 Merge branch '0.8.0' of github.com:ant-design/ant-design into 0.8.0 2015-08-20 17:47:15 +08:00
yiminghe
0a1cfccd22 upgrade select. Fixes #170 2015-08-20 17:46:12 +08:00
zhujun24
fefd039242 format alert & notification demo var xxx = antd.xxx 2015-08-20 17:16:53 +08:00
afc163
9b28e46d4c still use Magic offsetWidth set 2015-08-20 13:56:08 +08:00
afc163
75fca79313 remove magic code, use getBoundingClientRect replace offsetWidth 2015-08-20 13:48:17 +08:00
afc163
970aa4f846 Update code style 2015-08-20 13:17:17 +08:00
jljsj
8274cce09e add alert close animation 2015-08-20 13:06:47 +08:00
afc163
a37ca606cc Merge branch '0.8.0' of github.com:ant-design/ant-design into 0.8.0 2015-08-20 11:46:28 +08:00
afc163
59ea12f172 Fix tag render 2015-08-20 11:46:02 +08:00
sorrycc
d897263d5b fix: Carousel don't work in IE8, ref: #138 2015-08-20 11:34:43 +08:00
yiminghe
85c30ab0ad render popup to body 2015-08-19 20:16:20 +08:00
yiminghe
a46f694766 render popup to body 2015-08-19 20:12:34 +08:00
afc163
e2ceed2dc6 Remove unused statement 2015-08-19 19:21:40 +08:00
afc163
cbd5a81a22 do not remove element manully when closing tag 2015-08-19 19:19:35 +08:00
afc163
3d975e4495 code style 2015-08-19 17:50:20 +08:00
jljsj
357cd5e37d add dom.remove 2015-08-19 17:35:18 +08:00
jljsj
ac27a1814d add tag animation 2015-08-19 17:26:55 +08:00
afc163
ea298befa5 update optionGroup Demo 2015-08-19 13:50:57 +08:00
afc163
6cfdca61a8 Only leave onCheck, remove onSelect from antd API 2015-08-19 13:50:26 +08:00
然则
5ae755a8ba up tree readme 2015-08-19 12:28:25 +08:00
然则
3bba2b7972 fix conflict 2015-08-19 12:23:00 +08:00
然则
011970fe38 up tree api 2015-08-19 12:18:10 +08:00
afc163
6e542e4972 update tree 2015-08-19 11:45:08 +08:00
afc163
cfaf31b47c update demo title 2015-08-19 11:41:44 +08:00
afc163
568a23930c anticon-large => anticon-appstore 2015-08-19 11:31:14 +08:00
afc163
281dd27e96 short delay for detecting mousePosition 2015-08-19 10:09:44 +08:00
yiminghe
b584e6d863 Merge pull request #149 from ant-design/improve-modal-mouse-position
改进 modal 的 mousePosition 获取方式
2015-08-18 22:35:45 +08:00
afc163
c3294dfc64 use arrow function 2015-08-18 20:27:40 +08:00
afc163
e95e557077 detect mousePosition in click event 2015-08-18 18:36:31 +08:00
SimaQ
3b70fc147f Merge branch '0.8.0' of https://github.com/ant-design/ant-design into 0.8.0 2015-08-18 17:48:39 +08:00
SimaQ
40dcdb0003 fix: hack rgba for ie8. 2015-08-18 17:48:26 +08:00
SimaQ
e49a057d49 fix: fix icon style for icon-slider demo 2015-08-18 17:34:27 +08:00
翰文
c1b409662d chore: 更新upload文档和依赖版本 2015-08-18 17:31:37 +08:00
SimaQ
552da03f3b Merge branch '0.8.0' of https://github.com/ant-design/ant-design into 0.8.0 2015-08-18 17:15:30 +08:00
SimaQ
b99dffbd09 fix: fix Browser compatibility for .ant-form-inline. 2015-08-18 17:15:08 +08:00
afc163
322e09210e close button should be visible at downloading status 2015-08-18 17:06:23 +08:00
afc163
1e7cf6d364 button should inside children 2015-08-18 17:05:56 +08:00
afc163
24b81829a1 code style 2015-08-18 16:58:07 +08:00
afc163
77651c0621 update code style 2015-08-18 16:24:18 +08:00
afc163
192f150bc2 use rc-util addEventListener 2015-08-18 16:21:56 +08:00
afc163
90deb00e06 update tree code and demo style, improve css 2015-08-18 16:03:13 +08:00
afc163
f9b7482b91 customize upload button children by user 2015-08-18 15:33:48 +08:00
偏右
f458e318ff Merge pull request #154 from zhujun24/fix-demo
slider demo input-number value & fixed demo htmlFor
2015-08-18 14:40:52 +08:00
afc163
5264263849 Replace jQuery.ajax via reqwest, fix #142
https://github.com/ded/reqwest

need xhr2 as peerDependency
2015-08-18 14:30:55 +08:00
zhujun24
0e5eac7108 slider demo input-number value & fixed demo htmlFor 2015-08-18 14:28:32 +08:00
afc163
dc62d38456 fix code style 2015-08-18 14:03:44 +08:00
afc163
a08024563d fix code style 2015-08-18 14:02:55 +08:00
afc163
c0c9b4a8d5 remove this.onDocumentMousemove 2015-08-18 13:21:48 +08:00
afc163
ee8335856c Only listen mousemove once
初始化时监听, 共享同一个 mousePosition
2015-08-18 13:19:00 +08:00
afc163
f4964626d9 open confirm from current mouse position 2015-08-18 13:15:16 +08:00
afc163
56b06e168f get mousePosition from mousemove listener for more elegant API 2015-08-18 12:26:19 +08:00
偏右
d098c09946 Merge pull request #148 from zhujun24/notification
remove btnClose and demo
2015-08-18 11:50:40 +08:00
afc163
1c5e3485e7 Fix cancel button can not close modal
1. 关闭取消按钮的修复
2. 优化 loading 按钮的效果
2015-08-18 11:46:07 +08:00
zhujun24
4bb76f0d73 remove btnClose and demo 2015-08-18 11:12:32 +08:00
yiminghe
58bd830f40 remove btnClick 2015-08-18 00:57:02 +08:00
yiminghe
099999ffc1 support mousePosition 2015-08-17 23:46:09 +08:00
yiminghe
867c4f2a85 support mousePosition 2015-08-17 23:42:52 +08:00
偏右
7af4457c94 Merge pull request #140 from zhujun24/notification
optimize close function
2015-08-17 18:17:08 +08:00
afc163
6b32f18f79 improve table filter dropdown 2015-08-17 18:14:39 +08:00
zhujun24
1c5b6fe0c7 Merge branch 'master' into notification 2015-08-17 18:03:12 +08:00
zhujun24
7334a07025 modify popconfirm & popover & tooltip placement 2015-08-17 17:55:39 +08:00
zhujun24
e8923b5d46 Merge remote-tracking branch 'upstream/0.8.0' into notification 2015-08-17 17:49:27 +08:00
ioldfish
cb2a711ee2 Merge branch '0.8.0' of https://github.com/ant-design/ant-design into 0.8.0 2015-08-17 17:35:27 +08:00
ioldfish
1b78c4fc90 merge from fortree 2015-08-17 17:32:59 +08:00
afc163
662f8889bf fix menu-item link, #139 2015-08-17 17:28:48 +08:00
afc163
fab3280ed2 code style update 2015-08-17 17:03:16 +08:00
afc163
3922656566 RadioGroup defaultValue 2015-08-17 16:54:42 +08:00
afc163
9d5e0a2e58 remove unused state visible 2015-08-17 16:44:38 +08:00
afc163
539ac64998 除了自定义页脚外,点击取消不需要手动设置关闭 2015-08-17 16:42:33 +08:00
zhujun24
bcaa2ed0f5 optimize close function 2015-08-17 15:58:38 +08:00
afc163
4af25dffb2 code style 2015-08-17 15:17:04 +08:00
afc163
b6f34c5dde Merge branch '0.8.0' of github.com:ant-design/ant-design into 0.8.0 2015-08-17 13:59:28 +08:00
afc163
906b30b796 update menu props 2015-08-17 13:58:21 +08:00
偏右
4745c00a8c Merge pull request #135 from zhujun24/color
label htmlFor
2015-08-17 13:23:19 +08:00
zhujun24
d3784423ac label htmlFor 2015-08-17 13:16:36 +08:00
ioldfish
40e998f377 update api 2015-08-17 12:49:19 +08:00
然则
4b705d7c85 up less 2015-08-17 12:17:20 +08:00
然则
bf52026789 up tree and checkbox 2015-08-16 20:04:42 +08:00
然则
61f061b00f up api 2015-08-15 23:45:25 +08:00
afc163
2eecc1071b update eslint and fix indent problems 2015-08-15 15:08:55 +08:00
yiminghe
fea0870a41 update menu 2015-08-15 00:07:40 +08:00
然则
82bf118a73 up iconfont 2015-08-14 23:28:20 +08:00
afc163
de38390271 改进 menu 的样式
参照 ant-design 的视觉稿微调
2015-08-14 18:16:41 +08:00
afc163
edc0f4bbc0 modal custom footer demo 2015-08-14 14:35:15 +08:00
afc163
ce5d7b9d9c update rc-upload to 1.3.0, modify onError arguments 2015-08-14 14:17:22 +08:00
yiminghe
b3af79ab24 upgrade. Fixes #127 2015-08-13 16:39:51 +08:00
chencheng (云谦)
39701f89da typo fix 2015-08-13 16:19:37 +08:00
zhujun24
94b2afc1ff Merge remote-tracking branch 'upstream/0.8.0' into notification 2015-08-12 16:50:32 +08:00
jljsj
c6787592e3 Merge branches '0.8.0' and '0.8.0' of github.com:ant-design/ant-design into 0.8.0 2015-08-12 14:58:40 +08:00
jljsj
5b47891c52 更新enterAnimation版本与demo 2015-08-12 14:57:45 +08:00
afc163
f6aaefa43f remove useless code for sorter className 2015-08-12 13:04:13 +08:00
afc163
d1b581be06 fix table dataSource propTypes 2015-08-12 12:51:33 +08:00
afc163
dfff7ef86b fix sort and filter 2015-08-12 12:47:04 +08:00
yiminghe
d95d4e4aea fix sort 2015-08-12 11:50:07 +08:00
yiminghe
e24850f42d disabled prop modify 2015-08-12 11:26:36 +08:00
yiminghe
222545b771 Merge branch '0.8.0' of github.com:ant-design/ant-design into 0.8.0 2015-08-11 23:33:29 +08:00
yiminghe
79e54f03f5 upgrade menu 2015-08-11 23:32:49 +08:00
afc163
137e40acae bordered table 2015-08-11 20:05:52 +08:00
afc163
3be09f62f5 disable tree link 2015-08-11 17:10:06 +08:00
afc163
f5afbf16aa Improve table ajax dataSource
1. Add ajax data params support
2. improve dataSource.clone for new config
2015-08-11 16:57:17 +08:00
然则
6da7db4ec2 up rc-tree version 2015-08-10 20:23:18 +08:00
yiminghe
6bba4f755c Merge branch '0.8.0' of github.com:ant-design/ant-design into 0.8.0 2015-08-10 17:57:52 +08:00
yiminghe
eef1da7ed6 upgrade menu 2015-08-10 17:57:28 +08:00
zhujun24
b3651a4be4 Merge remote-tracking branch 'upstream/0.8.0' into notification 2015-08-10 16:52:43 +08:00
afc163
ebf0168ece update select size in form 2015-08-10 16:24:15 +08:00
afc163
804da578de Merge branch '0.8.0' of github.com:ant-design/ant-design into 0.8.0 2015-08-10 16:21:21 +08:00
偏右
df8ccf6d46 Merge pull request #121 from zhujun24/input-size
Input size
2015-08-10 16:21:00 +08:00
zhujun24
dee35bd833 optimize code style 2015-08-10 15:39:50 +08:00
afc163
caa86aa185 typo 2015-08-10 15:33:46 +08:00
afc163
3acb9d4eba update datepicker demo 2015-08-10 15:14:47 +08:00
zhujun24
f85248726d form input large size 2015-08-10 14:34:25 +08:00
zhujun24
ea3f38a58a unify size api name 2015-08-10 13:22:50 +08:00
afc163
9f1b188f87 fix remove logic in upload 2015-08-09 18:23:18 +08:00
afc163
f9157ab8c4 code style 2015-08-09 18:13:46 +08:00
afc163
dae05a55c4 merge 2015-08-09 18:05:50 +08:00
afc163
b68ec83e36 优化 upload 实现
1. 使用 Upload.dragger 代替 type
2. 将拖拽上传的内容区域交给用户自己实现
3. 改进 uploadList 的实现方式, 尽量避免使用 Dom 操作
4. 优化样式展现
2015-08-09 18:00:20 +08:00
玄寂
63cf7bb742 feat: add upload component 2015-08-08 23:37:35 +08:00
zhujun24
e3e17376f0 selece size 2015-08-08 19:11:10 +08:00
zhujun24
7b64e31ea3 inputNumber size 2015-08-08 17:59:57 +08:00
yiminghe
4f381b0301 fix #120 2015-08-07 19:21:02 +08:00
jljsj
e1a6cfc72a updata enterAnimation version 2015-08-07 17:07:19 +08:00
afc163
0d41181c1b update component text 2015-08-07 12:20:30 +08:00
afc163
43dbc2f24b code style fix 2015-08-07 11:10:46 +08:00
afc163
4c8d3994a2 improve code style 2015-08-07 10:58:15 +08:00
afc163
6b72cc2e93 Merge branch '0.8.0' of github.com:ant-design/ant-design into 0.8.0 2015-08-07 10:56:04 +08:00
偏右
cee218be33 Merge pull request #119 from ant-design/datasource
fix datasource
2015-08-07 10:55:40 +08:00
afc163
9b68103643 prefix className for affix 2015-08-07 10:50:52 +08:00
SimaQ
575af92b92 update email validation demo 2015-08-07 09:57:12 +08:00
yiminghe
d60fca4993 fix datasource 2015-08-07 01:03:42 +08:00
zhujun24
72e760d0bd bug still exist 2015-08-06 20:55:30 +08:00
SimaQ
ac1852117b update 2015-08-06 18:58:37 +08:00
zhujun24
ec462fde00 merge 0.8.0 2015-08-06 18:28:48 +08:00
afc163
8a4c6c37be code style 2015-08-06 17:42:13 +08:00
yiminghe
9616341007 Merge branch '0.8.0' of github.com:ant-design/ant-design into 0.8.0 2015-08-06 16:50:20 +08:00
yiminghe
4d203b6e67 add menu 2015-08-06 16:49:54 +08:00
afc163
c2933a8e52 update tabs style 2015-08-06 16:47:01 +08:00
afc163
a22e135a78 Add duration config for notification 2015-08-06 15:32:18 +08:00
afc163
9963c41029 improve code style 2015-08-06 15:19:45 +08:00
afc163
287c9ec5fd remove config global top demo of notification 2015-08-06 15:13:30 +08:00
afc163
d82154825c typo 2015-08-06 14:11:02 +08:00
afc163
3446d87c9c Add defaultValue for datepicker 2015-08-06 12:23:49 +08:00
afc163
67a200ee30 添加联动的选择框, fix #115 2015-08-06 12:06:05 +08:00
ioldfish
817e5ff72a upadte tree style 2015-08-06 09:17:40 +08:00
SimaQ
2bccf59028 correct typo 2015-08-06 08:59:00 +08:00
afc163
8b338e626a fix margin right 2015-08-05 22:03:24 +08:00
afc163
9a200ec782 update text 2015-08-05 21:18:34 +08:00
SimaQ
2e47b732c0 Merge branch '0.8.0' of https://github.com/ant-design/ant-design into 0.8.0 2015-08-05 17:56:26 +08:00
ioldfish
0065270e7f update ant-tree style 2015-08-05 17:38:02 +08:00
SimaQ
76677a2a2a update the interactive method for email validation 2015-08-05 14:47:47 +08:00
afc163
6d2cf352c3 return promise object from fetch 2015-08-05 11:04:00 +08:00
afc163
cfaabbb825 Improve dataSource implementation
1. move advance-ajax to ajax demo
2. remove plain object dataSource support
3. use propTypes over judgement of constructor
2015-08-05 10:58:21 +08:00
afc163
3c95c727b3 Merge branch '0.8.0' of github.com:ant-design/ant-design into 0.8.0 2015-08-05 10:21:35 +08:00
SimaQ
9fcae54f84 format code style and add some words 2015-08-05 10:12:12 +08:00
逸达
b97d01f288 遵循格式要求 2015-08-05 01:44:21 +08:00
逸达
7ba8e08b5a 加入Table 远程模式支持由外界发起请求方法 2015-08-05 01:42:37 +08:00
afc163
6502bc3015 Merge branch '0.8.0' of github.com:ant-design/ant-design into 0.8.0 2015-08-04 20:01:53 +08:00
yiminghe
10ff094b46 typo 2015-08-04 18:44:07 +08:00
yiminghe
0e58688dc2 fix adjustOrientOnCalendarOverflow 2015-08-04 18:42:41 +08:00
zhujun24
3c003cd00a remove top.md add duration.md 2015-08-04 17:43:51 +08:00
afc163
d0e7da6c7c update some demo text 2015-08-04 17:07:31 +08:00
zhujun24
b57f110e2d modify text and style 2015-08-04 16:07:31 +08:00
zhujun24
7e379b8e47 fixed style 2015-08-04 15:48:00 +08:00
yiminghe
dcb0d89f51 fix notice api 2015-08-04 15:20:43 +08:00
yiminghe
807b5530e4 Merge pull request #110 from ant-design/fix-notification
fix notification
2015-08-04 15:18:38 +08:00
yiminghe
ebc4aac58e fix notification 2015-08-04 15:16:10 +08:00
sorrycc
968b640fc2 add resize event for affix 2015-08-04 15:03:00 +08:00
sorrycc
e79150ed39 fix(affix): offset 2015-08-04 14:57:28 +08:00
偏右
2fe97eb8ee Merge pull request #88 from zhujun24/notification
Notification
2015-08-04 11:45:40 +08:00
zhujun24
befde97f70 remove defaultClose 2015-08-03 19:23:25 +08:00
zhujun24
216af6d8df 为什么撤销不掉对closable.md的修改 2015-08-03 18:20:21 +08:00
zhujun24
cb96fc370d remove alert change 2015-08-03 18:14:04 +08:00
zhujun24
f7c7bbe76f config top 2015-08-03 18:00:22 +08:00
sorrycc
cb1ce102ff move style declaractions under .ant-carousel 2015-08-03 17:45:58 +08:00
sorrycc
ebf1c3ed25 add Carousel 2015-08-03 17:43:05 +08:00
afc163
ad2e78ce80 fix #94 2015-08-03 17:39:29 +08:00
sorrycc
eb4f468b49 add Affix 2015-08-03 17:12:50 +08:00
afc163
ee91436840 update datepicker size style 2015-08-03 16:57:03 +08:00
偏右
c87c37329c Merge pull request #108 from zhujun24/input-size
component input size
2015-08-03 16:47:55 +08:00
zhujun24
fc6fe4ecd0 datepicker size lg sm 2015-08-03 16:16:07 +08:00
ioldfish
0cfd895310 Merge branch '0.8.0' of https://github.com/ant-design/ant-design into 0.8.0 2015-08-03 16:13:43 +08:00
ioldfish
936e5e8369 包装rc-tree,样式待修改 2015-08-03 16:11:56 +08:00
ioldfish
c18af7db79 包装rc-tree,样式待修改 2015-08-03 16:07:21 +08:00
jljsj
0673ba9d16 更新转场新增按钮交互与更新motion里的select 2015-08-03 16:04:24 +08:00
zhujun24
0a79201536 merge conflict index.js 2015-08-03 15:22:04 +08:00
zhujun24
4ef0ac9e9b add icon style and top 2015-08-03 15:17:12 +08:00
SimaQ
5f70cf024a feat: add form-validation 2015-08-03 13:39:58 +08:00
zhujun24
47606396c3 remove alert alter 2015-08-03 11:38:55 +08:00
zhujun24
95c098e61f merge 0.8.0 2015-08-03 09:47:59 +08:00
然则
fcd8a7fd3f fix #99 2015-08-01 17:51:55 +08:00
afc163
f62aa38ee8 Add components index.md 2015-08-01 14:08:04 +08:00
afc163
d7af23d93a merge master 2015-08-01 14:04:04 +08:00
zhujun24
a4f6890dec merge 0.8.0 2015-07-31 18:19:36 +08:00
zhujun24
725a2aa7ad remove customClose 2015-07-31 18:13:32 +08:00
afc163
7d0413fbb6 修复本地模式排序头状态失效 2015-07-31 12:41:42 +08:00
afc163
988bdf09bc 空的筛选项应该返回全量数据 2015-07-31 11:54:46 +08:00
afc163
a0d416d4a1 code style 2015-07-31 11:47:00 +08:00
yiminghe
cc58965426 fix table 2015-07-31 10:40:23 +08:00
yiminghe
5aa19b5567 fix message 2015-07-31 00:01:37 +08:00
afc163
e00a562ca9 优化 Tag 关闭的逻辑, #84 2015-07-30 23:52:44 +08:00
yiminghe
19e2c2700a stable 2015-07-30 21:55:16 +08:00
yiminghe
d64c40ffee fix message 2015-07-30 21:32:12 +08:00
zhujun24
3c05b56a2d modify notification #88 2015-07-30 21:04:52 +08:00
afc163
5c0fabe855 update enter animation document 2015-07-30 19:11:39 +08:00
afc163
ded87acbb3 improve layout demo display 2015-07-30 18:44:39 +08:00
afc163
7a670887d8 update progress demo 2015-07-30 18:42:11 +08:00
偏右
9656efd720 Merge pull request #97 from ant-design/progress-bar
增加showInfo配置
2015-07-30 18:20:54 +08:00
夏奈
bbac575112 showInfo 是否显示数值配置 2015-07-30 17:27:41 +08:00
偏右
714c5faa1c Merge pull request #96 from ant-design/progress-bar
Progress bar
2015-07-30 16:12:49 +08:00
夏奈
1bb6711a00 颜色修改 2015-07-30 15:54:08 +08:00
夏奈
5f1fad2a18 progress bar active 2015-07-30 15:14:00 +08:00
夏奈
df16cc2118 progress bar active 2015-07-30 15:07:38 +08:00
夏奈
3299740968 progress bar 和 progress circle api分开 2015-07-30 14:26:41 +08:00
偏右
4135a00e79 Merge pull request #84 from ant-design/components-tag
Components tag
2015-07-30 13:01:09 +08:00
afc163
b607ab32cf support config message top globally 2015-07-30 11:47:46 +08:00
zhujun24
9667b49701 Merge branch 'master' into notification 2015-07-30 11:33:21 +08:00
偏右
e792a7d10b Merge pull request #92 from zhujun24/alert-icon-text
modify icon and text
2015-07-30 11:26:42 +08:00
zhujun24
dcc482aa28 merge from alert-icon-text 2015-07-30 11:26:16 +08:00
zhujun24
e7fd922429 modify icon and text 2015-07-30 11:20:14 +08:00
afc163
43c53f1d8d loading button should be unhandlable 2015-07-30 11:15:03 +08:00
afc163
e067bcd7a5 merge from 0.8.0 2015-07-30 10:52:30 +08:00
zhujun24
26df3480ff Merge branch 'alert' into notification 2015-07-30 10:50:11 +08:00
zhujun24
36473be278 merge new-alert-merge 2015-07-30 10:41:48 +08:00
zhujun24
75032b0322 remodify alert icon ang text 2015-07-30 10:38:40 +08:00
夏奈
fc69971f99 progress bar 和 progress circle api分开 2015-07-29 23:36:27 +08:00
夏奈
ef3f753470 progress bar style 2015-07-29 23:32:24 +08:00
afc163
b8ef693afc button loading animation effect 2015-07-29 22:23:55 +08:00
夏奈
a85586844c progress bar style 2015-07-29 22:20:05 +08:00
zhujun24
718751d063 merge 0.8.0 2015-07-29 21:07:02 +08:00
zhujun24
a7cb87b64d merge from 0.8.0 2015-07-29 20:43:44 +08:00
zhujun24
554d363520 modify icon and text 2015-07-29 20:24:07 +08:00
afc163
3c47cf2039 set event as onClose argument 2015-07-29 20:13:42 +08:00
zhujun24
42024530d0 notification 2015-07-29 20:08:16 +08:00
afc163
35c7b96f26 update alert description 2015-07-29 18:45:56 +08:00
afc163
706caa855f update alert component 2015-07-29 18:44:56 +08:00
偏右
e4b9ce0f6e Merge pull request #86 from zhujun24/alert
fixed three problems
2015-07-29 18:30:28 +08:00
afc163
ee71eb88a8 rm motion from components 2015-07-29 18:28:35 +08:00
zhujun24
a45bcd4d07 fixed closable introduce in index.md 2015-07-29 17:33:28 +08:00
afc163
7276554fd5 修改站点结构,开放设计文档 2015-07-29 17:23:11 +08:00
zhujun24
cdbbc4d34e fixed three problems 2015-07-29 17:22:36 +08:00
afc163
9acba5d4ae change category 2015-07-29 16:30:26 +08:00
偏右
5bc99bbe26 Merge pull request #83 from zhujun24/alert
Alert
2015-07-29 15:38:08 +08:00
afc163
4eb849c783 fix boolean expression always true 2015-07-29 15:29:29 +08:00
zhujun24
2eb253f0ed fixed close style 2015-07-29 15:22:47 +08:00
afc163
3807c2ce31 Merge branch '0.8.0' of github.com:ant-design/ant-design into 0.8.0 2015-07-29 15:08:24 +08:00
偏右
16a02f0a99 Merge pull request #81 from ant-design/enter-animation
Enter animation
2015-07-29 15:07:42 +08:00
afc163
d32b9bfeac 修改 enter-animation 文档 2015-07-29 15:02:19 +08:00
jljsj
9fc8e7bb88 updata enter-animaiton index.md 2015-07-29 14:53:02 +08:00
jljsj
a13b5d3b02 updata js 0.1.3 and md 2015-07-29 14:50:00 +08:00
afc163
6f70303e90 Fix table, 当数据量少于每页数量时,直接设置数据 2015-07-29 14:01:15 +08:00
yiminghe
ee10b7c7d8 fix ant-select 2015-07-29 12:50:41 +08:00
jljsj
1559d44c96 updata specs and child node Animation 2015-07-29 12:17:18 +08:00
zhujun24
c494da18aa optimize alert 2015-07-29 10:27:31 +08:00
afc163
65d6f32e18 update radio API document 2015-07-28 20:22:37 +08:00
afc163
09c0bd7c4b update tag demo and document 2015-07-28 20:15:25 +08:00
afc163
2e0be628a7 update tag style 2015-07-28 20:03:10 +08:00
afc163
2b85689477 update animation demo 2015-07-28 18:33:40 +08:00
jljsj
8f1a616b2e add enterAnimation 2015-07-28 17:55:40 +08:00
afc163
6344e9151b Add component tag 2015-07-28 17:08:06 +08:00
jljsj
d8ce9894a8 updata demo 2015-07-28 16:08:52 +08:00
jljsj
fe0ea83ebd updata 2015-07-28 16:06:45 +08:00
jljsj
fbb7a99a9e updata 2015-07-28 15:42:43 +08:00
zhujun24
19a2604b71 notification half 2015-07-28 15:40:28 +08:00
afc163
b6fe8021f8 render when change dataSource 2015-07-28 15:20:33 +08:00
jljsj
87c68279e1 add enterAnimation 2015-07-28 15:16:51 +08:00
afc163
ba61ebd54b 支持动态传入分页信息 2015-07-28 14:02:18 +08:00
afc163
7aa01c464e change index.md title 2015-07-28 12:33:09 +08:00
afc163
699a6c9ad3 Add enter-animation 2015-07-28 12:32:27 +08:00
afc163
fb3b16ddc2 修复本地模式的 table 分页 current 页面失效的问题 2015-07-28 12:26:54 +08:00
zhujun24
eea48ffe16 Alert component 2015-07-27 20:53:08 +08:00
afc163
b7d204967d Refactor node pagination code, Add noPagination demo 2015-07-27 19:58:51 +08:00
afc163
14116da375 fix pagination showQuickJumper typo 2015-07-27 19:24:14 +08:00
afc163
3442cc7832 fix pagination false bug 2015-07-27 19:23:51 +08:00
afc163
ea93703efb update table pagination document 2015-07-27 15:40:30 +08:00
afc163
1954586665 修复本地模式下 pagination 为 false 时数据无法显示的问题 2015-07-27 15:38:06 +08:00
afc163
8d327e1b47 update form demo 2015-07-24 16:10:13 +08:00
afc163
ba21f3531b fix select components 2015-07-24 16:06:27 +08:00
ustccjw
b34269a6b1 use es6 module import/export
convert var to const

fix bug

fix bug

fix for jshint

fix import
2015-07-24 11:22:49 +08:00
ustccjw
41c35903a4 remove use strict 2015-07-23 21:36:34 +08:00
afc163
7a9ef6edb1 refactor message implement 2015-07-23 11:59:56 +08:00
afc163
fe0ead041a update combobox demo 2015-07-23 11:13:20 +08:00
afc163
65704ae376 Merge branch 'master' of github.com:ant-design/ant-design 2015-07-22 17:32:36 +08:00
afc163
12b26137ea Add confirm button loading effect for modal 2015-07-22 17:32:22 +08:00
SimaQ
7eb73e0714 Merge branch 'master' of https://github.com/ant-design/ant-design 2015-07-22 17:18:26 +08:00
SimaQ
bf1cf10adf update form typography 2015-07-22 17:17:47 +08:00
afc163
ecb45c3538 should be large button in modal 2015-07-22 16:57:30 +08:00
afc163
59869fa42d display label in select defaultly, fix #50 2015-07-22 12:37:20 +08:00
afc163
27353ca9b9 三期组件挖坑 2015-07-22 11:06:55 +08:00
SimaQ
75ecb0d0dc tiny update 2015-07-22 08:14:33 +08:00
翰文
be3d529917 chore: collapse样式调整 2015-07-21 20:53:36 +08:00
afc163
2902e33070 modify input number default disable in demo 2015-07-21 19:33:32 +08:00
afc163
bad047a860 typo 2015-07-21 16:53:51 +08:00
afc163
aa60f949e4 Merge branch 'master' of github.com:ant-design/ant-design 2015-07-21 16:48:34 +08:00
afc163
01a6c0f1e6 fix table pagination false bug 2015-07-21 16:48:00 +08:00
SimaQ
f15bbfc7e8 update classanme 2015-07-21 16:45:23 +08:00
SimaQ
77d263f063 update radio 2015-07-21 16:26:53 +08:00
afc163
9f6a9d9af0 update radio demos 2015-07-21 16:18:27 +08:00
SimaQ
cd3d87819e Merge branch 'master' of https://github.com/ant-design/ant-design 2015-07-21 14:58:29 +08:00
SimaQ
0f8de0411f update form demo page 2015-07-21 14:55:22 +08:00
afc163
4be73afd2d 微调了input-number在chrome下的效果 2015-07-21 14:28:29 +08:00
afc163
113da093d2 update pagination demos text 2015-07-21 11:13:32 +08:00
afc163
3b6ea9846d Add placeholder 2015-07-21 11:05:11 +08:00
yiminghe
f2c8fcfc22 upgrade slider 2015-07-21 00:10:13 +08:00
afc163
2ea0cef2a3 Merge branch 'master' of github.com:ant-design/ant-design 2015-07-20 22:57:59 +08:00
afc163
a4589b4ddd update select style 2015-07-20 22:56:43 +08:00
yiminghe
fc7854b82a update radio docs 2015-07-20 22:41:10 +08:00
yiminghe
015738ffeb fix radiogroup api 2015-07-20 22:36:49 +08:00
SimaQ
5042c2d7a7 Merge branch 'master' of https://github.com/ant-design/ant-design 2015-07-20 20:37:32 +08:00
SimaQ
745b6d3be2 form demo update: change radio checkbox select to ant-radio ant-checkbox ant-select 2015-07-20 20:35:48 +08:00
afc163
b90f83ed8a update default width 2015-07-20 20:03:45 +08:00
afc163
24cc4ccbf7 Merge branch 'master' of github.com:ant-design/ant-design 2015-07-20 19:28:38 +08:00
afc163
acb031e0dc one col in motion demo 2015-07-20 19:28:12 +08:00
SimaQ
7eaaee8a0b update form style 2015-07-20 19:25:34 +08:00
yiminghe
bcde1bd6d6 Merge branch 'master' of github.com:ant-design/ant-design 2015-07-20 17:49:27 +08:00
yiminghe
7e4d58d405 fix disabled for datepicker 2015-07-20 17:49:05 +08:00
SimaQ
9fe92d9735 update form demo 2015-07-20 17:43:01 +08:00
SimaQ
ac14eef84c update form style 2015-07-20 16:06:10 +08:00
SimaQ
a5d3618d2e add width:100% for datepicker stylr 2015-07-20 16:05:39 +08:00
SimaQ
a7efcbab11 correct punctuation 2015-07-20 14:58:06 +08:00
yiminghe
70fc084e44 update switch 2015-07-20 14:32:21 +08:00
afc163
bb8b5b3f6f components order 2015-07-20 12:34:07 +08:00
afc163
fa9914f34a components order 2015-07-20 12:28:36 +08:00
afc163
7cb9825237 update index 2015-07-20 11:08:23 +08:00
afc163
b8427c6fce modify text 2015-07-20 11:03:38 +08:00
yiminghe
d1ad214d73 update dropdown 2015-07-17 23:08:30 +08:00
afc163
fe27f117bf update breadcrumb 2015-07-17 18:39:33 +08:00
afc163
ddc3f83d76 update radio 2015-07-17 17:31:56 +08:00
afc163
956bf1bbe0 Merge branch 'master' of github.com:ant-design/ant-design 2015-07-17 17:20:09 +08:00
jljsj
7ef00b6a51 update radio label 2015-07-17 16:56:40 +08:00
afc163
0bfec4fd7f code style 2015-07-17 16:43:20 +08:00
jljsj
5701436909 update radiogroup css 2015-07-17 16:23:16 +08:00
jljsj
bb7f732a4f Merge branch 'master' of github.com:ant-design/ant-design 2015-07-17 16:07:17 +08:00
jljsj
2af7486e4f Add radio group 2015-07-17 16:06:46 +08:00
simaQ
a75af9ad78 update form 2015-07-17 15:43:31 +08:00
simaQ
b1d1b790f3 update demo style 2015-07-17 15:13:20 +08:00
simaQ
7172311c5c update form demo 2015-07-17 15:12:48 +08:00
afc163
7461c21496 update collapse demos 2015-07-17 11:59:14 +08:00
afc163
2a856e290b update radio demos 2015-07-17 11:55:16 +08:00
afc163
00a81ea98e update radio demos 2015-07-17 11:17:50 +08:00
afc163
34b00a4ad7 Merge branch 'master' of github.com:ant-design/ant-design 2015-07-17 11:07:14 +08:00
afc163
0e9335246c fix checkbox and radio 2015-07-17 11:06:38 +08:00
jljsj
4fe1929eeb update radio index.md 2015-07-17 10:57:19 +08:00
羽航
8fc45043c7 fix conflict 2015-07-17 09:46:01 +08:00
羽航
493df4afb8 修改文案细节 2015-07-17 09:42:09 +08:00
afc163
23c9836805 update popconfirm demo 2015-07-17 00:25:03 +08:00
afc163
bd4c7d4a44 fix warning in table 2015-07-16 23:16:20 +08:00
afc163
fc70c60d5b update form style 2015-07-16 22:57:47 +08:00
afc163
64c88c1ba3 fix disabled demo 2015-07-16 22:50:05 +08:00
afc163
e98d95e7b2 code style 2015-07-16 22:43:36 +08:00
afc163
5ccac00b8d update radio demos 2015-07-16 22:40:49 +08:00
jljsj
6c99ebb170 update radio 2015-07-16 18:26:17 +08:00
jljsj
200b856bba add radio 2015-07-16 18:23:25 +08:00
afc163
fb7c4db969 update slider demo 2015-07-16 16:49:00 +08:00
afc163
e434361f07 update slider demo 2015-07-16 16:48:06 +08:00
simaQ
403149f2a1 Merge branch 'master' of https://github.com/ant-design/ant-design 2015-07-16 15:26:03 +08:00
simaQ
d5b5895301 update form demo 2015-07-16 15:20:06 +08:00
afc163
f394747429 fix checkbox demo 2015-07-16 14:48:57 +08:00
afc163
f692e62560 fix checkbox in table 2015-07-16 14:41:28 +08:00
afc163
1638d49892 update checkbox demos 2015-07-16 14:34:42 +08:00
afc163
db51898720 fix form style 2015-07-16 14:18:03 +08:00
afc163
d651364968 whitespace 2015-07-16 13:49:36 +08:00
afc163
8a84bb264b Merge 2015-07-16 13:36:04 +08:00
yiminghe
8c93c35f54 update style 2015-07-16 13:00:56 +08:00
yiminghe
d1cfcc83db update checkbox demo 2015-07-16 12:29:07 +08:00
afc163
86b722671a update checkbox style 2015-07-16 12:27:04 +08:00
yiminghe
5ffcbfefb4 fix checkbox style 2015-07-16 12:20:14 +08:00
afc163
d0ddb0457c Merge branch 'master' of github.com:ant-design/ant-design 2015-07-16 12:00:49 +08:00
afc163
29be5b654e fix popover and popconfirm 效果 2015-07-16 12:00:19 +08:00
simaQ
60527e0d56 update 2015-07-16 11:49:46 +08:00
afc163
ae3e33975b update input number demo 2015-07-16 10:53:06 +08:00
simaQ
1dfb2958da update slider 2015-07-16 10:17:11 +08:00
yiminghe
cbf2681c9f Merge branch 'master' of github.com:ant-design/ant-design 2015-07-15 20:55:04 +08:00
yiminghe
7c37203f37 fix ant-btn 2015-07-15 20:54:37 +08:00
afc163
9f1fbb9ebe selectRows 2015-07-15 20:22:56 +08:00
yiminghe
3777933020 fix select style 2015-07-15 19:59:54 +08:00
afc163
08e0efe25e update motion markdown style 2015-07-15 18:07:29 +08:00
afc163
9e785663a8 fix onSelect argument 2015-07-15 17:55:30 +08:00
afc163
d48b80299b code style 2015-07-15 17:32:32 +08:00
afc163
91a749a810 move ant-checkbox into ant-form-item 2015-07-15 17:22:58 +08:00
Yuwei Ba
9d49d4b52d 更新 Pagination 文档 2015-07-15 16:50:13 +08:00
afc163
2ae1cf4cba Merge branch 'master' of github.com:ant-design/ant-design 2015-07-15 16:13:56 +08:00
afc163
207041879b improve input number demos 2015-07-15 16:13:00 +08:00
蔡伦
f757f2b883 Merge remote-tracking branch 'origin/master' 2015-07-15 16:03:57 +08:00
蔡伦
59b927838a Merge remote-tracking branch 'origin/master' 2015-07-15 16:01:44 +08:00
蔡伦
40595178ce demo update 2015-07-15 16:01:24 +08:00
simaQ
2ed33e8056 add slider into form 2015-07-15 16:00:59 +08:00
Yuwei Ba
35873cb90c 修复 Select 不显示的问题 2015-07-15 15:36:06 +08:00
蔡伦
ff0262c50c Merge branch 'master' of github.com:ant-design/ant-design
# By afc163 (55) and others
# Via afc163 (21) and others
* 'master' of github.com:ant-design/ant-design: (96 commits)
  arrow size and rotate
  input focus style update
  update site style
  fix color variable
  sort params
  修复清空的问题
  prepare npm
  update table document
  fix sort table logic, only allow one column to be sorted at a time
  chore: change collapse color
  optimize deploy
  update table row-selection style
  update table demos
  fix markdown table in chrome
  fix table loading style
  feat: collapse style review and change
  fix table loading style
  fix table loading style
  update table document
  update filter dropdown function and style
  ...

Conflicts:
	index.js
	style/components/index.less
2015-07-15 15:28:07 +08:00
蔡伦
26c42c6cec add checkbox 2015-07-15 15:19:24 +08:00
afc163
b0f3a552b6 sort params 2015-07-15 14:10:01 +08:00
afc163
fe230f7084 修复清空的问题 2015-07-15 12:16:28 +08:00
afc163
aa830e0c44 update table document 2015-07-15 11:45:43 +08:00
afc163
191235fcdc fix sort table logic, only allow one column to be sorted at a time 2015-07-15 11:43:00 +08:00
afc163
35c5ac8efa update table row-selection style 2015-07-15 11:12:17 +08:00
afc163
4cd12077cb update table demos 2015-07-15 10:47:47 +08:00
afc163
40517edaeb fix markdown table in chrome 2015-07-15 10:34:07 +08:00
afc163
41525cc19b fix table loading style 2015-07-14 21:06:39 +08:00
afc163
2a41f0802b Merge master to components-table 2015-07-14 21:01:42 +08:00
afc163
0ac833753c update table document 2015-07-14 20:58:54 +08:00
afc163
0e7f42937f update filter dropdown function and style 2015-07-14 20:43:27 +08:00
yiminghe
285eb6cbe7 Merge branch 'master' of github.com:ant-design/ant-design 2015-07-14 20:18:06 +08:00
afc163
3f3bd52d80 small table with mini pagination 2015-07-14 20:08:45 +08:00
afc163
a6661386c4 update ajax table demo 2015-07-14 20:04:14 +08:00
afc163
4d2119c358 prepare getParams arguments, filters, pagination, sorters 2015-07-14 18:29:43 +08:00
simaQ
d220314bf6 Merge branch 'master' of https://github.com/ant-design/ant-design 2015-07-14 18:15:07 +08:00
simaQ
4d9bbf8179 update index.md 2015-07-14 18:14:58 +08:00
afc163
ad04649366 ajax paging table 2015-07-14 17:58:00 +08:00
羽航
fa6e97364a 根据视觉review建议,删掉一些文字让demo看起来更好看些 2015-07-14 17:57:32 +08:00
afc163
17aabfa070 update paging 2015-07-14 16:34:26 +08:00
afc163
518bf992ba Merge branch 'master' into components-table 2015-07-14 16:12:30 +08:00
afc163
c915a3989b merge master to components-table 2015-07-14 15:37:19 +08:00
afc163
7ea054b3ff update table API, local data mode finished 2015-07-14 15:35:17 +08:00
Yuwei Ba
f93f9ee931 更新一些样式 2015-07-14 12:10:44 +08:00
simaQ
a4795453b8 update slider demo 2015-07-14 12:06:44 +08:00
yiminghe
ff295e1147 fix lint rules 2015-07-13 21:40:04 +08:00
afc163
6b9c988f12 Merge branch 'master' into components-table 2015-07-13 20:06:27 +08:00
偏右
00435273b5 Merge pull request #39 from ibigbug/master
添加分页组件
2015-07-13 19:48:36 +08:00
afc163
29068a0797 update filter.md 2015-07-13 19:47:31 +08:00
afc163
e982ab46ae improve filter 2015-07-13 18:42:08 +08:00
Yuwei Ba
fdb4ebbee2 添加 API 2015-07-13 17:51:28 +08:00
afc163
9440eb78b8 update sorter button click behaviours 2015-07-13 17:40:17 +08:00
afc163
ecea3b7d3f Merge branch 'master' into components-table 2015-07-13 17:22:10 +08:00
afc163
77c1e4d941 update switch demos 2015-07-13 16:52:07 +08:00
afc163
d843379008 finish sort function 2015-07-13 16:22:02 +08:00
Yuwei Ba
de6c509a36 Typo 2015-07-13 16:17:04 +08:00
Yuwei Ba
7a26598059 添加简洁的分页 2015-07-13 16:04:07 +08:00
罗宪
7d0b668801 update motion add ease 2015-07-13 15:48:24 +08:00
Yuwei Ba
1091ab0bfb 迷你版本樣式 2015-07-13 14:58:26 +08:00
afc163
01483740b3 merge from master 2015-07-13 10:57:34 +08:00
afc163
b53e76afff sort demo 2015-07-13 10:29:53 +08:00
simaQ
ca403d39af add slider display page 2015-07-13 08:00:31 +08:00
Yuwei Ba
27c6e03322 添加分页组件 2015-07-13 01:05:25 +08:00
afc163
4a53d5732f checkbox column width 2015-07-12 21:23:45 +08:00
afc163
6da3a29c07 small size table 2015-07-12 18:14:17 +08:00
afc163
ed9b0c507c load datasource in table, update API 2015-07-12 17:24:03 +08:00
afc163
c6889fa259 load datasource in table 2015-07-12 17:10:06 +08:00
afc163
5757d6cc78 operation links 2015-07-12 13:15:05 +08:00
afc163
ed9b534252 merge 2015-07-12 12:46:48 +08:00
afc163
5eb7ed9ff2 move message style to less file 2015-07-11 18:19:48 +08:00
afc163
8ae46a9282 improve message component 2015-07-11 18:05:43 +08:00
玄寂
4095e3eccb feat: add message component 2015-07-11 16:42:20 +08:00
玄寂
69c2a4c277 chore: adjust coding style, delete useless less, modify md files. 2015-07-11 16:41:08 +08:00
翰文
41244d83de feat: add message component
Conflicts:
	index.js
	style/components/index.less
2015-07-11 16:40:59 +08:00
翰文
599ea35ee6 feat(collapse): add demo nest collapse 2015-07-11 10:34:05 +08:00
翰文
4c28bc1fe2 feat: add component collapse 2015-07-11 10:17:58 +08:00
afc163
c9237c8e62 update API 2015-07-10 17:50:48 +08:00
afc163
4d2ce026ce row selection 2015-07-10 17:47:53 +08:00
simaQ
1164ba22a7 update iconfont 2015-07-10 17:17:58 +08:00
afc163
40bc7e3268 merge branch master 2015-07-10 10:48:59 +08:00
afc163
a7e7663cbb update API 2015-07-10 10:34:54 +08:00
yiminghe
32a5abdd91 Merge branch 'master' of github.com:ant-design/ant-design 2015-07-09 21:06:00 +08:00
yiminghe
782095125b update switch 2015-07-09 21:05:33 +08:00
afc163
b49a746ea7 change icon 2015-07-09 20:35:23 +08:00
afc163
c89a0c1441 fill demos with title 2015-07-09 20:29:26 +08:00
afc163
567280b0dc Merge branch 'master' into components-table 2015-07-09 20:14:02 +08:00
yiminghe
28a1720ec9 Merge branch 'master' of github.com:ant-design/ant-design 2015-07-09 20:07:10 +08:00
afc163
e0d74468b8 update iconfont url 2015-07-09 20:06:11 +08:00
yiminghe
5991755496 update input-number 2015-07-09 20:06:03 +08:00
afc163
30e719cb49 merge master 2015-07-09 20:01:49 +08:00
afc163
68b9e6125b update iconfont 2015-07-09 18:24:41 +08:00
yiminghe
bb5a6d9c29 fix breadcrumb warning 2015-07-09 18:23:34 +08:00
afc163
f47b29817a import component rc-table 2015-07-09 14:51:48 +08:00
simaQ
a72bc1b93b update form demo page 2015-07-09 13:48:49 +08:00
afc163
82c110ac5d Add table demos 2015-07-09 11:41:36 +08:00
simaQ
db945443a6 update form display page 2015-07-09 10:55:37 +08:00
yiminghe
46b0685364 upgrade select 2015-07-08 22:07:15 +08:00
yiminghe
0a7410973e clean warning 2015-07-08 20:53:11 +08:00
simaQ
3b706a74e9 update demo 2015-07-08 20:15:19 +08:00
simaQ
3710ac73e3 remove .pd-rg .pd-lf 2015-07-08 20:15:02 +08:00
yiminghe
c85e10083d add switch 2015-07-08 19:47:45 +08:00
afc163
96606aab9e update site layout 2015-07-08 17:41:32 +08:00
afc163
3fedf7d6f2 Merge branch 'master' of github.com:ant-design/ant-design 2015-07-08 17:05:49 +08:00
afc163
b80a4be4b4 update motion chinese title 2015-07-08 17:05:43 +08:00
羽航
1de0aac428 Merge branch 'master' of github.com:ant-design/ant-design 2015-07-08 16:36:33 +08:00
羽航
74b4cad22f 进一步调整样式 2015-07-08 16:36:08 +08:00
afc163
99f7579809 update tooltip delay 2015-07-08 16:29:57 +08:00
羽航
943fbd3d34 调整steps的样式 2015-07-08 15:53:51 +08:00
afc163
a1200aa1d6 update layout.html 2015-07-08 15:41:19 +08:00
afc163
ea05974dc6 datepicker style update 2015-07-08 14:55:05 +08:00
simaQ
fd757fe0c4 tiny display modify 2015-07-08 12:02:13 +08:00
simaQ
37d1ba179b delete basic.md in form demo 2015-07-07 23:46:19 +08:00
simaQ
3c7f943d3e update form page 2015-07-07 23:45:46 +08:00
羽航
46c879dbbf Merge branch 'master' of https://github.com/ant-design/ant-design 2015-07-07 19:42:11 +08:00
羽航
fae077ce65 change steps style. add maxDescriptionWidth property 2015-07-07 19:36:42 +08:00
yiminghe
ad7f079251 move css-animation to demo 2015-07-07 15:39:21 +08:00
偏右
cde72c55c7 Merge pull request #29 from ant-design/style
Form 表单以及展示页面
2015-07-07 11:38:36 +08:00
simaQ
7fb5995309 add form and input style 2015-07-07 11:32:08 +08:00
simaQ
2d9919d4c6 add form display page 2015-07-07 11:25:16 +08:00
afc163
fff4f39e5f remove react-router from antd 2015-07-06 20:18:19 +08:00
afc163
db30835c0e require antd 2015-07-06 20:04:26 +08:00
afc163
d39b222b47 code style 2015-07-06 10:58:34 +08:00
simaQ
ef9ad70aea update form page 2015-07-06 09:04:39 +08:00
simaQ
c4cd3ce495 add form page 2015-07-06 09:04:39 +08:00
afc163
46ce040efd update layout demo style 2015-07-05 18:59:02 +08:00
afc163
a83b90decc button 2015-07-05 17:42:56 +08:00
afc163
0110b82ad9 update 2015-07-05 17:40:52 +08:00
afc163
8d6eeb5cae update directory structure 2015-07-05 15:43:07 +08:00
罗宪
a180871f61 update animation doc 2015-07-03 17:08:23 +08:00
罗宪
0b89f3631a update animation doc 2015-07-03 17:00:59 +08:00
afc163
925f811b45 remove react-router dependency from breadcrumb 2015-07-02 21:58:04 +08:00
yiminghe
46aee94b06 update datepicker 2015-07-02 20:40:27 +08:00
yiminghe
37d9c7b46c fix datepicker 2015-07-02 20:04:35 +08:00
afc163
c42ca53d91 breadcrumb 2015-07-02 18:33:37 +08:00
afc163
e551caddd5 support params in breadcrumb displayName 2015-07-02 18:05:34 +08:00
afc163
0963f9f608 change folder name 2015-07-02 17:24:50 +08:00
afc163
86e5a523ac breadcrumb & router 2015-07-02 17:22:26 +08:00
罗宪
d6960bdcd7 Merge branch 'master' of https://github.com/ant-design/ant-design 2015-07-02 13:57:35 +08:00
罗宪
ec7a6003e8 update for motion 2015-07-02 13:57:26 +08:00
afc163
23c1222a58 global require for demo code 2015-07-01 21:43:56 +08:00
afc163
ced4dcb991 update breadcrumb demo 2015-07-01 21:24:04 +08:00
afc163
c876a71a54 default motion for datepicker 2015-07-01 20:50:12 +08:00
afc163
228a1042b6 merge 2015-07-01 20:47:40 +08:00
afc163
c103918518 Add simple breadcrumb 2015-07-01 20:44:19 +08:00
yiminghe
8e14ea69da update docs 2015-07-01 18:52:50 +08:00
yiminghe
6e44d42114 allow empty 2015-07-01 18:45:59 +08:00
yiminghe
ba05e1e53c add swing 2015-07-01 17:25:16 +08:00
yiminghe
b98a302b9f add animation for picker 2015-07-01 15:54:39 +08:00
yiminghe
e7fec9dc1a add input-number 2015-07-01 14:50:21 +08:00
yiminghe
465c8c2cdf add input-number 2015-07-01 14:48:47 +08:00
afc163
65f72a5efe tweak code style 2015-07-01 10:26:48 +08:00
afc163
ba1e3492ef datepicker default value should be empty 2015-07-01 10:20:11 +08:00
yiminghe
9b23e39491 fix datepicker 2015-06-30 19:28:56 +08:00
羽航
4cbc692382 fix conflict 2015-06-26 16:18:54 +08:00
羽航
0f58bd541b change default prefixCls to ant-steps 2015-06-26 16:13:40 +08:00
afc163
4002ab3d68 更新组件文案 2015-06-26 14:42:30 +08:00
afc163
a78efca3fb Merge branch 'master' of github.com:ant-design/ant-design 2015-06-26 10:48:45 +08:00
afc163
b94a5f7a61 update steps demos 2015-06-26 10:46:21 +08:00
羽航
1bad0062f9 support ant-design prefix class and prefixCls property 2015-06-26 10:43:01 +08:00
afc163
9d62e0dc62 Merge branch 'master' of github.com:ant-design/ant-design 2015-06-26 10:22:21 +08:00
afc163
42c5942b9f change trigger element 2015-06-26 10:22:08 +08:00
羽航
6e23ea7d85 update readme 2015-06-26 10:03:13 +08:00
afc163
1fea96ac42 update demos 2015-06-25 20:01:20 +08:00
afc163
9c598b8bf7 Merge branch 'master' of github.com:ant-design/ant-design 2015-06-25 19:56:18 +08:00
afc163
dd0e7a94b6 挖坑 2015-06-25 19:55:15 +08:00
羽航
49c5585590 update package.json 2015-06-25 19:32:06 +08:00
羽航
39e2d9a3d2 add demos 2015-06-25 18:12:42 +08:00
羽航
a35e62db84 Merge branch 'master' of github.com:ant-design/ant-design into step 2015-06-25 18:08:50 +08:00
afc163
219675cba7 icon button 文案 2015-06-25 17:39:24 +08:00
羽航
1b4815608c fix conflict 2015-06-25 16:02:48 +08:00
羽航
e8ec073adc add steps 2015-06-25 16:01:04 +08:00
yiminghe
82913b8610 support promise for modal 2015-06-25 15:35:46 +08:00
yiminghe
dac8bc14c6 Merge branch 'master' of github.com:ant-design/ant-design 2015-06-25 15:30:48 +08:00
羽航
071a145e4e move rc-steps out 2015-06-25 15:30:17 +08:00
yiminghe
abcdaddcaa support promise for modal 2015-06-25 15:29:56 +08:00
afc163
76fbc4360b 坑位变动 2015-06-25 15:25:59 +08:00
羽航
06c12f9276 完善逻辑和样式,包括兼容ie8 2015-06-24 20:35:43 +08:00
afc163
6bd257de34 Add popconfirm component 2015-06-24 19:20:47 +08:00
羽航
13ece3c1bc rc-steps component 2015-06-24 14:52:49 +08:00
afc163
52c42d6ca0 Add motion 2015-06-23 10:43:17 +08:00
然则
2a7a4fb7f3 Merge branch 'master' of github.com:ant-design/ant-design 2015-06-19 18:01:10 +08:00
然则
65ac43f175 up demo 2015-06-19 18:00:39 +08:00
afc163
40c6e0689f Merge branch 'master' of github.com:ant-design/ant-design 2015-06-19 17:53:55 +08:00
afc163
66c645d4ab update select combobox demo 2015-06-19 17:52:50 +08:00
然则
4ef1630c69 Merge branch 'master' of github.com:ant-design/ant-design 2015-06-19 17:36:15 +08:00
然则
64465d7230 up select style 2015-06-19 17:35:32 +08:00
afc163
b0bbbdd245 add tab mini size demo 2015-06-19 17:26:34 +08:00
afc163
d68846adc5 update datepicker document 2015-06-19 17:05:36 +08:00
afc163
e8fd51f593 fix tabs style 2015-06-19 16:21:59 +08:00
afc163
b6561a9942 fix tabs style 2015-06-19 15:45:40 +08:00
afc163
4b569a16c2 use es6 feature 2015-06-19 12:29:22 +08:00
afc163
937e19245f 精简文案 2015-06-19 10:42:49 +08:00
afc163
dcdeb793c6 remove dropzone for now 2015-06-19 10:38:15 +08:00
afc163
74c30f4128 update modal style 2015-06-18 15:46:59 +08:00
pizn
d36e011bbb docs: 修改文案 2015-06-18 15:26:29 +08:00
afc163
bd7bbd0cd5 update demos 2015-06-18 12:02:38 +08:00
afc163
85a9cfda5a Merge branch 'master' of github.com:ant-design/ant-design 2015-06-18 11:58:38 +08:00
afc163
8ab58d6fce update rc-select and demos 2015-06-18 11:57:31 +08:00
夏奈
0b460e564d 交互文案 2015-06-18 11:25:38 +08:00
夏奈
e52164f35f 文字样式 2015-06-18 10:43:35 +08:00
simaQ
25fdb462ed rename some icons 2015-06-17 22:13:45 +08:00
afc163
3a3233111e update button demos 2015-06-17 21:29:58 +08:00
afc163
5a14501bcd update datepicker style 2015-06-17 21:20:43 +08:00
afc163
757a1b3f8b update tabs demos 2015-06-17 20:28:02 +08:00
afc163
db457cbe78 有逼格占坑 2015-06-17 20:24:42 +08:00
afc163
8100539f8d prefix className for popover 2015-06-17 20:15:09 +08:00
afc163
4f0eb44fb3 allow not to set key on menuitem, react-component/menu#9 2015-06-17 20:05:27 +08:00
afc163
a68c4a886d Add comment 2015-06-17 19:57:05 +08:00
afc163
dcdd808aea update iconfont 2015-06-17 19:48:17 +08:00
afc163
0beb66fa18 update iconfont 2015-06-17 19:46:23 +08:00
afc163
cce156fc83 Merge branch 'master' of github.com:ant-design/ant-design 2015-06-17 19:33:30 +08:00
afc163
9f7531fcc1 update popover documentation 2015-06-17 19:15:37 +08:00
simaQ
a66d7724ef Merge branch 'master' of https://github.com/ant-design/ant-design 2015-06-17 18:25:29 +08:00
simaQ
5294fd6b82 update button page 2015-06-17 18:22:20 +08:00
simaQ
525de2489b update iconfont page 2015-06-17 18:20:39 +08:00
afc163
418ff724d9 update button text 2015-06-17 17:46:01 +08:00
afc163
bbb146d051 修改文案 2015-06-17 17:25:12 +08:00
afc163
3c32f0c6c0 update progress demo 2015-06-17 17:19:34 +08:00
afc163
28f5caa191 update demo 2015-06-17 17:18:15 +08:00
afc163
b4a491cd8f Add animation for Tooltip 2015-06-17 17:15:34 +08:00
afc163
d3c9665c56 update popover and tooltip readme 2015-06-17 17:10:10 +08:00
afc163
7eaf96413e Add popover component 2015-06-17 16:58:13 +08:00
afc163
edb4d3a9fa adjust button demo order 2015-06-17 14:48:41 +08:00
afc163
d80fc6d7d6 update trigger button in dropdown demo 2015-06-17 14:44:24 +08:00
afc163
b74f6edacd adjust button demo 2015-06-17 14:42:49 +08:00
afc163
4bb09c2181 update progress demo 2015-06-16 21:24:09 +08:00
afc163
9021cd8145 update select api 2015-06-16 20:07:43 +08:00
afc163
5ac56461a1 update select combobox demo 2015-06-16 19:59:07 +08:00
afc163
a171eea1fd remove console.log 2015-06-16 16:32:15 +08:00
afc163
48700296b8 update select demos 2015-06-16 14:54:31 +08:00
simaQ
6ade8a5a82 tiny correction for buttons 2015-06-15 22:14:15 +08:00
afc163
51ac1b3617 二期组件挖坑 2015-06-15 22:01:39 +08:00
afc163
f4b226075f Merge branch 'master' of github.com:ant-design/ant-design 2015-06-15 21:30:37 +08:00
afc163
4adae8b3ed fix modal style 2015-06-15 21:30:17 +08:00
yiminghe
e07159834e update motion 2015-06-15 21:22:40 +08:00
yiminghe
73d89f46af update motion 2015-06-15 21:18:08 +08:00
afc163
edeb2a141b fix iconfont page style 2015-06-15 20:29:51 +08:00
afc163
d868a30661 prefixClassName ant-tab -> ant-tabs 2015-06-15 20:04:32 +08:00
yiminghe
1316b07cfd rename tab to tabs 2015-06-15 19:56:58 +08:00
simaQ
c21e2b3e77 Merge branch 'master' of https://github.com/ant-design/ant-design 2015-06-15 19:34:08 +08:00
simaQ
c6a2901bc3 update the style of button page 2015-06-15 19:33:39 +08:00
afc163
d65fe7723e Merge branch 'master' of github.com:ant-design/ant-design 2015-06-15 17:54:40 +08:00
afc163
16afacea79 adjust select demo 2015-06-15 17:54:34 +08:00
pizn
72d4f3c369 docs: 更新文档 2015-06-15 17:46:42 +08:00
afc163
f40fe75abb dropdown button arrow 2015-06-15 17:36:10 +08:00
afc163
42d69ccc07 Merge branch 'master' of github.com:ant-design/ant-design 2015-06-15 17:30:36 +08:00
afc163
4cfcf29a5f update progress size 2015-06-15 17:30:24 +08:00
然则
02a8ae56e7 Merge branch 'master' of github.com:ant-design/ant-design 2015-06-15 17:17:38 +08:00
然则
d73b1e5cec up 2015-06-15 17:17:23 +08:00
afc163
0c56f44d21 update progress demo 2015-06-15 16:49:37 +08:00
afc163
7e35666f98 Merge branch 'master' of github.com:ant-design/ant-design 2015-06-15 16:42:34 +08:00
afc163
5ffd623b18 update datepicker 2015-06-15 16:42:27 +08:00
夏奈
e59a6b2430 dynamic demo 2015-06-15 16:31:51 +08:00
夏奈
15027544ef Merge remote-tracking branch 'origin/master' 2015-06-15 16:27:01 +08:00
夏奈
e0dfb9d51e confilct 2015-06-15 16:26:44 +08:00
夏奈
2bb0992334 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	components/progress/demo/circle.md
#	components/progress/demo/line.md
2015-06-15 16:20:30 +08:00
afc163
120687c314 tabs -> tab 2015-06-15 16:20:06 +08:00
夏奈
331443419c 样式调整 2015-06-15 16:16:51 +08:00
偏右
9f99362aba Merge pull request #22 from ibigbug/tab-with-icon
添加带有 icon 的 Tab
2015-06-15 16:15:03 +08:00
Yuwei Ba
4c1014d905 添加带有 icon 的样式 2015-06-15 16:11:28 +08:00
afc163
f5835eec78 update element tagName 2015-06-15 15:11:02 +08:00
afc163
39bf1d09e7 update progress demo 2015-06-15 14:43:27 +08:00
afc163
61b7297ce4 update progress demo 2015-06-15 14:07:20 +08:00
夏奈
9b5c224234 m 2015-06-15 11:58:46 +08:00
夏奈
a100bc0de3 m 2015-06-15 11:55:54 +08:00
夏奈
2c58d5e1ce mini demo 2015-06-15 11:48:30 +08:00
afc163
e86755efbd update progress demo 2015-06-15 11:00:27 +08:00
夏奈
489ef17919 progress circle demo 2015-06-14 23:04:43 +08:00
夏奈
4ed91c35e1 progress circle demo 2015-06-14 20:07:21 +08:00
夏奈
0e28e52af4 Merge remote-tracking branch 'origin/master' 2015-06-14 19:50:56 +08:00
夏奈
61d947dbfa progress line demo 2015-06-14 19:50:23 +08:00
afc163
737ef1167d Add info for components 2015-06-14 17:54:08 +08:00
afc163
5e61c60661 update selet demo 2015-06-14 17:26:31 +08:00
afc163
10ff912e86 remove sketch link 2015-06-14 17:17:09 +08:00
夏奈
c467790b15 progress demo 2015-06-14 14:01:10 +08:00
夏奈
d2702bf92e Merge branch 'master' of github.com:ant-design/ant-design 2015-06-14 13:28:36 +08:00
afc163
81ee5588bc tweak code style 2015-06-14 13:21:29 +08:00
afc163
22c48941e9 tweak code style 2015-06-14 13:20:35 +08:00
偏右
34e1c66418 Merge pull request #20 from ibigbug/tab-style
Tab style
2015-06-14 13:13:39 +08:00
夏奈
3e2026efca progress demo 2015-06-14 12:55:44 +08:00
yiminghe
580481221f adjust onCancel 2015-06-12 23:46:04 +08:00
yiminghe
d5f760f9e7 remove ref 2015-06-12 23:31:44 +08:00
Yuwei Ba
3a4817b236 添加更多 Demo 2015-06-12 20:21:13 +08:00
Yuwei Ba
b870935c91 Tabs -> Tab 2015-06-12 20:03:38 +08:00
afc163
646c6853d6 move confirm into modal 2015-06-12 19:41:30 +08:00
afc163
b9b6cd33d0 components order 2015-06-12 17:49:30 +08:00
afc163
b5ae8925f2 update modal demos 2015-06-12 17:44:29 +08:00
afc163
0cbf1b9cc3 update modal demos 2015-06-12 17:37:39 +08:00
afc163
2dc587269f update modal demos 2015-06-12 17:11:32 +08:00
afc163
5062f3eccc Merge branch 'master' of github.com:ant-design/ant-design 2015-06-12 15:38:47 +08:00
simaQ
b493f6f06c add angle icon 2015-06-12 15:31:41 +08:00
afc163
bed9310cb4 Merge branch 'master' of github.com:ant-design/ant-design 2015-06-12 12:14:15 +08:00
yiminghe
90241a7efe fix prefixCls 2015-06-12 12:01:02 +08:00
afc163
294e12693d Merge branch 'master' of github.com:ant-design/ant-design 2015-06-12 10:44:31 +08:00
然则
58938d38e7 up select component 2015-06-11 19:23:35 +08:00
afc163
7f3180d0ef Merge branch 'master' of github.com:ant-design/ant-design 2015-06-11 19:14:48 +08:00
afc163
a73aff66f8 update datepicker style 2015-06-11 18:08:00 +08:00
simaQ
b3d5e31d26 optimize button 2015-06-11 17:20:24 +08:00
yiminghe
ae78df0337 pass lint 2015-06-11 16:38:46 +08:00
yiminghe
3690b2888d pass lint 2015-06-11 16:35:36 +08:00
afc163
81d61868b2 update confirm demo 2015-06-11 12:01:36 +08:00
simaQ
2e592509e1 rename icons 2015-06-11 10:57:32 +08:00
simaQ
b95b3b3386 rename some icons 2015-06-11 09:17:02 +08:00
yiminghe
64e2682ec6 fix tooltip 2015-06-10 22:11:58 +08:00
yiminghe
520b1b0d4e fix tooltip 2015-06-10 22:10:51 +08:00
yiminghe
56ce321e39 Merge branch 'master' of github.com:ant-design/ant-design 2015-06-10 22:03:37 +08:00
yiminghe
c634b4d14c add confirm 2015-06-10 22:02:13 +08:00
afc163
de14583dfd iconfont style fix 2015-06-10 20:40:10 +08:00
yiminghe
1d7c3af0f9 update tab 2015-06-10 19:50:02 +08:00
afc163
ce6ee800d5 datepicker prefix className 2015-06-10 19:46:41 +08:00
afc163
2136f910d1 improve iconfont page style 2015-06-10 18:13:49 +08:00
afc163
55041219f2 Add eslint, close #14 2015-06-10 17:59:32 +08:00
afc163
f5b57edbf4 typo 2015-06-10 17:23:15 +08:00
afc163
e7c90a5124 update dropdown demos 2015-06-10 17:12:03 +08:00
afc163
e2647767de Merge branch 'master' of github.com:ant-design/ant-design 2015-06-10 16:45:02 +08:00
afc163
ab6599b367 update modal demo 2015-06-10 16:43:35 +08:00
展新
b430179785 update: 更新文档 2015-06-10 16:28:10 +08:00
afc163
03ca066b5d update dropdown demo 2015-06-10 16:04:48 +08:00
afc163
4b5ee40139 文案位置调整 2015-06-10 13:49:15 +08:00
afc163
dac9345ec9 Merge branch 'master' of github.com:ant-design/ant-design 2015-06-10 13:48:22 +08:00
afc163
b6c1ace624 update tooltip style 2015-06-10 13:47:56 +08:00
展新
2a3185bbd7 Merge branch 'master' of github.com:ant-design/ant-design 2015-06-10 12:22:23 +08:00
展新
45f8ad1099 change: 删除没用的代码 2015-06-10 12:22:10 +08:00
afc163
8c7bd7aeb7 Add some text 2015-06-10 12:19:16 +08:00
展新
c3a8b5c39f changed: 修改flex的class书写方式 2015-06-10 10:39:26 +08:00
afc163
bf7d15a8bd Merge branch 'master' of github.com:ant-design/ant-design 2015-06-09 22:26:16 +08:00
afc163
9987b78abe update tab API 2015-06-09 22:25:32 +08:00
yiminghe
695c3b8ff6 upgrade rc-dialog 2015-06-09 22:24:19 +08:00
展新
428c41efae Merge branch 'master' of github.com:ant-design/ant-design 2015-06-09 22:20:15 +08:00
展新
428dae25ef feat: 增加 flex 布局的支持 2015-06-09 22:19:35 +08:00
偏右
4a56a4758c Merge pull request #13 from ibigbug/tabs-basic
Tabs basic
2015-06-09 22:07:01 +08:00
然则
63025753ec Merge branch 'master' of github.com:ant-design/ant-design 2015-06-09 21:32:13 +08:00
展新
a5cb458b46 feat: 增加layout的Demo及文档 2015-06-09 21:20:15 +08:00
然则
34e0fa4b8d add select component 2015-06-09 21:16:59 +08:00
展新
89b89c9fc5 Merge branch 'master' of github.com:ant-design/ant-design 2015-06-09 18:30:09 +08:00
展新
a4fd19b0a2 feat: update layout 2015-06-09 18:29:43 +08:00
afc163
351385622c update demo style 2015-06-09 18:28:53 +08:00
展新
c134ed7fea fixed: merge 2015-06-09 18:24:45 +08:00
Yuwei Ba
8fcecbe974 Tabs 文档 2015-06-09 18:23:59 +08:00
Yuwei Ba
6f76c07b51 Basic usage 2015-06-09 18:23:59 +08:00
Yuwei Ba
8ceeab7cde Copy style. 2015-06-09 18:23:59 +08:00
Yuwei Ba
d15dd65af8 Basic demo 2015-06-09 18:23:59 +08:00
展新
8127182595 new: 增加 layout 样式 2015-06-09 18:22:52 +08:00
afc163
e057eb1f6d fix copied code 2015-06-09 18:11:28 +08:00
afc163
7e142a7aa5 update Dropdown demo code style 2015-06-09 18:08:56 +08:00
yiminghe
38a6eaecf6 fix tooltip 2015-06-09 17:44:22 +08:00
夏奈
9062597658 Merge remote-tracking branch 'origin/master' 2015-06-09 16:54:31 +08:00
afc163
5117ef9ee1 copy code in react way 2015-06-09 16:55:31 +08:00
夏奈
67265d49e3 progress 2015-06-09 16:54:11 +08:00
afc163
9098cecbca copy code in react way 2015-06-09 16:50:26 +08:00
afc163
e156d76940 update tooltip style 2015-06-09 16:40:16 +08:00
simaQ
656d0ca2e8 adjust button page style 2015-06-09 15:21:07 +08:00
afc163
d924d5f2d0 update components spell 2015-06-09 14:50:55 +08:00
afc163
e278f63d2b update dropdown 2015-06-09 14:46:51 +08:00
afc163
cc702a3ef9 update dropdown demos 2015-06-09 13:46:47 +08:00
afc163
18bb5de5ec Add blockquote style 2015-06-09 12:16:39 +08:00
afc163
8093c24ba9 Merge branch 'master' of github.com:ant-design/ant-design 2015-06-09 12:12:05 +08:00
afc163
b256e03119 iconfont copy function 2015-06-09 12:11:43 +08:00
simaQ
2897bedc18 update button page 2015-06-09 12:05:59 +08:00
afc163
4af16c957c copy iconfont text 2015-06-08 23:41:11 +08:00
afc163
ef17365889 update ant-design page style 2015-06-08 22:42:36 +08:00
yiminghe
3267c220aa add hover demo 2015-06-08 19:21:17 +08:00
yiminghe
ac2899efbb add dropdown 2015-06-08 19:10:47 +08:00
afc163
80fcde6247 fix tabs 2015-06-08 16:43:53 +08:00
simaQ
5e71bbf6c2 format the sample codes of button page 2015-06-08 16:15:03 +08:00
simaQ
d281b8e59c add loading icon 2015-06-08 16:13:50 +08:00
afc163
d1d980007e update code type 2015-06-08 13:01:43 +08:00
afc163
8b18647908 rm anticon- prefix 2015-06-08 12:41:37 +08:00
afc163
9dfea5282e fix iconfont 2015-06-08 12:39:35 +08:00
afc163
c29f0214b5 button-group style fix 2015-06-08 12:32:09 +08:00
afc163
5a0c7977f0 update iconfont page style 2015-06-07 17:18:14 +08:00
simaQ
61b4dddae9 update buttons 2015-06-07 14:03:00 +08:00
simaQ
4d48350b2e update iconfonts 2015-06-07 14:01:59 +08:00
simaQ
d6a5d43225 add the introduction of iconfont and button 2015-06-05 20:26:41 +08:00
yiminghe
2567071647 Merge branch 'master' of github.com:ant-design/ant-design 2015-06-05 15:17:15 +08:00
yiminghe
3a9619ed68 update modal 2015-06-05 15:16:55 +08:00
afc163
ba740c2029 typo 2015-06-05 14:53:21 +08:00
yiminghe
d3823e95d2 update modal 2015-06-05 12:05:52 +08:00
afc163
7e4fcfed27 fix instance 2015-06-05 11:41:45 +08:00
afc163
6ca3fd55bb 默认width 2015-06-05 10:47:06 +08:00
afc163
196566039b tweak code 2015-06-05 10:42:47 +08:00
afc163
b16202a329 update modal 2015-06-05 10:39:30 +08:00
yiminghe
31daadf847 update modal 2015-06-04 21:37:56 +08:00
yiminghe
93a8db1b7f update modal 2015-06-04 21:22:34 +08:00
yiminghe
06f63b279b add modal 2015-06-04 21:19:07 +08:00
yiminghe
6b0dd1dffe add modal 2015-06-04 21:17:52 +08:00
afc163
d43d8db6c5 placement demo 2015-06-03 20:46:25 +08:00
afc163
78a6492819 placement demo 2015-06-03 20:43:03 +08:00
afc163
2d35a19606 fix startOfWeek 2015-06-03 20:12:49 +08:00
afc163
805c55dd8f tooltip API 2015-06-03 17:52:44 +08:00
afc163
dd86179825 update index.md 2015-06-03 17:48:52 +08:00
afc163
d8db0ab716 API 2015-06-03 17:47:12 +08:00
afc163
de8a544a31 Add Tooltip 2015-06-03 17:08:51 +08:00
afc163
fb5e2604f5 calendar style 2015-06-03 11:26:53 +08:00
afc163
371f860c14 Update layout 2015-06-02 19:57:33 +08:00
afc163
6842c03762 select demo update 2015-06-02 18:15:32 +08:00
afc163
cafae580f1 code box description change 2015-06-02 17:20:02 +08:00
afc163
08dc95eadc update rc-style repo url 2015-06-02 17:06:50 +08:00
afc163
5651c402a5 update layout 2015-06-02 12:11:49 +08:00
afc163
4f9055a5fe default placeholder 2015-06-01 17:58:02 +08:00
afc163
7fb31b88ea update datepicker doc 2015-05-29 22:40:12 +08:00
afc163
b0cd0adc42 update style 2015-05-29 22:25:04 +08:00
afc163
9ee6b4f204 update API style & add datepicker API 2015-05-29 22:08:29 +08:00
afc163
bb486a6a60 不应该设置默认值 2015-05-29 21:28:01 +08:00
afc163
b0d5b31e11 Time picker 2015-05-29 21:07:46 +08:00
afc163
49cfaae7f2 sketch download link 2015-05-29 16:12:49 +08:00
afc163
fb79f55ff6 code style 2015-05-29 15:29:18 +08:00
afc163
de9b211627 Add datapicker disabled demo 2015-05-29 15:06:45 +08:00
afc163
4793b6979a datapicker demo 2015-05-28 14:53:23 +08:00
afc163
e1f93ed3e5 Add order for code demo 2015-05-27 20:41:16 +08:00
afc163
43ef2dccd3 挖坑 2015-05-27 15:43:29 +08:00
afc163
306d106a08 import rc-style 2015-05-26 17:35:24 +08:00
afc163
17a14faad2 update 2015-05-26 16:19:07 +08:00
afc163
3c5086dc7b datepicker onChange 2015-05-26 13:58:35 +08:00
afc163
03e59b7a77 default value of datepicker 2015-05-26 12:03:49 +08:00
afc163
12a1436abd rm timepick 2015-05-25 18:30:06 +08:00
afc163
31ef99c81d debug mode 2015-05-25 17:20:49 +08:00
afc163
3a2e7034a6 zh-cn 2015-05-22 12:02:56 +08:00
afc163
d08d510f96 components name 2015-05-21 22:24:19 +08:00
afc163
4c121603ec Add datepicker style 2015-05-21 20:36:13 +08:00
afc163
14a2a433d5 update disabled button 2015-05-18 19:54:33 +08:00
afc163
456f796f86 use nico-jsx, allow code type jsx 2015-05-18 18:13:16 +08:00
afc163
9591702f14 update code box template 2015-05-18 17:45:08 +08:00
afc163
2d1187c9ac update code template 2015-05-18 17:33:42 +08:00
afc163
7e05877c13 Add another demo for example 2015-05-16 17:12:22 +08:00
afc163
d83608dff4 read demo from demo folder 2015-05-16 15:03:33 +08:00
afc163
6ff3130f77 layout 2015-05-15 18:03:27 +08:00
afc163
706b657ceb code snipple 2015-05-15 16:00:08 +08:00
afc163
c4023c813f aside 2015-05-12 18:12:48 +08:00
afc163
35e9a4b836 update link 2015-05-12 16:15:39 +08:00
afc163
041ee44ded update style 2015-05-12 15:49:05 +08:00
afc163
5f13503558 aside with category 2015-05-11 18:09:13 +08:00
afc163
72885bd899 update aside style 2015-05-09 18:16:36 +08:00
afc163
08900df2fb rm src 2015-05-07 20:54:19 +08:00