Commit Graph

6130 Commits

Author SHA1 Message Date
afc163
d68d42f69b Merge 1.x-stable 2016-07-07 17:26:16 +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
842b55128f Fix clear icon in RangePicker, close #2252 2016-07-07 16:28:00 +08:00
afc163
4b4a55b003 remove unused code 2016-07-07 15:42:00 +08:00
afc163
9ed2a5e803 Merge branch 'master' of github.com:ant-design/ant-design 2016-07-07 15:13:46 +08:00
afc163
487b40815f Merge 1.x-stable 2016-07-07 15:13:01 +08:00
yiminghe
2e9cb53d12 Merge pull request #2277 from rrandom/patch-2
typo in tooltip demo
2016-07-07 12:23:44 +08:00
yiminghe
8c7016c8f9 Merge pull request #2221 from RaoHai/rewriteCheckboxInTs
Rewrite Checkbox in typescript
2016-07-07 12:23:14 +08:00
afc163
e27d6c3097 Form react-unknown-prop (#2258) 2016-07-07 12:06:05 +08:00
afc163
d91a2d06df Merge branch 'ddcat1115-fix-2234' into 1.x-stable 2016-07-06 17:55:28 +08:00
afc163
b0c05e3f29 tweak style (#2234) 2016-07-06 17:54:05 +08:00
afc163
c0a3485ac2 Merge branch 'fix-2234' of https://github.com/ddcat1115/ant-design into ddcat1115-fix-2234 2016-07-06 17:42:53 +08:00
afc163
b38f4368b3 Fix new Tab demo 2016-07-06 17:41:04 +08:00
afc163
fd06ab940d upgrade rc-animate 2016-07-06 15:01:55 +08:00
Rrrandom
fe92f4dc85 typo in tooltip demo 2016-07-06 14:00:09 +08:00
afc163
7ba362f03c Fix react-unknown-prop warnings for Cascader,Input
ref #2258
2016-07-06 12:21:49 +08:00
afc163
3af5f18f29 Fix menu z-index 2016-07-06 12:20:16 +08:00
afc163
e11b1ef694 remove duplicated normalize.css 2016-07-06 11:41:43 +08:00
ddcat1115
d93da30da2 fix #2234
1. 修复small size下沉1px的问题
2. 修复左右阴影被截断的问题
3. 修复有值时hover及focus样式丢失的问题
2016-07-06 11:34:50 +08:00
afc163
9dc47eeedb Fix steps tail overflow, close #2261 2016-07-05 17:49:48 +08:00
afc163
15f1826889 Merge branch '1.x-stable' 2016-07-05 15:59:56 +08:00
afc163
f5e98a617a fix duplicate document 2016-07-05 15:51:56 +08:00
afc163
aac35a8757 Merge branch '1.x-stable' 2016-07-05 15:49:36 +08:00
afc163
5109362b04 remove old docs about dataSource 2016-07-05 15:19:22 +08:00
afc163
b42f5efea3 Fix table fixed header align, close #2227 2016-07-05 14:41:21 +08:00
afc163
47a10a2deb update changelog 2016-07-05 14:20:11 +08:00
afc163
4e0956f3e3 should use assign in ts 2016-07-05 10:46:00 +08:00
afc163
d280cba481 Merge 1.x-stable 2016-07-04 15:19:35 +08:00
Benjy Cui
d9b4eb4aa3 fix: add missing ant-row 2016-07-04 15:18:05 +08:00
Benjy Cui
766988735b docs: update demo 2016-07-04 15:17:42 +08:00
afc163
1f0c26b25a Fix label colon with whitespace: label="xx: " 2016-07-04 14:39:20 +08:00
afc163
2780b100df Trigger Table onChange when selected filter items are changed, close #2228 2016-07-04 12:23:43 +08:00
Benjy Cui
0a73886a9c docs: update demo 2016-07-04 12:13:29 +08:00
afc163
09d00f1f30 Fix props warning, close #2253
https://fb.me/react-unknown-prop
2016-07-04 12:13:05 +08:00
Benjy Cui
df2f672dd9 fix: add missing ant-row 2016-07-04 11:29:56 +08:00
ddcat1115
6f526036ed docs: collapse-translation (#2216) 2016-07-04 10:51:50 +08:00
偏右
cdcc10f93d docs: translate Alert document to english (#1471) (#2210) 2016-07-04 10:49:26 +08:00
lixiaochou077
6a616de767 docs: add translation for timeline (#2190) 2016-07-04 10:49:04 +08:00
ddcat1115
1cec962d74 docs: Dropdown-translation (#2136) 2016-07-04 10:48:21 +08:00
Benjy Cui
0869e2959a docs: translate message 2016-07-04 10:44:55 +08:00
RaoHai
c3949bb9b1 v1.6.3 2016-07-04 10:43:29 +08:00
RaoHai
b66c9e95e3 v1.6.3 2016-07-04 10:41:24 +08:00
Gray Choi
3a36d65c5e rewrite in typescript
#1846

- [x] Carousel
- [x] Cascader
- [x] Transfer
- [x] Tree

-Tree
-checkable is boolean type, instead of assigning a ReactElement to it,
I use Ternary Operators.
2016-07-01 22:03:51 +09:00
Gray Choi
fb9a6963a3 rewrite in typescript
#1846

- [x] Carousel
- [x] Cascader
- [x] Transfer
- [x] Tree

-Tree
 -checkable is boolean type, instead of assigning a ReactElement to it,
I use Ternary Operators.
2016-07-01 21:52:17 +09:00
ddcat1115
30e1d4ed5b 修复BackTop隐藏时无动画的问题 2016-07-01 17:54:01 +08:00
RaoHai
18f35047ec Rewrite Checkbox in typescript
+ add return type of splitObject
 + rewrite `import React from 'react'` to `import * as React from 'react'`
 + rewrite Checkbox in typescript
2016-06-30 10:05:29 +08:00
Gray Choi
86ae2bda30 Merge remote-tracking branch 'ant-design/master' 2016-06-29 22:28:02 +09:00
afc163
049192b1cc fix tag doc 2016-06-29 18:24:02 +08:00
warmhug
b748b4ed7d correct display error 2016-06-29 18:22:05 +08:00