Commit Graph

6728 Commits

Author SHA1 Message Date
afc163
b8c64f8b6c Merge branch 'master' of github.com:ant-design/ant-design 2016-07-26 22:30:40 +08:00
afc163
0eeca99f02 Merge 1.x-stable 2016-07-26 22:20:33 +08:00
ddcat1115
479c15bb58 docs: progress-translation (#2499) 2016-07-26 15:42:04 +08:00
Benjy Cui
0d5b75429f site: upgrade bisheng 2016-07-26 15:24:48 +08:00
Vincent Zhang
abecc44d38 fix improper prop 'dataSource' change in Table; close #2501 (#2503) 2016-07-26 14:17:41 +08:00
afc163
f4b10a9e7c Fix string rowKey in Table, close #2500
ref #2058
2016-07-26 21:14:13 +08:00
afc163
f862655df5 Merge branch '1.x-stable' of github.com:ant-design/ant-design into 1.x-stable 2016-07-26 19:47:53 +08:00
afc163
75da5a358a fix some site style 2016-07-26 19:45:55 +08:00
lixiaochou077
039b064529 docs: translation timepicker (#2491) 2016-07-26 11:03:44 +08:00
ddcat1115
87a159b18f docs: Switch-translation (#2489) 2016-07-26 09:17:46 +08:00
然则
a7eea77637 up tree-select 2016-07-25 20:17:52 +08:00
afc163
a5eb044d5c update BackTop doc 2016-07-25 19:37:23 +08:00
afc163
47d273669d Merge branch '1.x-stable' of github.com:ant-design/ant-design into 1.x-stable 2016-07-25 19:31:12 +08:00
afc163
3a2fbf9815 modify BackTop chinese name 2016-07-25 19:28:52 +08:00
Benjy Cui
331b2fdf73 chore: fix 2016-07-25 17:54:09 +08:00
陆离
552fa228ee feat: AutoComplete (#2490) 2016-07-25 17:46:45 +08:00
陆离
ac32dd5811 feat: debounce before spinning => debounce after spinning (#2486) 2016-07-25 16:35:00 +08:00
陆离
0f6a8e2ff7 feat: debounce before spinning => debounce after spinning (#2486) 2016-07-25 16:31:59 +08:00
Benjy Cui
11660c128b docs: update demo, close: #1872 2016-07-25 16:08:18 +08:00
afc163
ca57794ae7 better implement for a2804cb 2016-07-25 14:03:56 +08:00
warmhug
408027b95d add tree's tips 2016-07-25 12:15:59 +08:00
warmhug
bc5f5d5ba4 add tree's tips 2016-07-25 12:08:43 +08:00
afc163
964b46d876 Merge branch '1.x-stable' of github.com:ant-design/ant-design into 1.x-stable 2016-07-25 11:58:29 +08:00
afc163
5ec1a99dd4 fix transition 2016-07-25 11:57:37 +08:00
afc163
f3f952e40f fix tslint 2016-07-25 11:39:54 +08:00
Benjy Cui
5660948372 site: fix meaningless anchor 2016-07-25 11:38:15 +08:00
afc163
81db618964 Merge branch 'master' of github.com:ant-design/ant-design 2016-07-25 11:36:12 +08:00
afc163
7a52a6fafe Fix context types 2016-07-25 11:35:51 +08:00
Benjy Cui
2dffa172a4 site: fix meaningless anchor 2016-07-25 11:30:42 +08:00
afc163
3543cdc1cf Merge branch 'master' of github.com:ant-design/ant-design 2016-07-25 11:28:56 +08:00
ddcat1115
a396e3779a Ts rewrite popconfirm (#2472)
* Popconfirm rewrite

* fix`
2016-07-25 11:28:43 +08:00
afc163
45c0a6e38f blank line 2016-07-25 11:28:19 +08:00
afc163
e8507341f6 Fix site hash link error 2016-07-24 17:32:02 +08:00
afc163
e0c0830a04 Fix TimelineItem custom color, close #2479 2016-07-24 16:19:46 +08:00
陆离
f5725e3c89 fix issues in #2441 (#2460) 2016-07-24 15:21:07 +08:00
yeliex
f12bbdfdd0 修复了select组件placeholder溢出的问题 (#2480) 2016-07-24 15:15:13 +08:00
afc163
7d0c8329ba Merge branch '1.x-stable' 2016-07-24 15:08:04 +08:00
afc163
1b001c7672 Merge 1.x-stable 2016-07-24 15:07:50 +08:00
afc163
4ea8f4ea07 upgrade devDeps version 2016-07-24 14:53:09 +08:00
然则
77b0952e36 fix #2393 #2459 #2401
Conflicts:
	package.json
2016-07-24 14:26:19 +08:00
afc163
d24bee4250 Merge branch 'ddcat1115-fix-2414' into 1.x-stable 2016-07-24 14:24:05 +08:00
afc163
5c52c21435 inline menu does not highlight selected sub-menu 2016-07-24 14:23:41 +08:00
afc163
57446f8331 Merge branch 'fix-2414' of https://github.com/ddcat1115/ant-design into ddcat1115-fix-2414 2016-07-24 14:11:10 +08:00
afc163
9a1346a69d update rc-util 2016-07-24 13:55:13 +08:00
afc163
32ab285886 Merge branch '1.x-stable' 2016-07-24 13:49:42 +08:00
afc163
011e9f8ce0 fix site style 2016-07-23 18:15:06 +08:00
Benjy Cui
969d705aa5 deps: update bisheng-plugin-react 2016-07-23 16:53:06 +08:00
ddcat1115
79ef6a0664 fix #2414 2016-07-22 18:42:47 +08:00
afc163
2face80716 Click todayButton should trigger onChange, close #1902 2016-07-22 16:14:50 +08:00
afc163
1a1ed29717 Add switch :active style 2016-07-22 14:23:59 +08:00