9713 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
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
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
syssam	f8b7aad53d	less variable @form-vertical-label-padding, @form-vertical-label-margin, @input-padding-horizontal-base, @input-padding-horizontal-sm, @input-padding-horizontal-lg (#7886) (#7919)	2017-10-20 15:11:44 +08:00
afc163	3d6b142621	fix notification ci	2017-10-20 15:10:53 +08:00
Stephen Esser	88ed97b63d	doc: Fix spelling mistake in Select demo (#7932)	2017-10-20 14:54:57 +08:00
afc163	3bc8f1ce5a	Tweak form nested form style	2017-10-20 11:35:05 +08:00
vgeyi	d64ab68adb	Cascade add prefixCls for child Input (#7945)	2017-10-19 21:55:06 -05:00
Zhang Zhi	7bc6aad1fd	Update button code to make it more clearer (#7929) ... * remove unnecessary default value of 'size' prop * `clicked` should be a state	2017-10-19 21:52:06 -05:00
memoryza	cf397a27f0	update Breadcrumb readme (#7947) ... * update Breadcrumb readme * update english	2017-10-19 22:36:49 +08:00
ddcat1115	712637907d	fix #7930	2017-10-18 23:52:54 +08:00
afc163	f33b1a279a	update style	2017-10-18 19:45:41 +08:00
Nekron	5017234381	doc: fix spelling mistakes in dropdown demo (#7912)	2017-10-17 11:20:33 -05:00
afc163	e7eb8693b6	Fix snap	2017-10-17 21:32:01 +08:00
afc163	c2e91d3b22	update some demo	2017-10-17 21:03:23 +08:00
afc163	43d8c6ad37	Fix input height in AutoComplete	2017-10-17 15:19:38 +08:00
Benjy Cui	7841386fcd	fix: should close panel when click presetted ranges, close: #7747	2017-10-17 13:57:39 +08:00
afc163	f26217b36f	Tweak checkbox margin	2017-10-17 11:06:25 +08:00
afc163	fda3f6ddcd	doc: fix expandedRowRender type, close #7901	2017-10-16 21:22:16 +08:00
henryv0	2356333c54	Updates Pattern docs (English) (#7902) ... * Makes grammatical and typo fixes to the React Docs. * Fixes some spelling and grammar in Pattern docs. * Fixes merge conflict. Updates Pattern docs.	2017-10-16 21:17:42 +08:00
afc163	2a34866e83	update layout demo	2017-10-16 20:39:53 +08:00
Wei Zhu	e6b1ba6a28	Mock requests	2017-10-15 17:34:03 +08:00
vgeyi	0a6475cb0d	Badge add scrollNumberPrefixCls (#7882) ... * badge add scrollNumberPrefixCls * badge add scrollNumberPrefixCls	2017-10-14 14:29:18 +08:00
Mário Gonçalves	d4a5606b92	Fix description value (#7877) ... Double quote on description value was causing a rendering error	2017-10-12 22:03:19 +08:00
afc163	d650c1bf50	use bisheng 0.25 for react 15	2017-10-12 20:05:35 +08: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
偏右	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