Commit Graph

10555 Commits

Author SHA1 Message Date
afc163
cbcc073aca Fix menu style 2017-10-26 13:38:18 +08:00
afc163
a5074bf475 Merge branch 'master' into antd-3.0 2017-10-26 12:58:59 +08:00
afc163
ed41f697e3 bump 2017-10-26 11:59:37 +08:00
afc163
0e5155567c Fix menu active border 2017-10-26 11:59:18 +08:00
afc163
e2bff100bd Fix upload style 2017-10-26 11:59:18 +08:00
Benjy Cui
e5699aff68 fix: should not import moment while useless, close: #8013 2017-10-26 10:50:18 +08:00
Wei Zhu
5660e81541 Remove debug code 2017-10-25 17:43:09 +08:00
Kiho · Cham
9ecce8d90f missing the array first element xs (#8010) 2017-10-25 00:58:10 -05:00
Benjy Cui
e641638c33 deps: upgrade bisheng (#7985) 2017-10-24 22:05:32 -05:00
Wei Zhu
bbb1a3a828 Merge branch 'master' into antd-3.0 2017-10-25 10:27:38 +08:00
Wei Zhu
36227a10db docs: sort api table 2017-10-25 10:25:44 +08:00
Wei Zhu
7776cf62a7 Merge branch 'master' into antd-3.0 2017-10-25 10:25:02 +08:00
Wei Zhu
caeaba68fc Merge pull request #7896 from monkindey/antd_api_sort_base_master
doc: sort api following some rule
2017-10-25 10:22:46 +08:00
Wei Zhu
f28d0d4d82 docs: Document onRowContextMenu
close #7820
2017-10-25 10:00:44 +08:00
afc163
35f1bf5f94 Fix mini size pagination style 2017-10-24 20:39:38 +08:00
For177
6d68d5d8fc Update index.zh-CN.md (#8002) 2017-10-24 04:31:12 -05:00
afc163
89a3b22791 Fix menu style 2017-10-24 15:56:28 +08:00
afc163
d8c9b77468 fix snapshot 2017-10-24 15:44:11 +08:00
afc163
695bd8a6c0 bump 2017-10-24 15:29:35 +08:00
afc163
2ef2925c8e update card and tabs style 2017-10-24 15:29:10 +08:00
monkindey
a22bcec4e7 add size props group sorting 2017-10-24 14:34:58 +08:00
Benjy Cui
67be1eafa9 test: fix CI 2017-10-24 14:08:39 +08:00
monkindey
fe19a9b124 rerun api-sort script 2017-10-24 11:22:57 +08:00
monkindey
990d9c6192 format the conflicted table markdown 2017-10-24 11:21:04 +08:00
monkindey
7d26fb10e0 correct the conflict 2017-10-24 11:21:04 +08:00
monkindey
2a92b7a9fa feat: add sort api table script 2017-10-24 11:21:04 +08:00
monkindey
ea926fecaf also resolve conflicted file 2017-10-24 11:20:45 +08:00
monkindey
0bc5936b23 resolve conflicted files 2017-10-24 11:16:48 +08:00
Eric Thomas
4a3602b536 docs:Fix spelling of difference (#7995) 2017-10-23 21:20:57 -05:00
afc163
3c1b4da51e Fix autoprefix warning 2017-10-23 20:53:59 +08:00
afc163
9181db8a01 Fix autoprefix warning 2017-10-23 20:52:41 +08:00
afc163
43f5ed30ac Fix snapshot 2017-10-23 20:43:31 +08:00
afc163
c472ed27f8 Merge branch 'master' into antd-3.0 2017-10-23 19:40:14 +08:00
Wei Zhu
f03af93b86 Optimize ci scripts 2017-10-23 16:32:42 +08:00
Wei Zhu
d829f6c008 docs: expandedRowRender can not be boolean 2017-10-23 11:21:05 +08:00
afc163
3f57d5f56d Merge branch 'master' into antd-3.0 2017-10-23 10:41:51 +08:00
Benjy Cui
ff5d05129f docs: translate 1599686 2017-10-23 10:37:31 +08:00
kossel
1599686fc2 docs: update docs for Modal, close #7840 (#7952) 2017-10-22 21:35:47 -05:00
afc163
65ee579480 update footer links 2017-10-23 10:08:12 +08:00
朮厃
8e1cb081db Remove the inner shadow on iOS inputs. (#7974) 2017-10-23 10:05:53 +08:00
ddcat1115
6d94fa0efe update travis node version 2017-10-23 10:01:13 +08:00
ddcat1115
4cfb34ee4f try to fix ci 2017-10-23 00:08:47 +08:00
ddcat1115
c9bc8d7095 fix Upload ci 2017-10-22 23:36:27 +08:00
ddcat1115
1f57cf4e51 version 2.13.7 2017-10-22 17:44:23 +08:00
ddcat1115
12819130ec fix Table filter can't show after remove fixed setting. (#7962)
* fix Table filter can't show after remove fixed setting.
close #7909

* improve
2017-10-22 02:54:12 -05:00
afc163
8e09745def Fix #7969 2017-10-22 15:23:34 +08:00
afc163
86da4a95ce Fix lint 2017-10-21 20:06:12 +08:00
afc163
7286e6d0d0 Fix extra margin in sider Layout
which is a margin collaspe problem

close #7967

ref: https://stackoverflow.com/a/33132624/3040605
2017-10-21 15:12:56 +08:00
afc163
529f9fa933 use @heading-color again 2017-10-20 15:49:28 +08:00
afc163
ef443ad047 Merge branch 'master' into antd-3.0 2017-10-20 15:47:42 +08:00