Commit Graph

7067 Commits

Author SHA1 Message Date
afc163
b9793662ac Merge branch 'master' of github.com:ant-design/ant-design 2016-07-09 16:04:27 +08:00
afc163
28c470cb37 Merge 1.x-stable 2016-07-09 16:03:47 +08:00
afc163
4ac775212f Improve code for #2247 2016-07-09 16:00:05 +08:00
djorkaeff
f687c95bd9 change offset when window resize 2016-07-09 15:40:30 +08:00
yeliex
147e06a837 Add colon props to Form (#2311) 2016-07-09 15:10:07 +08:00
afc163
ec8a0821cd Fix controlled fileList prop, close #2236 2016-07-09 15:08:39 +08:00
bang
9677a06f38 update tag 2016-07-09 11:00:07 +08:00
bang
414de809ea update tooltip 2016-07-09 10:54:21 +08:00
bang
724ce80b5e update timeline 2016-07-09 10:53:40 +08:00
bang
00710328b1 update timepicker 2016-07-09 10:52:58 +08:00
bang
c36cf9e07e update tag 2016-07-09 10:52:16 +08:00
bang
817bfe9681 update tabs 2016-07-09 10:50:51 +08:00
jiang
2a64384852 update rc-scroll-anim (#2322) 2016-07-08 17:33:25 +08:00
afc163
94fe25f1b3 Merge 1.x-stable 2016-07-08 17:31:03 +08:00
afc163
45db4cab50 improve props passing 2016-07-08 17:17:57 +08:00
afc163
f675b636cd Merge 1.x-stable 2016-07-08 16:34:02 +08:00
偏右
e6f274a5f9 Update ISSUE_TEMPLATE.md 2016-07-08 16:14:21 +08:00
afc163
9e4c02aabd Fix checkbox API table style 2016-07-08 15:58:25 +08:00
afc163
c9f4f8efd5 update tag 2016-07-08 15:31:30 +08:00
afc163
b4c76f4444 update changelog 2016-07-08 15:28:24 +08:00
乐仪
eb3853160d version -> 1.6.4
edit CHANGELOG.md
2016-07-08 11:48:01 +08:00
ddcat1115
ec33b62005 Merge pull request #2283 from ddcat1115/fix-unknown-props-for-tag
fix #2258 for `Tag` `BackTop`
2016-07-08 11:15:14 +08:00
ddcat1115
e4d49da87c Merge pull request #2298 from ddcat1115/fix-2258-transfer
fix #2258 for `Transfer`
2016-07-08 10:33:01 +08:00
ddcat1115
54d02d32c9 Merge pull request #2297 from ddcat1115/fix-2258-spin
fix #2258 for `Spin` `Badge`
2016-07-08 10:32:24 +08:00
ddcat1115
93ce98062b fix #2258 for BackTop Tag 2016-07-08 10:30:12 +08:00
ddcat1115
af29df4238 Merge pull request #2231 from ddcat1115/BackTop-fix
修复BackTop隐藏时无动画的问题
2016-07-08 10:20:44 +08:00
ddcat1115
47230e4a32 fix #2258 for transfer 2016-07-08 10:16:58 +08:00
ddcat1115
fe4dfa05b0 fix #2258 for Badge Spin 2016-07-08 10:14:45 +08:00
afc163
60f658c8ea fix test case 2016-07-07 23:01:43 +08:00
yiminghe
94706f1d2c fix ts 2016-07-07 20:25:03 +08:00
yiminghe
38d4031987 Merge pull request #2246 from GrayChoi/master
rewrite in typescript
2016-07-07 20:09:09 +08:00
afc163
4ecb639863 Improve transfer clear icon style 2016-07-07 18:45:14 +08:00
afc163
08311314ee Fix a Transfer perfermance issue of repeat render (#2112) 2016-07-07 18:42:59 +08:00
afc163
2b9c07a741 simplify Transfer search logic and fix search bugs (#2260) 2016-07-07 18:36:53 +08:00
afc163
8bf0a7e7f7 update demo 2016-07-07 18:09:17 +08:00
afc163
90f499f0a9 do not clear selected item when search in Transfer
close #2290
2016-07-07 18:07:48 +08:00
afc163
1fb723abe7 downgrade some deps 2016-07-07 17:31:55 +08:00
afc163
d68d42f69b Merge 1.x-stable 2016-07-07 17:26:16 +08:00
yiminghe
c667144943 fix form warning
Conflicts:
	components/cascader/index.jsx
	components/form/index.jsx
2016-07-07 17:23:51 +08:00
yiminghe
3d9ae9833e fix form warning 2016-07-07 16:59:47 +08:00
afc163
842b55128f Fix clear icon in RangePicker, close #2252 2016-07-07 16:28:00 +08:00
afc163
4b4a55b003 remove unused code 2016-07-07 15:42:00 +08:00
afc163
9ed2a5e803 Merge branch 'master' of github.com:ant-design/ant-design 2016-07-07 15:13:46 +08:00
afc163
487b40815f Merge 1.x-stable 2016-07-07 15:13:01 +08:00
yiminghe
2e9cb53d12 Merge pull request #2277 from rrandom/patch-2
typo in tooltip demo
2016-07-07 12:23:44 +08:00
yiminghe
8c7016c8f9 Merge pull request #2221 from RaoHai/rewriteCheckboxInTs
Rewrite Checkbox in typescript
2016-07-07 12:23:14 +08:00
afc163
e27d6c3097 Form react-unknown-prop (#2258) 2016-07-07 12:06:05 +08:00
afc163
d91a2d06df Merge branch 'ddcat1115-fix-2234' into 1.x-stable 2016-07-06 17:55:28 +08:00
afc163
b0c05e3f29 tweak style (#2234) 2016-07-06 17:54:05 +08:00
afc163
c0a3485ac2 Merge branch 'fix-2234' of https://github.com/ddcat1115/ant-design into ddcat1115-fix-2234 2016-07-06 17:42:53 +08:00