Commit Graph

251 Commits

Author SHA1 Message Date
afc163
b1a67de35e
Merge branch 'master' into feature
* master:
  📝 fix demo order
  Fixes #10576 (#13703)
  doc: update form & layout docs (#13701)
  update doc close #11802
  🐛 Fix Badge offset not working when count is ReactNode
2018-12-19 12:09:12 +08:00
huishiyi
dd30678033 doc: update form & layout docs (#13701)
* doc: remove duplicate setFields in form doc-US

* doc: fix layout doc collapsedWidth default
2018-12-19 10:56:44 +08:00
陈帅
8e11f0bdb9 merge support prettier 2018-12-07 20:02:01 +08:00
陈帅
dca9715186 support prettier 2018-12-07 18:27:30 +08:00
zombieJ
1a0a06fca9
ConfigProvider support prefixCls (#13389)
Basic support prefixCls.
2018-12-05 19:12:18 +08:00
zombiej
9f5d421cd6 merge master 2018-11-30 14:48:37 +08:00
afc163
83c192ea3e
💄 fix eslint problems 2018-11-28 15:11:02 +08:00
zombieJ
9b49fb60d9
Config provider (#12991)
close #12985
2018-11-26 12:06:42 +08:00
afc163
9b9c4c7dec fix typescript errors 2018-11-09 17:38:19 +08:00
afc163
213693e333 🌐 site: transition component category, close #11629 2018-11-04 16:20:35 +08:00
Charlie Guan
f4f0c34bc3 Update index.en-US.md
Fix typos, and provide minor grammar improvements.
2018-10-29 14:52:11 +08:00
Wei Zhu
9cfaf1750d fix: type error 2018-09-30 21:39:12 +08:00
Wei Zhu
40001d8220 Revert "fix: more types"
This reverts commit e063e1916d.
2018-09-30 21:29:14 +08:00
Wei Zhu
e063e1916d fix: more types 2018-09-30 16:39:51 +08:00
Wei Zhu
ee84f4ce0a fix: some type definitions 2018-09-30 16:07:01 +08:00
zombiej
176a8dfcda update test snapshot 2018-09-25 19:45:41 +08:00
Sepehr Mohammadi
e8c2e7ce72 fix firefox can't set height smaller than content on flex item (#12295)
https://stackoverflow.com/questions/28636832/firefox-overflow-y-not-working-with-nested-flexbox/28639686#28639686
2018-09-20 22:48:13 +08:00
HeskeyBaozi
976f6969f4 update test snapshot 2018-09-07 14:14:23 +08:00
HeskeyBaozi
2f8a56fa78 fix test case & update test snapshot 2018-09-02 20:59:37 +08:00
HeskeyBaozi
74798b8911 upgdate test snapshot 2018-09-02 20:59:37 +08:00
HeskeyBaozi
d6131fe18d update test snapshot 2018-09-02 20:59:37 +08:00
picodoth
f0bedb2176 fix: tests 2018-09-02 19:21:03 +08:00
HeskeyBaozi
0c9465aaf9 upgrade icons library 2018-08-27 20:40:11 +08:00
HeskeyBaozi
d9b38aee4b Merge branch 'feature-3.9.0' of https://github.com/ant-design/ant-design into feature/svg-icon
# Conflicts:
#	package.json
2018-08-25 13:24:44 +08:00
HeskeyBaozi
ee1d2469a8 upgrade test snapshot 2018-08-24 18:36:08 +08:00
Cang Ta
044982ddb7 Remove duplicate theme property 2018-08-23 16:09:37 +08:00
HeskeyBaozi
65600c8a95 upgrade to 3.8.2 2018-08-20 14:00:51 +08:00
HeskeyBaozi
796de6390b update test snapshot 2018-08-14 15:32:29 +08:00
HeskeyBaozi
35974d67b2 update test snap shot 2018-08-13 20:51:01 +08:00
HeskeyBaozi
3baec95628 Merge branch 'feature-3.9.0' of https://github.com/ant-design/ant-design into feature/svg-icon 2018-08-13 09:26:33 +08:00
张聪
8a9fbcb5e4 Migrate lifecycle method: Upload, CheckboxGroup, Layout.Sider, Tooltip, Popconfirm (#11682)
* Upload lifecycle method migrate

* CheckboxGroup lifecycle method migrate

* Layout.Sider lifecycle method migrate

* Tooltip lifecycle method migrate

* Popconfirm lifecycle method migrate

* test Spin as a controlled component
2018-08-10 17:04:40 +08:00
Wei Zhu
064bfaf554 Add @types/prop-types 2018-08-07 21:09:05 +08:00
HeskeyBaozi
6c42d711e8 Merge branch 'feature-3.8.0' of https://github.com/ant-design/ant-design into feature/svg-icon 2018-07-31 15:36:23 +08:00
Ilan Hasanov
8ee70e84b6 💬 update layout copyrights year and fix typos 2018-07-29 01:15:02 +08:00
HeskeyBaozi
768af40c4c Merge branch 'feature-3.8.0' of https://github.com/ant-design/ant-design into feature/svg-icon
# Conflicts:
#	components/drawer/__tests__/__snapshots__/Drawer.test.js.snap
#	components/drawer/__tests__/__snapshots__/DrawerEvent.test.js.snap
#	components/drawer/index.tsx
2018-07-25 12:03:00 +08:00
HeskeyBaozi
bab50e6bed Merge branch 'feature-3.8.0' of https://github.com/ant-design/ant-design into feature/svg-icon
# Conflicts:
#	components/locale-provider/__tests__/__snapshots__/demo.test.js.snap
#	components/locale-provider/__tests__/__snapshots__/index.test.js.snap
#	components/transfer/__tests__/__snapshots__/demo.test.js.snap
#	components/transfer/__tests__/__snapshots__/index.test.js.snap
2018-07-23 09:58:55 +08:00
jljsj33
881cef5abf update drawer 2018-07-22 11:55:46 +08:00
Fred-Shan
c045b79e62 Update index.zh-CN.md
there are two "theme" in the table
2018-07-20 17:38:33 +08:00
HeskeyBaozi
4a553a2006 upgrade test cases 2018-07-19 20:37:47 +08:00
HeskeyBaozi
8df086f022 update test cases 2018-07-18 13:39:02 +08:00
HeskeyBaozi
9338f33c1c update test cases 2018-07-18 10:33:54 +08:00
afc163
8eb8c686ce Merge branch 'master' into feature-3.7.0 2018-07-11 22:21:01 +08:00
陈帅
b3f4e5e3da bugfix: fixed #11152 silder trigger no white theme 2018-07-10 21:06:22 +08:00
Wei Zhu
435558b63e fix: Layout.Sider string width
Close #11211
2018-07-10 12:29:20 +08:00
afc163
56020cda39 Merge branch 'master' into feature-3.7.0 2018-06-27 16:14:14 +08:00
afc163
009ed08580 upgrade eslint-config-airbnb 2018-06-27 16:09:58 +08:00
Wei Zhu
b374297ca6 Merge branch 'master' into feature-3.7.0 2018-06-25 11:44:35 +08:00
Wei Zhu
aa580beb8b docs: sort api table 2018-06-24 17:09:18 +08:00
nuintun
ff24f1a978 Layout.Sider add onBreakpoint porp support (#10750)
* Layout.Sider add onBreakpoint porp support

* Add onBreakpoint zh-CN doc

* Add onBreakpoint en-US doc

* Add demo test for Layout.Sider onBreakpoint

* Add Layout.Sider onBreakpoint test cases
2018-06-03 13:03:20 +08:00
Junbin Huang
bbf5cb75c3
chore: update typescript@~2.9.1 (#10748) 2018-06-02 20:12:09 +08:00