Commit Graph

403 Commits

Author SHA1 Message Date
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