Commit Graph

9925 Commits

Author SHA1 Message Date
afc163
9ddbad1088 Unify menu item height 2017-10-12 18:14:23 +08:00
niko
57d5038d1c fixed: https://github.com/ant-design/ant-design/issues/4905#issuecomment-335710078 (#7875) 2017-10-12 05:09:37 -05:00
afc163
73c9be2f40 bump 2.13.6 2017-10-12 14:52:39 +08:00
偏右
43362de756 Fix beforeUpload will stop uploading when return (#7870)
value is undefined

it should be same as rc-upload
2017-10-12 14:48:35 +08:00
niko
48847e14e0 fixed react-virtualized demo scroll position when other demo element has changed (#7866) 2017-10-12 14:09:38 +08:00
偏右
b77cc6392e Improve upload status test case (#7869)
* Add some companies

* test: generate snapshot in upload onChange

* change action

* upgrade travis node version

* fix ci
2017-10-12 14:09:17 +08:00
Arnaud Benhamdine
2799b73d21 docs: improve changelog wording (#7863) 2017-10-11 20:15:07 -05:00
Alexander Suevalov
35b2c5e58f Adding missing optional Upload property to LocaleProviderProps (#7862) 2017-10-11 07:13:39 -05:00
Wei Zhu
3c0103f8c5 Bump 2.13.5 2017-10-11 20:11:19 +08:00
Wei Zhu
09b1d4ffa0 2.13.5 Changelog (#7861) 2017-10-11 07:10:22 -05:00
afc163
627e94fa5a upgrade some devDependencies 2017-10-11 18:20:05 +08:00
afc163
efe0f3480a Merge branch 'master' into antd-3.0 2017-10-11 18:13:39 +08:00
afc163
3f54dbd3d2 document dropdown menu 2017-10-11 17:42:36 +08:00
afc163
1ef4cc277b Fix select item padding 2017-10-11 16:56:52 +08:00
afc163
9a96e9f9d1 new primary colors 2017-10-11 16:21:55 +08:00
Benjy Cui
0bce5c83f9 deps: upgrade rc-notification to support react@16 (#7844) 2017-10-11 12:03:19 +08:00
偏右
9053192ae9 Fix component style (#7848)
* fix components style

* fix snapshot

* update travis node version

* change upload action in ci
2017-10-11 12:01:27 +08:00
afc163
b0381a6ce4 fix icons, ref #7854 2017-10-11 10:44:26 +08:00
afc163
b174331be4 Fix hasFeedback icon overlap
close #7854
2017-10-11 10:44:26 +08:00
afc163
43659752d2 Fix hasFeedback icon overlap
close #7854
2017-10-11 10:37:45 +08:00
niko
b4ed4e6d3f Improve List Component
fixed: https://github.com/ant-design/ant-design/issues/4905#issuecomment-332442843
 (#7853)
2017-10-11 10:29:45 +08:00
afc163
278ae9b9c7 Fix upload ci 2017-10-11 10:18:02 +08:00
afc163
064afd9b85 fix upload ci 2017-10-11 09:54:13 +08:00
afc163
163366deeb Merge branch 'master' into antd-3.0 2017-10-10 21:52:48 +08:00
偏右
2b7a60224b Fix upload ci (#7849)
* Fix upload test case

* update delay time for uploading status
2017-10-10 21:48:21 +08:00
afc163
43a2ae2905 update color spec doc 2017-10-10 20:23:21 +08:00
afc163
244a2fd2da update locale-provider snap 2017-10-10 20:15:41 +08:00
afc163
fd7c90fb5a update upload snap file 2017-10-10 20:02:35 +08:00
afc163
6aa4138c00 Fix test warning 2017-10-10 20:01:23 +08:00
afc163
8feaf83003 fix upload test 2017-10-10 19:54:52 +08:00
afc163
190bebd65f Fix upload snapshot 2017-10-10 19:54:38 +08:00
afc163
5a5bb9c3a0 Fix upload snapshot 2017-10-10 19:54:05 +08:00
afc163
87ec78ce2e Merge branch 'master' into antd-3.0 2017-10-10 17:11:26 +08:00
afc163
b437233467 Fix upload picture loading style 2017-10-10 16:23:25 +08:00
Benjy Cui
e5edb4ac0f test: update snapshot 2017-10-10 16:06:49 +08:00
afc163
c3f1d0bba6 Add test case for upload 2017-10-10 15:59:13 +08:00
Wei Zhu
0d572c72a9 Add test for 9a5894c
9a5894c46e
2017-10-10 14:45:18 +08:00
afc163
d3b98d311a Merge branch 'master' into antd-3.0 2017-10-10 14:09:03 +08:00
Wei Zhu
9f0091dcd3 Expose slick methods (#7759)
https://github.com/ant-design/ant-design/issues/7484
2017-10-10 13:41:04 +08:00
afc163
712451acf7 Fix codepen demo 2017-10-10 11:35:50 +08:00
Benjy Cui
91fc781b6c chore: update docs and code style, ref: #7553#issuecomment-335009581 2017-10-10 10:04:03 +08:00
Wei Zhu
a3c3ec8070 Fix types and lint 2017-10-09 21:03:00 +08:00
Bastian Sieker
d4c75d43a1 Fix notification ArgsProps typing (#7834)
* Fix notification ArgsProps typing

close #7832

* Improve notification ArgsProps typing

see #7832

* Improve notification ArgsProps typing

see #7832
2017-10-09 19:58:30 +08:00
afc163
9a5894c46e data should be call when beforeUpload promise resolved, close #7833 2017-10-09 19:41:52 +08:00
Wei Zhu
2fb304e270 Ignore package-lock.json 2017-10-09 19:19:47 +08:00
Wei Zhu
c5487ad1eb React 16 + Enzyme 3 2017-10-09 19:18:04 +08:00
afc163
802bd98f16 update color doc 2017-10-09 19:15:30 +08:00
afc163
c775311d11 update color doc 2017-10-09 19:09:09 +08:00
afc163
154773e5ce update color doc 2017-10-09 19:08:11 +08:00
afc163
89c507c4ba pink => magenta 2017-10-09 18:26:11 +08:00