Commit Graph

1759 Commits

Author SHA1 Message Date
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
3337e6072b Fix indent 2016-01-19 16:32:12 +08:00
afc163
27975606f1 new radio button style according to design spec 2016-01-19 15:09:28 +08:00
afc163
f4a7ed76f5 resolve package.json conflicat 2016-01-19 11:44:17 +08:00
afc163
14447cb6ae Merge from master 2016-01-19 18:51:45 +08:00
Benjy Cui
07cfe19095 fix: locale should be passed to timePicker #837 2016-01-19 09:26:24 +08:00
afc163
222edae961 Merge pull request #881 from ant-design/feature-upload
Feature upload
2016-01-17 13:17:45 +08:00
afc163
64d96f071f update picture card upload list style for more expansibility 2016-01-16 16:39:52 +08:00
afc163
4b5e09de8d Merge branch 'master' into develop-0.12.0 2016-01-16 14:58:05 +08:00
afc163
f178e9aa61 Merge branch 'develop-0.12.0' of github.com:ant-design/ant-design into develop-0.12.0 2016-01-16 14:50:45 +08:00
yiminghe
fa7bc2629d upgrade tree 2016-01-15 20:10:46 +08:00
afc163
341ad18eb6 fix table select all 2016-01-15 17:44:19 +08:00
afc163
7f5735b968 update table demo 2016-01-15 17:21:50 +08:00
kasinooya
98627f6d46 Merge branch 'develop-0.12.0' into feature-upload 2016-01-15 16:45:40 +08:00
kasinooya
17ebf07ad3 Add picture-card demo 2016-01-15 16:44:07 +08:00
afc163
5d2d5b2604 Merge branch 'master' into develop-0.12.0 2016-01-15 16:12:40 +08:00
kasinooya
12c792147e Merge develop-0.12.0 into HEAD 2016-01-15 16:11:31 +08:00
afc163
3ed9ce3cb5 Do not empty selection when change dataSource now
eh... empty behavious will trigger a infinite loop when sapecify
immutable dataSource

You need to empty manully when change data or current page
2016-01-15 16:07:59 +08:00
kasinooya
a6f68b2d37 fix eslint error 2016-01-15 15:57:41 +08:00
kasinooya
4d0e873c88 Add upload listType: picture-card 2016-01-15 15:56:06 +08:00
afc163
a681ea9eb9 fix fileList demo 2016-01-15 15:41:47 +08:00
afc163
dab82feb78 auto eslint fix in scripts 2016-01-14 21:44:35 +08:00
afc163
1514d28dc4 update tree select doc 2016-01-14 21:42:02 +08:00
afc163
229b0de3c6 upgrade rc-upload to 1.8.0, close #677 2016-01-14 21:15:25 +08:00
afc163
bdf819bea3 Merge master 2016-01-14 20:54:52 +08:00
afc163
c65400c586 Merge branch 'develop-0.12.0' of github.com:ant-design/ant-design into develop-0.12.0 2016-01-14 20:41:10 +08:00
afc163
4669c67bc4 resolve conflict 2016-01-14 20:40:30 +08:00
yiminghe
dc3b34510b compatible with rc-form 2016-01-14 19:15:21 +08:00
Benjy Cui
41ed04e977 style: update code style to please lint 2016-01-14 16:46:38 +08:00
afc163
dde03eaec4 Merge branch 'develop-0.12.0' of github.com:ant-design/ant-design into develop-0.12.0 2016-01-14 16:44:10 +08:00
afc163
772eea09c7 support pending timeline node, ref #708 2016-01-14 16:43:48 +08:00
yiminghe
fd1312803f upgrade calendar/timePicker. Fixes #822 2016-01-14 16:38:37 +08:00
afc163
efcc8c5cb2 fix popover API table 2016-01-14 15:55:42 +08:00
afc163
d271e92b8e Merge master 2016-01-14 15:35:21 +08:00
afc163
413e816c98 update button doc 2016-01-14 15:24:54 +08:00
afc163
11353c7a60 reset menu link color, fix #872 2016-01-14 11:54:46 +08:00
zhangpc
db2ef44617 remove href attributes of tag 2016-01-14 09:26:20 +08:00
然则
2e26942ecd Merge branch 'develop-0.12.0' of github.com:ant-design/ant-design into develop-0.12.0 2016-01-14 00:42:10 +08:00
然则
696b3438b8 up tree, change drag api, fix drag state 2016-01-14 00:41:25 +08:00
afc163
2e3ccfb345 Merge branch 'master' into develop-0.12.0 2016-01-13 22:48:54 +08:00
afc163
63476680bd Add upload inline item demo, ref #859 2016-01-13 22:44:45 +08:00
afc163
fdcc665c80 merge drag upload demo 2016-01-13 22:39:02 +08:00
afc163
027a69b0f0 hide multiple upload demo 2016-01-13 22:32:42 +08:00
afc163
a16903009e merge from master 2016-01-13 22:22:33 +08:00
afc163
4cd73289b3 update checkbox use instruction, fix #860 2016-01-13 21:56:51 +08:00
afc163
56c4882f30 Merge pull request #845 from ant-design/new-design-spec
New design spec
2016-01-13 21:49:46 +08:00
Benjy Cui
f58ac72a88 docs: update Select's documentation 2016-01-13 17:35:48 +08:00
afc163
a479bc8fe3 Fix MonthPicker style, close #848 2016-01-13 17:30:54 +08:00
afc163
24bd1f09da fix Modal case bug 2016-01-13 16:46:38 +08:00