Commit Graph

519 Commits

Author SHA1 Message Date
afc163
5c1045c994 merge master 2015-11-09 17:07:20 +08:00
afc163
e1a6123aa6 Fix ES2015 syntax in unbabeled file 2015-11-09 16:55:06 +08:00
yiminghe
d37370c144 fix lint 2015-11-09 11:13:31 +08:00
afc163
01dd197111 upgrade react-router in demo 2015-11-06 22:30:04 +08:00
afc163
22e1cd9c57 0.10.0-beta22 2015-11-06 22:28:10 +08:00
yiminghe
ddbc1de6e8 upgrade 2015-11-06 12:16:03 +08:00
afc163
23b52b14f2 upgrade react-slick dep, fix carousel document, close #483 2015-11-05 18:29:44 +08:00
afc163
573e90aa1a 0.10.0-beta21 2015-11-05 17:50:20 +08:00
afc163
ac98bb9cf7 bump 0.10.0-beta20 2015-11-05 11:06:23 +08:00
afc163
14242740ed upgrade rc-menu 2015-11-05 11:04:12 +08:00
yiminghe
15a13c1076 bump 2015-11-04 23:15:28 +08:00
yiminghe
a62e4b0aae upgrade and optimize css 2015-11-04 23:14:49 +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
yiminghe
8005455ddd use div 2015-11-04 18:07:42 +08:00
afc163
56c8f89dbc 0.10.0-beta17 2015-11-04 17:23:53 +08:00
popomore
84647fa12d test: add simple testcase for popover 2015-11-04 17:22:33 +08:00
afc163
a2ac7ff568 update clip 2015-11-04 14:59:55 +08:00
afc163
15cef16368 update 2015-11-04 14:46:41 +08:00
afc163
7f596286d4 Add clipboard for color tool 2015-11-04 13:17:56 +08:00
afc163
80290c81e5 merge from master 2015-11-04 11:05:46 +08:00
afc163
5bcdcc3fce fix 0.9.3 error 2015-11-04 10:59:19 +08:00
yiminghe
dc1650486d fix button 2015-11-03 20:06:44 +08:00
yiminghe
e9a178fb43 remove left top 2015-11-03 19:58:09 +08:00
afc163
664fb92104 update rc-table 2015-11-03 17:21:51 +08:00
afc163
cef93e2148 babel index.js, fix beta10 bug 2015-11-03 16:03:09 +08:00
yiminghe
052e8ee0f4 upgrade 2015-11-03 13:52:41 +08:00
afc163
042bf1a20d speed up tests 2015-11-03 12:08:18 +08:00
afc163
c0dc894cbe Fix tests 2015-11-03 11:56:08 +08:00
afc163
caa87cb6f2 Merge master for 0.9.3 change 2015-11-03 11:09:52 +08:00
afc163
39f8613379 check the React version is available
Conflicts:
	package.json
2015-11-03 11:06:42 +08:00
偏右
145a20ece1 Merge pull request #464 from ant-design/simple-test-via-jest
Simple test via jest
2015-11-02 22:37:24 +08:00
afc163
2fa7f95cce basic test 2015-11-02 22:36:46 +08:00
afc163
c671214346 upgrade eslint-config-airbnb 2015-11-02 22:30:26 +08:00
afc163
9ef72bae9d Add simple test 2015-11-02 21:34:52 +08:00
afc163
34665d9d70 check the React version is available 2015-11-02 18:26:05 +08:00
afc163
ebfd5ae0bf 0.10.0-beta9 2015-11-02 17:04:01 +08:00
afc163
99b15340b5 Fix IE8 error via downgrade react to 0.14.0, #456
waiting for 0.14.2, more info:
https://github.com/facebook/react/issues/5323
2015-11-02 16:19:26 +08:00
Benjy Cui
24a2e1ecca deps: upgrade rc-slider 2015-11-01 11:42:47 +08:00
afc163
84e71919da Datepicker upgrade 2015-10-31 15:16:05 +08:00
afc163
33aed8d45e update nico-jsx 2015-10-30 16:26:23 +08:00
afc163
5a97860d7c update deps 2015-10-30 15:35:23 +08:00
afc163
ab4cd86221 Merge branch 'develop-0.10.0' of github.com:ant-design/ant-design into develop-0.10.0 2015-10-30 15:29:15 +08:00
Benjy Cui
1fbd07d7a6 deps: upgrade React Components 2015-10-30 15:22:25 +08:00
afc163
f1576b9c84 upgrade babel version 2015-10-30 14:51:40 +08:00
Benjy Cui
46452912c1 docs: update Slider's docs 2015-10-30 14:09:15 +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
勤拭
e9cfca0d89 support colspan and rowspan 2015-10-29 15:38:59 +08:00
偏右
f528017412 Merge pull request #438 from ant-design/develop-0.10.0fortreedynamic
Dynamic Tree
2015-10-29 14:19:30 +08:00
afc163
fce8ab5e64 0.10.0-beta8 2015-10-28 19:09:15 +08:00
afc163
dac4b51ea5 Fix calendar 2015-10-28 16:31:28 +08:00
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