Commit Graph

923 Commits

Author SHA1 Message Date
Benjy Cui
2dffa172a4 site: fix meaningless anchor 2016-07-25 11:30:42 +08:00
陆离
f5725e3c89 fix issues in #2441 (#2460) 2016-07-24 15:21:07 +08:00
afc163
1b001c7672 Merge 1.x-stable 2016-07-24 15:07:50 +08:00
然则
77b0952e36 fix #2393 #2459 #2401
Conflicts:
	package.json
2016-07-24 14:26:19 +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
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
Benjy Cui
8cb18090ba deps: update bisheng-plugin-react 2016-07-22 09:55:35 +08:00
afc163
a72d9ec381 Merge 2016-07-21 18:10:13 +08:00
ddcat1115
eba54529ca table-title style (#2452) 2016-07-21 15:14:42 +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
afc163
42d34a5db3 Merge branch '1.x-stable' 2016-07-21 14:34:37 +08:00
RaoHai
910d4ff111 version fix 2016-07-20 19:01:11 +08:00
RaoHai
1ccfad13f7 Mention Component fix
- 现在只输入一个 @ 符号,dropdown 也会弹出。
 - 输入框失去焦点后,dropdown 会消失。
 - 添加受控模式示例
 - 添加 `getMentions(editorState: EditorState): Array<String>` Api,
   可以获取当前提到的人。
 - 添加了校验样式
 - 其他样式修正
2016-07-20 19:01:11 +08:00
yiminghe
6158b39335 Merge pull request #2259 from RaoHai/MentionComponent
Mention Component
2016-07-20 11:17:19 +08:00
yiminghe
3342aae9f3 upgrade 2016-07-19 15:46:00 +08:00
RaoHai
3095f58be8 export toEditorState of Mention 2016-07-19 13:39:05 +08:00
RaoHai
3fe36f4584 export toString of Mention 2016-07-19 12:31:03 +08:00
afc163
e2cc2838fd Fix lesshint 2016-07-18 22:24:53 +08:00
RaoHai
69da207f3c support value props and controllred mode 2016-07-18 16:58:52 +08:00
RaoHai
aea176e045 rc-editor-mention version 2016-07-18 16:58:52 +08:00
RaoHai
01fabac77a Mention Component 2016-07-18 16:58:52 +08:00
afc163
9f008d8843 bump 1.6.5 2016-07-16 16:51:37 +08:00
afc163
900b9b2f99 update package.json 2016-07-13 12:22:34 +08:00
偏右
de359d2cf7 fix tslint problems (#2360) 2016-07-13 11:14:24 +08:00
yiminghe
df158ae502 upgrade antd-tools 2016-07-11 15:53:35 +08:00
afc163
6dad2b2987 Merge branch '1.x-stable' 2016-07-11 14:57:38 +08:00
afc163
cda5198207 upgrade devDeps 2016-07-09 18:10:11 +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
jiang
2a64384852 update rc-scroll-anim (#2322) 2016-07-08 17:33:25 +08:00
afc163
f675b636cd Merge 1.x-stable 2016-07-08 16:34:02 +08:00
乐仪
eb3853160d version -> 1.6.4
edit CHANGELOG.md
2016-07-08 11:48:01 +08:00
afc163
1fb723abe7 downgrade some deps 2016-07-07 17:31:55 +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
487b40815f Merge 1.x-stable 2016-07-07 15:13:01 +08:00
afc163
fd06ab940d upgrade rc-animate 2016-07-06 15:01:55 +08:00
afc163
7ba362f03c Fix react-unknown-prop warnings for Cascader,Input
ref #2258
2016-07-06 12:21:49 +08:00
afc163
e11b1ef694 remove duplicated normalize.css 2016-07-06 11:41:43 +08:00
afc163
d280cba481 Merge 1.x-stable 2016-07-04 15:19:35 +08:00
RaoHai
c3949bb9b1 v1.6.3 2016-07-04 10:43:29 +08:00
afc163
ce654fe282 disable jest temporarily 2016-06-28 22:15:53 +08:00
afc163
ef4c1a4749 Merge branch '1.x-stable' 2016-06-27 17:58:16 +08:00
afc163
faa6645983 1.6.2 2016-06-27 14:55:49 +08:00
afc163
a24634f3ec Merge 1.x-stable 2016-06-27 14:36:19 +08:00
afc163
8a0a947218 1.6.1 2016-06-24 17:50:01 +08:00
afc163
2ffa087aa1 Merge branch '1.x-stable' 2016-06-24 14:33:37 +08:00