然则
|
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 |
|
陆离
|
49e164d09d
|
docs: translation of Spin and Slider (#2378)
|
2016-07-21 09:51:04 +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
|
12b531efb3
|
Merge pull request #2416 from RaoHai/improvementOfDatePicker
DatePicker 组件优化
|
2016-07-20 11:17:35 +08:00 |
|
yiminghe
|
6158b39335
|
Merge pull request #2259 from RaoHai/MentionComponent
Mention Component
|
2016-07-20 11:17:19 +08:00 |
|
afc163
|
ea61aa3cab
|
upload code style
|
2016-07-19 20:28:56 +08:00 |
|
yiminghe
|
b140856836
|
add class
|
2016-07-19 19:08:59 +08:00 |
|
RaoHai
|
8c739abeb5
|
style lint
|
2016-07-19 16:00:19 +08:00 |
|
RaoHai
|
7dd4a019d5
|
DatePicker 组件优化
+ DatePicker showTime: 面板上的日期展示输入框统一为一个,格式和外面的输入框同步,并且支持手动修改。
面板上的 TimePicker
+ DatePicker showTime: 输入框不再展示,改造为『选择时间』,点击后不再展开浮层,直接盖住日期区域。
+ RangePicker showTime : 只选中开始日期,“确定”和“选择时间”灰置。 如未选择日期直接选择时间,开始日期和结束日期默认选中当天。
+ RangePicker showTime : 点击框外和确定均为确定操作。
+ RangePicker showTime : 在时间页面,开始时间的默认状态为当前时间,结束时间的默认状态跟随开始时间。
+ RangePicker showTime : 开始时间的选择范围没有限制,结束时间的选择范围必须大于等于开始时间。
+ RangePicker showTime : 当开始时间选择了结束时间之后的时间(发生冲突),结束时间则自动切换到与开始时间相同的时间。
|
2016-07-19 16:00:19 +08:00 |
|
yiminghe
|
3342aae9f3
|
upgrade
|
2016-07-19 15:46:00 +08:00 |
|