Commit Graph

6199 Commits

Author SHA1 Message Date
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
Benjy Cui
8cb18090ba deps: update bisheng-plugin-react 2016-07-22 09:55:35 +08:00
afc163
2a54161e51 fix eslint 2016-07-21 21:19:37 +08:00
afc163
a2804cbff5 Make clear icon more clear 2016-07-21 20:57:44 +08:00
afc163
a72d9ec381 Merge 2016-07-21 18:10:13 +08:00
afc163
dd80613cd1 Merge branch '1.x-stable' of github.com:ant-design/ant-design into 1.x-stable 2016-07-21 18:08:35 +08:00
afc163
db00e94b40 fix links 2016-07-21 18:07:49 +08:00
afc163
a458de0a88 fix prefer-const 2016-07-21 18:05:15 +08:00
afc163
7e9838849b upgrade eslintrc 2016-07-21 17:33:18 +08:00
afc163
398b8ac708 typo 2016-07-21 15:53:33 +08:00
afc163
497cc1f65a improve FormItem colon (#2311) 2016-07-21 15:51:37 +08:00
afc163
a30f0090b9 update metion doc 2016-07-21 15:41:40 +08:00
afc163
57a34d8f5d fix metion styles 2016-07-21 15:40:13 +08:00
afc163
aa8e02326a update metion docs 2016-07-21 15:23:04 +08:00
afc163
92d127d8a5 Fix DatePicker style 2016-07-21 15:20:01 +08:00
ddcat1115
eba54529ca table-title style (#2452) 2016-07-21 15:14:42 +08:00
afc163
5eb52885d6 @background-color-base 2016-07-21 15:02:24 +08:00
afc163
1138b69c6d Merge branch 'master' of github.com:ant-design/ant-design 2016-07-21 14:40:11 +08:00
afc163
db4cbabf0c Merge 2016-07-21 14:39:28 +08:00
陆离
4ad8b2f96c Merge pull request #2441 from RaoHai/MentionComponent
Mention component fix
2016-07-21 14:37:29 +08:00
afc163
42d34a5db3 Merge branch '1.x-stable' 2016-07-21 14:34:37 +08:00
afc163
44b8f38a3c fix disabled menu item background 2016-07-21 14:30:37 +08:00
afc163
7aad78c508 improve progress style 2016-07-21 14:27:54 +08:00
afc163
54c7192d1e Update code style of Steps demos 2016-07-21 14:20:49 +08:00
afc163
a26c2e8888 Fix breadcrume style detail, close #2434 2016-07-21 11:48:56 +08:00
Benjy Cui
5bee7d2088 docs: fix translation 2016-07-21 10:15:00 +08:00
却痕
e202c7d2b3 docs: translation of Rate && Radio (#2440) 2016-07-21 10:10:04 +08:00
Leon Shi
3d070b8d85 docs: translate Cascader's documentation to English (#2433) 2016-07-21 10:09:01 +08:00
ddcat1115
2b20ac0456 docs: steps translation (#2430) 2016-07-21 10:07:30 +08:00
Gray Choi
b0bf2a5c0e docs: translate tree component (#2395) 2016-07-21 09:52:39 +08:00