Commit Graph

946 Commits

Author SHA1 Message Date
afc163
24d2973c32 Merge branch "1.x-stable" 2016-08-16 17:54:59 +08:00
afc163
cfba6aa60e bump 1.9.1 2016-08-17 15:57:14 +08:00
乐仪
180916386e update CHANGELOG.md
update package.json -> 1.9.0
2016-08-15 19:01:52 +08:00
ddcat1115
a5585bff77 fix #2571 #2518 #2645 增加disabled属性及取消上传时cancel请求 (#2690)
* fix #2571 #2518  use rc-upload@2.x abort
fix #2645  add `disabled`

* fix
2016-08-14 15:20:00 +08:00
afc163
b200f8a2d8 Merge 1.x-stable 2016-08-08 14:12:02 +08:00
RaoHai
7f5bc38137 update changelog and version 2016-08-08 10:53:36 +08:00
afc163
0da1aeff75 Merge branch '1.x-stable' 2016-08-03 20:00:38 +08:00
Benjy Cui
7c7a365960 site: improve performance 2016-08-03 17:51:33 +08:00
Benjy Cui
7ea4dfa501 site: merge demos in one file 2016-08-03 14:39:55 +08:00
afc163
da6d511567 Merge branch '1.x-stable' 2016-08-02 12:03:11 +08:00
yiminghe
7edb997af0 upgrade tools 2016-08-01 12:52:34 +08:00
Benjy Cui
08edb25ecc deps: update bisheng 2016-08-01 10:22:31 +08:00
afc163
57f08259db Merge 1.x-stable 2016-07-30 14:36:49 +08:00
Benjy Cui
c3d1803839 bump 1.7.0 2016-07-30 09:59:47 +08:00
afc163
13bf08ffd7 update deploy script 2016-07-29 15:37:35 +08:00
Benjy Cui
e865f1fc84 site: fix react-router 2016-07-27 15:24:43 +08:00
Benjy Cui
edcbdad558 site: hack 2016-07-27 14:59:16 +08:00
Benjy Cui
6cac87fa17 site: upgrade bisheng 2016-07-26 18:01:11 +08:00
Benjy Cui
0d5b75429f site: upgrade bisheng 2016-07-26 15:24:48 +08:00
afc163
0eeca99f02 Merge 1.x-stable 2016-07-26 22:20:33 +08:00
然则
a7eea77637 up tree-select 2016-07-25 20:17:52 +08:00
Benjy Cui
5660948372 site: fix meaningless anchor 2016-07-25 11:38:15 +08:00
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
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
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