Commit Graph

519 Commits

Author SHA1 Message Date
afc163
2ae668abb3 upgrade rc-table 2015-10-27 20:13:11 +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
ioldfish
8f887d3879 update ant-tree dynamic 2015-10-27 15:47:01 +08:00
Benjy Cui
e788bf8495 deps: upgrade React Components 2015-10-27 14:33:38 +08:00
afc163
157faaf458 Merge master for 0.9.2 upgrade 2015-10-26 17:38:27 +08:00
afc163
1ccd553e17 bump 0.9.2 2015-10-26 17:29:22 +08:00
yiminghe
8729808625 upgrade dropdown 2015-10-26 14:26:51 +08:00
yiminghe
e2b21bbf1f upgrade 2015-10-26 11:07:19 +08:00
yiminghe
2f8162da02 upgrade 2015-10-23 23:25:29 +08:00
afc163
cd0703e462 remove enter-animation 2015-10-23 21:38:35 +08:00
jljsj
ac87334179 update queue-anim demo ReactDOM 2015-10-23 14:53:57 +08:00
afc163
4bed95ef6a Merge 2015-10-22 21:30:28 +08:00
yiminghe
a687c32b1d add compiled css 2015-10-22 19:09:23 +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
偏右
540c3d165a Merge pull request #405 from ant-design/use-origin-less
export original less file, ref #384
2015-10-22 16:40:26 +08:00
afc163
efaf13b4ac upgrade select component 2015-10-22 14:59:53 +08:00
yiminghe
02ac02c252 bump 2015-10-21 21:32:09 +08:00
afc163
f60a3c6192 export original less file, ref #384 2015-10-21 20:27:06 +08:00
jljsj
ba34a49f79 update queue-anim demo 2015-10-21 17:53:38 +08:00
yiminghe
439948d2b9 fix remove demo for tabs 2015-10-21 17:32:49 +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
yiminghe
a8ed06ec86 upgrade dialog 2015-10-20 17:12:59 +08:00
yiminghe
76b0f673ec beta2 2015-10-20 16:47:55 +08:00
afc163
6135242dc3 fix version select order 2015-10-19 18:05:06 +08:00
afc163
1ea1a62d19 fix version select order 2015-10-19 18:04:54 +08:00
afc163
925d75dd1e upgrade rc-slider 2015-10-19 16:54:19 +08:00
jljsj
bf1d703274 queue-anim demo 2015-10-19 15:36:32 +08:00
Benjy Cui
d12425a11e chore: upgrade react-slick in order to work with React@0.14.x 2015-10-19 15:01:30 +08:00
yiminghe
d3421b6bf4 Merge pull request #397 from ant-design/develop-0.10.0fortree
Develop 0.10.0fortree
2015-10-17 00:17:20 +08:00
afc163
cfbd7bd85d upgrade to reqwest@2.0.5, ref ded/reqwest#217 2015-10-16 13:56:37 +08:00
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
afc163
6092ca2319 upgrade input-number to 2.1.x 2015-10-14 16:27:06 +08:00
afc163
ecb98d8787 Merge branch 'master' into develop-0.10.0 2015-10-12 10:21:16 +08:00
afc163
a085adcf05 Add react to devDeps 2015-10-12 10:20:17 +08:00
afc163
cea77e00a5 Change version to 0.10.0-beta, Merge branch 'master' into develop-0.10.0 2015-10-09 15:43:05 +08:00
afc163
ac3eaaf6ea update stableVersion 2015-10-09 15:42:03 +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
afc163
c98c3eef57 bump 0.9.1 2015-09-26 01:00:29 +08:00
afc163
8384512bf9 0.9.1-beta13 2015-09-24 18:39:07 +08:00
afc163
147b4ac49b Add overlayClassName to popover and tooltip 2015-09-24 18:38:31 +08:00
afc163
8cc42581bb 0.9.1-beta12 2015-09-23 15:28:43 +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
df4f747b65 bump new beta 2015-09-19 17:38:22 +08:00
afc163
4343098426 0.9.1-beta7 2015-09-18 23:32:44 +08:00
afc163
f752882b44 0.9.1-beta8 2015-09-18 16:02:23 +08:00
afc163
c85f2852e8 update task deploy 2015-09-17 16:37:42 +08:00
羽航
c6f4af3ce4 update rc-steps to v1.3.2 取消iframe方案 2015-09-17 16:18:11 +08:00
羽航
c28034efa7 update rc-steps v1.3.1 使用iframe来监控resize事件。未来不支持ie8后,再过渡到纯css实现。 2015-09-17 14:18:06 +08:00
afc163
95750472a3 0.9.1-beta7 2015-09-16 21:26:04 +08:00
afc163
78d15aabbf Fix initial maxDescriptionWidth for vertical steps 2015-09-16 18:23:51 +08:00
afc163
1d31b8e0be 0.9.1-beta5 2015-09-16 18:04:23 +08:00
yiminghe
e5de88d043 upgrade upload 2015-09-16 18:00:56 +08:00
羽航
be68b6c40c update rc-steps v1.3.0 2015-09-16 15:22:32 +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
4c7deda28b fix rc-menu 2015-09-16 12:34:55 +08:00
afc163
4e23745bc0 0.9.1-beta3 2015-09-16 12:19:40 +08:00
afc163
f0d8f5c55c update menu style and version 2015-09-16 11:29:51 +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
961a679a9f upgrade to fit react-router@1.0.0-rc1 2015-09-15 17:35:22 +08:00
afc163
278880119d 0.9.1-beta2 2015-09-15 13:35:56 +08:00
偏右
48e097c8a4 Merge pull request #284 from zhujun24/master
css container warning
2015-09-14 19:32:32 +08:00
羽航
1aebbc147c update rc-steps to v1.2.4.解决vertical类型的steps的宽度问题 2015-09-14 18:54:56 +08:00
zhujun24
2883e075f9 css container warning 2015-09-14 18:02:14 +08:00
afc163
de581aebcb 0.9.1-beta1 2015-09-14 00:53:06 +08:00
afc163
b2dd01a0e8 bump 0.9.0 2015-09-14 00:37:09 +08:00
afc163
b4c3a01d40 Change dep version 2015-09-14 00:35:38 +08:00
afc163
c7efbb6de0 0.9.0-beta10 2015-09-11 22:42:34 +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
jljsj
365fc535e0 update enter-animation demo 2015-09-11 12:02:08 +08:00
afc163
273b30bff7 Merge branch 'master' of github.com:ant-design/ant-design 2015-09-11 11:30:24 +08:00
yiminghe
f8ae3cf3b9 add beta 2015-09-11 10:58:16 +08:00
afc163
1c19ad1b6d Merge branch 'master' of github.com:ant-design/ant-design 2015-09-11 10:51:50 +08:00
yiminghe
cc16da4a9f fix publish 2015-09-11 10:29:26 +08:00
afc163
05eaf52aca 0.9.0-beta9 2015-09-10 22:00:53 +08:00
yiminghe
0fafa86cac upgrade select 2015-09-10 18:12:50 +08:00
jljsj
10ad6e29be update enterAnimation version 2015-09-10 17:03:47 +08:00
jljsj
2e829690d0 update enterAnimation style is object and string 2015-09-10 16:20:24 +08:00
afc163
6ca6d1062a 0.9.0-beta8 2015-09-10 12:22:24 +08:00
zhujun24
95465a6794 add expand table 2015-09-10 11:04:31 +08:00
jljsj
6c2f15241a update enterAnimation version 2015-09-09 17:43:40 +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
afc163
4910109789 0.9.0-beta6 2015-09-08 18:26:42 +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
5c00b0e66b Fix publish problem 2015-09-08 18:17:15 +08:00
afc163
0695a887ef update CHANGELOG 2015-09-08 12:12:21 +08:00
afc163
f785d7b891 antd.confirm() is deprecated, use antd.Modal.confirm() instead 2015-09-08 11:42:10 +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
afc163
4eb21ea5bc 0.9.0-beta3 2015-09-07 12:29:23 +08:00
afc163
579ad01fc5 rollback for reqwest 2015-09-07 11:24:28 +08:00
afc163
eaad577e79 Fix xhr2 bug, ded/reqwest#207 2015-09-07 10:13:42 +08:00
afc163
108a469c79 0.9.0-beta2 2015-09-01 22:16:34 +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
6f0ba9142e restore vertical steps 2015-09-01 15:30:51 +08:00
afc163
23243844ba update devDeps
fix #231
2015-09-01 15:13:39 +08:00
sorrycc
8cbd9ae6f9 upgrade react-slick to 0.7 2015-09-01 14:30:24 +08:00
偏右
e0f2eb214e Merge pull request #225 from zhujun24/vertical-steps
Vertical steps
2015-09-01 11:06:06 +08:00
afc163
95f2e82f4e Change version 2015-09-01 01:06:48 +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
11fda3bf07 0.8.1-beta2 2015-08-28 00:12:38 +08:00
afc163
ed4beaf57c beta1 2015-08-25 17:39:56 +08:00
afc163
859ffdacb1 0.8.1-beta 2015-08-25 17:39:26 +08:00
afc163
19af7309e1 Merge branch '0.8.0' 2015-08-25 17:39:07 +08:00
yiminghe
109e283e15 add MonthCalendar 2015-08-25 17:33:01 +08:00
afc163
18bc4994dc 0.8.0 2015-08-25 15:24:06 +08:00
afc163
3456e1122e update object-assign version 2015-08-25 14:25:03 +08:00
然则
408fd5b8b9 up tree version 2015-08-25 13:20:38 +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
820ed5c891 Merge branch '0.8.0' of github.com:ant-design/ant-design into 0.8.0 2015-08-24 21:09:59 +08:00
afc163
86c90f0109 只有 dataSource 的变化才能从外面触发新请求
另外,is-equals-shallow 的比较始终是 false,因为 props.columns 是 array
2015-08-24 21:08:00 +08:00
然则
af22a48fbb up tree selected style 2015-08-24 20:21:06 +08:00
偏右
adb2843df6 Merge pull request #188 from ant-design/new-menu-animation
Add menu animation
2015-08-24 19:25:38 +08:00
jljsj
c2be1cbf81 Add menu animation 2015-08-24 18:18:46 +08:00
然则
d29a215e74 up tree and add velocity-animate 2015-08-24 18:12:07 +08:00
afc163
5bfe60771c beta6 2015-08-24 15:13:51 +08:00
afc163
e57773d8c5 It is ok to install xhr2 in browser 2015-08-24 15:02:57 +08:00
yiminghe
552b45ab98 revert port 2015-08-24 14:31:43 +08:00
yiminghe
60c1f06bb1 expost calendar 2015-08-24 14:30:08 +08:00
yiminghe
3b3ae23fe2 update animate 2015-08-24 00:31:49 +08:00
zhujun24
6d959a601b fixed collapse IE8/Safari 2015-08-23 15:33:15 +08:00
yiminghe
3795111cff Merge branch '0.8.0' of github.com:ant-design/ant-design into 0.8.0 2015-08-21 23:37:32 +08:00
yiminghe
43e948f815 upgrade dropdown 2015-08-21 23:36:10 +08:00
afc163
f260b2145f update description 2015-08-21 17:00:33 +08:00
yiminghe
c4b5b186ae render to body 2015-08-21 14:54:37 +08:00
afc163
aabf57a117 beta5 2015-08-20 20:53:59 +08:00
afc163
cd4d98266c react-router@1.x as devDependency 2015-08-20 20:33: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
afc163
f0931ece66 Add lesslint and fix less code style 2015-08-20 16:55:42 +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
sorrycc
d897263d5b fix: Carousel don't work in IE8, ref: #138 2015-08-20 11:34:43 +08:00
afc163
b72443327b minimized static files in ant.design 2015-08-19 21:44:31 +08:00
afc163
3bf7dce466 beta4 2015-08-19 14:10:58 +08:00
afc163
9b1bbc855b webpack progress plugin 2015-08-19 13:24:51 +08:00
afc163
6e542e4972 update tree 2015-08-19 11:45:08 +08:00
翰文
c1b409662d chore: 更新upload文档和依赖版本 2015-08-18 17:31:37 +08:00
afc163
fc71504c78 beta3 2015-08-18 17:12:07 +08:00
afc163
a14f8abbfb ignore xhr2 2015-08-18 15:30:02 +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
yiminghe
a15e428155 fix select placeholder for ie10. Fixes #145 2015-08-18 00:42:03 +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
ioldfish
1b78c4fc90 merge from fortree 2015-08-17 17:32:59 +08:00
afc163
96f136205e update deps 2015-08-17 13:06:01 +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
然则
82bf118a73 up iconfont 2015-08-14 23:28:20 +08:00
afc163
466238b1f8 beta2 2015-08-14 18:21:04 +08:00
afc163
14c046b87d Merge branch '0.8.0' of github.com:ant-design/ant-design into 0.8.0 2015-08-14 14:22:04 +08:00
afc163
ce5d7b9d9c update rc-upload to 1.3.0, modify onError arguments 2015-08-14 14:17:22 +08:00
yiminghe
ac50ae3632 upgrade menu 2015-08-14 13:09:53 +08:00
yiminghe
b3af79ab24 upgrade. Fixes #127 2015-08-13 16:39:51 +08:00
jljsj
5b47891c52 更新enterAnimation版本与demo 2015-08-12 14:57:45 +08:00
yiminghe
79e54f03f5 upgrade menu 2015-08-11 23:32:49 +08:00
然则
6da7db4ec2 up rc-tree version 2015-08-10 20:23:18 +08:00
yiminghe
eef1da7ed6 upgrade menu 2015-08-10 17:57:28 +08:00
afc163
dae05a55c4 merge 2015-08-09 18:05:50 +08:00
玄寂
63cf7bb742 feat: add upload component 2015-08-08 23:37:35 +08:00
yiminghe
aa6722b0d2 upgrade slider 2015-08-08 00:49:48 +08:00
jljsj
e1a6cfc72a updata enterAnimation version 2015-08-07 17:07:19 +08:00
yiminghe
ed549a19b3 upgrade rc-menu 2015-08-07 00:34:06 +08:00
yiminghe
454e5cc22b upgrade rc-select. Fixes #118 2015-08-07 00:16:21 +08:00
afc163
e958481e00 rollback dep version 2015-08-06 21:49:52 +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
f8b19f3bc8 update deps 2015-08-06 15:42:03 +08:00
ioldfish
817e5ff72a upadte tree style 2015-08-06 09:17:40 +08:00
yiminghe
0e58688dc2 fix adjustOrientOnCalendarOverflow 2015-08-04 18:42:41 +08:00
偏右
2fe97eb8ee Merge pull request #88 from zhujun24/notification
Notification
2015-08-04 11:45:40 +08:00
sorrycc
ebf1c3ed25 add Carousel 2015-08-03 17:43:05 +08:00
sorrycc
eb4f468b49 add Affix 2015-08-03 17:12:50 +08:00
ioldfish
c18af7db79 包装rc-tree,样式待修改 2015-08-03 16:07:21 +08:00
zhujun24
0a79201536 merge conflict index.js 2015-08-03 15:22:04 +08:00
SimaQ
5f70cf024a feat: add form-validation 2015-08-03 13:39:58 +08:00
zhujun24
a4f6890dec merge 0.8.0 2015-07-31 18:19:36 +08:00
afc163
15551bfa55 fix dep 2015-07-31 15:15:47 +08:00
afc163
dd5f8ba468 update developing version 2015-07-30 18:50:05 +08:00
afc163
bd5805a0e4 Merge branch 'master' into 0.8.0 2015-07-30 17:25:20 +08:00
afc163
a2b4bcb008 bump 0.7.3 2015-07-30 17:20:07 +08:00
zhujun24
718751d063 merge 0.8.0 2015-07-29 21:07:02 +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
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