Commit Graph

3716 Commits

Author SHA1 Message Date
afc163
d9f289be97 Merge branch 'master' of github.com:ant-design/ant-design 2016-01-20 17:39:23 +08:00
afc163
e44bcaa7e4 Merge pull request #897 from ant-design/home-scroll-full
update home full screen scroll
2016-01-20 17:39:09 +08:00
afc163
0d00aaf011 Merge branch 'master' into develop-0.12.0 2016-01-20 17:32:38 +08:00
afc163
b855525615 Feature: support paging columns, ref #708 2016-01-20 17:15:39 +08:00
jljsj
9fdf0d501d update move scroll bar location problem 2016-01-20 16:26:21 +08:00
afc163
40c98fe4d0 fix conflict 2016-01-20 16:13:27 +08:00
afc163
5cd7959d9e Site: fix nav link 2016-01-20 15:54:13 +08:00
jljsj
9f8f7dcf7d update home full screen scroll 2016-01-20 15:51:44 +08:00
afc163
40bb200589 Merge branch 'master' into develop-0.12.0 2016-01-20 15:48:11 +08:00
afc163
d5dbb2e592 use codepen replace jsfiddle example 2016-01-20 15:42:52 +08:00
afc163
3eb57c1888 merge master 2016-01-20 15:14:49 +08:00
afc163
3e94a89004 fix antd.js for jsfiddle 2016-01-20 15:04:53 +08:00
afc163
57ff27f382 speed up site again 2016-01-20 14:32:22 +08:00
afc163
1ce3bb3e8d update footer 2016-01-20 19:03:35 +08:00
afc163
7445b57807 upgrade rc-table 2016-01-20 14:15:21 +08:00
afc163
c5a8e37ce6 0.12.0-beta.18 2016-01-20 20:23:28 +08:00
afc163
afabf00b5d Add progress prop style, fix #895 2016-01-20 20:21:51 +08:00
afc163
73596f0ba8 fix progress format, ref #894 2016-01-20 20:20:24 +08:00
afc163
4d228baa57 Progress support custom format, #893 2016-01-20 19:52:23 +08:00
afc163
75cc1466c2 update version 2016-01-19 19:03:43 +08:00
afc163
0df8baefce fix cascader overlay width 2016-01-19 18:01:21 +08:00
afc163
e8f0081a46 Merge branch 'master' into develop-0.12.0 2016-01-19 17:33:35 +08:00
afc163
4f8777546a Docs: Add ant-tool home page 2016-01-19 17:30:58 +08:00
afc163
26ff2defe7 downgrade lodash version 2016-01-19 17:23:14 +08:00
afc163
0c70f7e7e8 use postcss-loader, ref ant-tool/atool-build#49 2016-01-19 16:58:33 +08:00
afc163
1b0842743c upgrade devDeps version 2016-01-19 16:52:54 +08:00
afc163
3337e6072b Fix indent 2016-01-19 16:32:12 +08:00
afc163
2c8eabf99b Merge from master 2016-01-19 16:29:44 +08:00
afc163
9f5725d4e7 Style: fix tag component border radius to 6px 2016-01-19 16:28:26 +08:00
afc163
ad8974472d improve site speed via less script 2016-01-19 16:17:49 +08:00
afc163
27975606f1 new radio button style according to design spec 2016-01-19 15:09:28 +08:00
jljsj
58e784e7f9 remove home.js space 2016-01-19 14:25:43 +08:00
jljsj
f8ef94c7e3 version back 2016-01-19 14:23:56 +08:00
jljsj
f3170e7aad Merge branch 'master' of github.com:ant-design/ant-design 2016-01-19 14:21:36 +08:00
jljsj
902d3f3287 add home right point 2016-01-19 14:18:57 +08:00
afc163
f4a7ed76f5 resolve package.json conflicat 2016-01-19 11:44:17 +08:00
afc163
57c23a30db change devDeps pos 2016-01-19 11:42:48 +08:00
afc163
66bebf66fb merge master 2016-01-19 11:39:16 +08:00
afc163
0e5187daf6 bump 0.11.3 2016-01-19 11:34:30 +08:00
jljsj
e779feb1cb update func space 2016-01-19 11:15:27 +08:00
jljsj
57783a3951 update func space 2016-01-19 11:14:44 +08:00
jljsj
b9131c3b94 update home 2016-01-19 11:12:40 +08:00
afc163
5896850b5b Merge branch 'develop-0.12.0' of github.com:ant-design/ant-design into develop-0.12.0 2016-01-19 10:53:51 +08:00
afc163
14447cb6ae Merge from master 2016-01-19 18:51:45 +08:00
afc163
c114879df1 Merge pull request #890 from ant-design/fix-rangepicker
fix: locale should be passed to timePicker #837
2016-01-19 10:49:36 +08:00
Benjy Cui
07cfe19095 fix: locale should be passed to timePicker #837 2016-01-19 09:26:24 +08:00
yiminghe
3b6dfc891f upgrade calendar 2016-01-18 22:26:29 +08:00
yiminghe
d9eb022e3d fix dep 2016-01-18 20:44:20 +08:00
yiminghe
af0bb31c6a beta 15 2016-01-18 15:49:52 +08:00
yiminghe
9225bc30b5 Merge branch 'develop-0.12.0' of github.com:ant-design/ant-design into develop-0.12.0 2016-01-18 15:17:59 +08:00