Commit Graph

24131 Commits

Author SHA1 Message Date
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
afc163
617c0e4618 speed up basic animation 2016-01-18 14:19:09 +08:00
afc163
88f040c429 Merge branch 'master' into develop-0.12.0 2016-01-18 14:12:54 +08:00
afc163
7404e759a9 fix whitespace 2016-01-18 10:51:49 +08:00
afc163
5851bab344 Docs: update some style 2016-01-17 15:40:07 +08:00
afc163
f8d6de2095 Merge branch 'master' of github.com:ant-design/ant-design 2016-01-17 15:22:56 +08:00
afc163
c99d1f1000 Docs: update some style 2016-01-17 15:19:29 +08:00
Benjy Cui
bfb15c9776 docs: update README.md 2016-01-17 15:18:28 +08:00
Benjy Cui
64d5f8eafa docs: upate CONTRIBUTING.md 2016-01-17 15:02:37 +08:00
afc163
e5f7c8b432 fix some site style 2016-01-17 13:31:56 +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
4d58dfe421 update version 2016-01-16 14:57:39 +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
f4dad67454 beta 14 2016-01-15 20:15:06 +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
kasinooya
c28f73b647 remove iconfont smoothing css 2016-01-15 17:27:23 +08:00
afc163
7f5735b968 update table demo 2016-01-15 17:21:50 +08:00
afc163
97be25e89a Fix outline button hover style 2016-01-15 16:50:04 +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
4bd34c4500 0.12.0-beta.12 2016-01-15 16:35:27 +08:00
afc163
b619f01809 Remove react version warning 2016-01-15 16:34:49 +08:00
afc163
71a76806d2 0.12.0-beta.11 2016-01-15 16:13:16 +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
06abba27a9 fix TimePicker panel width inside DatePicker 2016-01-15 12:20:49 +08:00
afc163
d29ce1d174 fix TimePicker panel width inside DatePicker 2016-01-15 12:20:27 +08:00
yiminghe
f743aa009b Merge branch 'develop-0.12.0' of github.com:ant-design/ant-design into develop-0.12.0 2016-01-14 23:23:39 +08:00
yiminghe
543e0fbd24 use valid beta version 2016-01-14 23:22: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
71c84a2a44 Style: fix upload picture long filename bug 2016-01-14 21:35:31 +08:00
afc163
45d692d7dd Style: fix upload picture long filename bug 2016-01-14 21:34:55 +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
yiminghe
e924c57296 fix scripts
Conflicts:
	package.json
2016-01-14 20:50:33 +08:00