Commit Graph

7115 Commits

Author SHA1 Message Date
afc163
d441c815a9 fix snapshots 2018-07-20 18:17:18 +08:00
afc163
cc00ebe5e1 Change Transfer moving buttons order for convention
close #11269
2018-07-20 18:15:04 +08:00
afc163
76741d026f Merge branch 'master' into feature-3.8.0 2018-07-20 18:03:23 +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
zombiej
2ad0bc0395 close #11380. Fix desciption of auto complete 2018-07-20 17:02:52 +08:00
zombiej
bfd0a77781 Merge remote-tracking branch 'origin/master' into feature-3.8.0 2018-07-20 14:06:21 +08:00
afc163
e2b9e5d832 update warning message 2018-07-20 12:10:43 +08:00
zombiej
ecc2293229 fix #11368. Clean outline style of treeSelect 2018-07-20 11:03:02 +08:00
zombiej
ed7630053e fix #11366. action trigger expand also trigger the onExpand 2018-07-20 10:50:20 +08:00
Leo Yin
96d8fc45f1 Fix edit-row.md 2018-07-19 11:28:44 +08:00
रोहन मल्होत्रा
12b99970f3 Migrated to new lifecycle method for datepiceker (#10309)
…picker

First of all, thank you for your contribution! :-)

Please makes sure that these checkboxes are checked before submitting your PR, thank you!

* [x] Make sure that you propose PR to right branch: bugfix for `master`, feature for latest active branch `feature-x.x`.
* [x] Make sure that you follow antd's [code convention](https://github.com/ant-design/ant-design/wiki/Code-convention-for-antd).
* [x] Run `npm run lint` and fix those errors before submitting in order to keep consistent code style.
* [x] Rebase before creating a PR to keep commit history clear.
* [x] Add some descriptions and refer relative issues for you PR.

Extra checklist:

**if** *isBugFix* **:**

no
**elif** *isNewFeature* **:**

#9792
2018-07-19 11:26:47 +08:00
Bryan Berger
1d924300e7 add @message-notice-content-padding var to <Message /> 2018-07-18 22:17:12 +08:00
baozefeng
825d770254 bugfix: Chinese doc website date-picker demo link go to English website 2018-07-18 20:07:22 +08:00
afc163
782abe7bb6 demo: fix select showSearch demo placeholder, close #11325 2018-07-18 15:57:34 +08:00
陈帅
e7242f4924 fix #11307 Prop destroyOnClose prevents the closing animation of drawer 2018-07-18 15:53:06 +08:00
Wang Riwu
a2c4b03d45 add notification.open to API docs (#11281) 2018-07-18 14:55:47 +08:00
Daniel Zhang
308cb046e4 Add onMouseEnter and onMouseLeave to SelectProps (#11314) 2018-07-18 00:06:27 +08:00
Wei Zhu
c696757793 Revert "fix test"
This reverts commit f1570c01ea.

Follow f1570c01ea
2018-07-17 22:22:16 +08:00
Wei Zhu
e6c4c6667d Revert rc-menu upgrade
Revert "use default hover trigger for horizontal menu demo"

This reverts commit 159b09342d.

Revert "upgrade menu@7.2.0"

This reverts commit d4c9a1deea.

Revert "feat: prevent horizontal menu items wrapping"

This reverts commit 5c7f9feecb.
2018-07-17 21:59:16 +08:00
Eager Wei
9c792d52a8 fix table onChange pagination type (#11291)
Update interface.tsx TableProps onChange
2018-07-17 17:56:24 +08:00
陈帅
705e57f7e8 change drawer z-index to @zindex-modal 2018-07-17 17:34:20 +08:00
afc163
57c072d1b8 Fix dark menu small style issue, close #11299 2018-07-17 15:29:23 +08:00
afc163
2cacfe78ea Fix switch overflow in certain situation, close #9928 2018-07-16 19:47:28 +08:00
afc163
152cae4d9f Fix Card tabs disable attribute, close #11212 2018-07-16 19:18:50 +08:00
tangjinzhou
14e0cc0161 fix: anchorLink href update 2018-07-16 17:31:32 +08:00
Wei Zhu
d2c34e32a1 fix: uniform divider font-size
close #11227
2018-07-16 16:48:42 +08:00
nuintun
8496e8f687 Popconfirm support customize icon 2018-07-16 15:34:24 +08:00
Hanz Luo
11f0f14cb2 Remove scrollbar on confirm Modal title 2018-07-16 10:44:14 +08:00
付引
31b2517261 mport -> import 2018-07-15 12:54:23 +08:00
陈帅
1f15df4f14 Merge branch 'feature-3.7.0' 2018-07-15 09:27:34 +08:00
picodoth
159b09342d use default hover trigger for horizontal menu demo 2018-07-15 08:41:06 +08:00
david.lv
6fe9ca201e Update index.less
spell check 'compatibile'->'compatible'
2018-07-14 23:45:35 +08:00
picodoth
f1570c01ea fix test 2018-07-14 13:05:36 +08:00
picodoth
5c7f9feecb feat: prevent horizontal menu items wrapping 2018-07-14 13:05:36 +08:00
陈帅
125d0df3e0 Merge branch 'master' into feature-3.7.0 2018-07-14 12:15:00 +08:00
陈帅
0ee58eb3d4 lint:fix eslint error 2018-07-13 22:23:12 +08:00
陈帅
2cffe4f858 optimization: Fix problems found in review 2018-07-13 22:23:12 +08:00
陈帅
9ad0114102 fix eslint error 2018-07-13 22:23:12 +08:00
陈帅
01f2dee77b up rc-drawer version 2018-07-13 22:23:12 +08:00
陈帅
dba4b8c3c9 use context to implement multiple drawers 2018-07-13 22:23:12 +08:00
陈帅
441b90e488 Fix the naming problem 2018-07-13 22:23:12 +08:00
陈帅
50271732b1 add multi-level-drawer 2018-07-13 22:23:12 +08:00
陈帅
06d5ff6bbe up rc-drawer vesion to 1.5.1 2018-07-13 22:23:12 +08:00
陈帅
007c8dfc91 delete toogerHotjar function 2018-07-13 22:23:12 +08:00
陈帅
c8217e0bad Fixing style errors caused by too low height 2018-07-13 22:23:12 +08:00
陈帅
78e8ab55b5 adjust demos 2018-07-13 22:23:12 +08:00
陈帅
0f2be7308b Modify documents and adjust demos 2018-07-13 22:23:12 +08:00
陈帅
b91a367b4f Modify drawer description 2018-07-13 22:23:12 +08:00
陈帅
cc59ef4cbf In accordance with design patterns 2018-07-13 22:23:12 +08:00
陈帅
186e69cea3 edit new doc 2018-07-13 22:23:12 +08:00
陈帅
0f22cd69c3 test support react15 2018-07-13 22:23:12 +08:00
陈帅
2e3d131d74 update snapshots 2018-07-13 22:23:12 +08:00
陈帅
c863b2d758 fix drawer lint 2018-07-13 22:23:12 +08:00
陈帅
65e73c5f3b edit test script 2018-07-13 22:23:12 +08:00
陈帅
ce4624c69a edit test script 2018-07-13 22:23:12 +08:00
陈帅
510dad58bf edit doc and dom 2018-07-13 22:23:12 +08:00
陈帅
1f25b1042b delete some test 2018-07-13 22:23:12 +08:00
陈帅
115f518985 add 100% test 2018-07-13 22:23:12 +08:00
陈帅
172759177f perfect drawer doc 2018-07-13 22:23:12 +08:00
陈帅
e8394eca6f add drawer test 2018-07-13 22:23:12 +08:00
陈帅
d2856392b6 fix site build error 2018-07-13 22:23:12 +08:00
qixian.cs@outlook.com
9e12476f68 Optimize code and documentation 2018-07-13 22:23:12 +08:00
picodoth
1f3d6584ff update en docs 2018-07-13 22:23:12 +08:00
jim
7801f2459c change null to undefined 2018-07-13 22:23:12 +08:00
jim
68da7f2078 delete util import 2018-07-13 22:23:12 +08:00
jim
306389273a Improve documentation 2018-07-13 22:23:12 +08:00
jim
73674f53c3 change rc-drawer-meun to rc-drawer 2018-07-13 22:23:12 +08:00
jim
bc76ae51ac add two demo 2018-07-13 22:23:12 +08:00
jim
7757926666 Perfect api 2018-07-13 22:23:12 +08:00
jim
af5cde61d1 canonical style 2018-07-13 22:23:12 +08:00
jim
fee00e3841 add open animation 2018-07-13 22:23:12 +08:00
jim
86655c0ebc update test snap 2018-07-13 22:23:12 +08:00
jim
de5b89a612 remove top and bottom less 2018-07-13 22:23:12 +08:00
jim
8c3386f00c remove handle and fix typo 2018-07-13 22:23:12 +08:00
jim
61a7731270 simple demo 2018-07-13 22:23:12 +08:00
jim
cbbe4035e2 add bodyStyle api 2018-07-13 22:23:12 +08:00
jim
42de00137f change api doc 2018-07-13 22:23:12 +08:00
jim
13393d8987 add doc 2018-07-13 22:23:12 +08:00
afc163
e1e6523452 Fix border radius when avatar has custom size 2018-07-13 10:36:01 +08:00
Wei Zhu
c380186e79 fix: table custom components not change 2018-07-12 16:42:15 +08:00
afc163
0e3b67e999 Fix Timeline dot not working with Tooltip, close #11250 2018-07-12 11:35:50 +08:00
afc163
0b50a75093 update snapshot 2018-07-11 23:35:02 +08:00
afc163
db4a5edf8e correct typo: filedNames => fieldNames 2018-07-11 23:35:02 +08:00
afc163
8eb8c686ce Merge branch 'master' into feature-3.7.0 2018-07-11 22:21:01 +08:00
afc163
00afce3a4b Improve design of RangePicker presets link 2018-07-11 20:09:58 +08:00
Zhiqiang Gong
722b24b813 add disabled prop (#11188)
First of all, thank you for your contribution! :-)

Please makes sure that these checkboxes are checked before submitting your PR, thank you!

* [x] Make sure that you propose PR to right branch: bugfix for `master`, feature for latest active branch `feature-x.x`.
* [x] Make sure that you follow antd's [code convention](https://github.com/ant-design/ant-design/wiki/Code-convention-for-antd).
* [x] Run `npm run lint` and fix those errors before submitting in order to keep consistent code style.
* [x] Rebase before creating a PR to keep commit history clear.
* [x] Add some descriptions and refer relative issues for you PR.

Extra checklist:

**if** *isBugFix* **:**

  * [x] Make sure that you add at least one unit test for the bug which you had fixed.

**elif** *isNewFeature* **:**

  * [ ] Update API docs for the component.
  * [ ] Update/Add demo to demonstrate new feature.
  * [ ] Update TypeScript definition for the component.
  * [ ] Add unit tests for the feature.

tslint检测时报错
类型“IntrinsicAttributes & IntrinsicClassAttributes<Tree> & Readonly<{ children?: ReactNode; }> & Read...”上不存在属性“disabled”。
2018-07-11 19:39:41 +08:00
Wei Zhu
2d5949f31d test: use render for snapshot 2018-07-11 19:35:57 +08:00
Wei Zhu
4b045fc43f Revert "docs: update moment locale usage"
This reverts commit 89228118af.

The original purpose to import locale from src is that some projects
adding `jsnext:main` to the `resolve.mainFields` config of webpack which leads
webpack load moment from `src/moment.js`. But import from `locale`
should works for most projects.
2018-07-11 15:17:15 +08:00
mofelee
e3ef74c3e7 fix "Cannot find module './locale'" bug 2018-07-11 14:39:06 +08:00
Wei Zhu
47884320ef docs: remove only 2018-07-11 10:36:24 +08:00
Wei Zhu
af49a1806b docs: rewrite editable demo 2018-07-10 21:11:50 +08:00
陈帅
b3f4e5e3da bugfix: fixed #11152 silder trigger no white theme 2018-07-10 21:06:22 +08:00
Daewoong Moon
52d736a0ee Added missing ko_KR locale 2018-07-10 20:58:30 +08:00
zhenbao.xy
779abfaf9f fix the relation between @alert-text-color & @text-color 2018-07-10 20:58:12 +08:00
Wei Zhu
435558b63e fix: Layout.Sider string width
Close #11211
2018-07-10 12:29:20 +08:00
zhuyue
77af31da7d Merge branch master into feature-3.7.0 2018-07-10 11:49:57 +08:00
zombiej
903f3f6770 fix test case in react 15 2018-07-04 20:23:46 +08:00
afc163
6d7ac58550 Fix header overflow style of empty table in Firefox, close #11135 2018-07-04 12:09:28 +08:00
afc163
0c4d356e54 Merge branch 'master' into feature-3.7.0 2018-07-03 19:54:48 +08:00
afc163
cde8bc8361 Selected value in Cascader should be gray when focus search input 2018-07-03 15:46:12 +08:00
afc163
4aabc53744 Fix InputNumber handler background
https://gw.alipayobjects.com/zos/rmsportal/QDxJpiArMgQJCLhmVvEZ.png
2018-07-03 15:35:56 +08:00
afc163
60ebb434c1 Fix form controls align issue in IE11
close #9827
close #11133
2018-07-03 14:04:46 +08:00
Wei Zhu
d4c95e6f18 docs: remove obsolete snapshot and fix custom filter demo 2018-07-02 21:41:14 +08:00
愚道
004561ba1f fix style in range select 2018-07-02 19:51:58 +08:00
愚道
450a3142ee fix: fix datepicker selected item style, close #9529 2018-07-02 19:51:58 +08:00
Wei Zhu
0f2fea2d78 docs: rewrite custom filter demo with filterDropdown function 2018-07-02 19:42:27 +08:00
Wei Zhu
1af4392ae9 feat: filterIcon can be a function 2018-07-02 19:42:27 +08:00
Christian Vadalà
59cc3a8b6c feat: adds ability to override filter renderer without migrate to a fully controlled component 2018-07-02 19:42:27 +08:00
zombiej
fb96c9db35 update treeSelect doc 2018-07-02 12:27:16 +08:00
afc163
a516358298 Fix wired Transfer repaint problem in IE or Edge
close #9697

https://stackoverflow.com/q/27947912/3040605
2018-06-30 22:22:09 +08:00
afc163
a3e245731b code style 2018-06-30 21:56:41 +08:00
afc163
553901dfb8 Fix card background overflow when zoom in chrome, close #9085 2018-06-30 21:13:22 +08:00
afc163
7d038d1aee revert 4d5d3c142e 2018-06-30 19:05:09 +08:00
Aditya Padhi
fcc055b390 Update index.en-US.md
Updated to document by adding  a property "destroyInactivePanel" which lets the user know about it behavior.
2018-06-30 18:51:32 +08:00
afc163
763d32ac68 Fix tslint 2018-06-30 18:49:43 +08:00
Harshit Mehrotra
47621acb6c Fixed a typo
from was misspelled as form
2018-06-30 15:13:00 +08:00
zombiej
6ff7dd8fb9 close #10996. Update selectTree doc. 2018-06-29 17:22:40 +08:00
afc163
ddfe8ad48a Adapt Table sorter icon style to @font-size-base
https://gw.alipayobjects.com/zos/rmsportal/jKlytqFbAeMQGXaCYWdR.png

  =>

https://gw.alipayobjects.com/zos/rmsportal/InvEbivRsIcAQBuoEsJI.png
2018-06-29 15:33:57 +08:00
afc163
4d5d3c142e fix fileList in onChange when uid is 0, close #11089 2018-06-29 13:57:47 +08:00
zelongc
27c3093487 Typo fix in the upload component demo.
Change 'reponse' to 'response'.
2018-06-29 12:47:01 +08:00
afc163
d88a8f6920 docs: Add instruction about validateFields arguments, close #11084 2018-06-29 11:57:26 +08:00
Yury Kozyrev
cde2a6b6f0 Add missing showArrow option in types 2018-06-28 22:50:07 +08:00
zombiej
4cf18eaae8 update rc-tree-select to 2.0.1 2018-06-28 20:00:35 +08:00
zombiej
11dba9c305 update snapshot 2018-06-28 17:12:16 +08:00
afc163
3eee357bfb Add buttonStyle(outline|solid) for RadioGroup 2018-06-28 15:01:03 +08:00
afc163
f2e22e702e Merge branch 'master' into feature-3.7.0 2018-06-28 14:22:41 +08:00
afc163
c55fabc7b4 docs: improve radio API documentation 2018-06-28 14:18:23 +08:00
afc163
60e3cfa37a Add buttonStyle for RadioGroup 2018-06-28 14:01:05 +08:00
afc163
01233b15c5 Merge branch 'master' into feature-3.7.0 2018-06-27 20:33:47 +08:00
afc163
33c5d3b330 fix test 2018-06-27 20:33:32 +08:00
afc163
5554b75bc1 Merge branch 'master' into feature-3.7.0 2018-06-27 19:50:26 +08:00
afc163
0ea8047546 test: update table snapshots 2018-06-27 19:49:58 +08:00
afc163
817ee3e9e1 Merge branch 'master' into feature-3.7.0 2018-06-27 19:26:51 +08:00
afc163
1010a4fe19 test: update table snapshots 2018-06-27 18:57:04 +08:00
hanpei
63b4dc5157 Update index.zh-CN.md
个人认为
排版(typegraphy)和布局(layout)并不是一个概念,去掉排版二字,和前半句felx布局相一致
2018-06-27 17:52:05 +08:00
Tomáš Szabo
bf5b6ae1f3 Fix incompatible type error for Table[size] prop 2018-06-27 17:51:48 +08:00
涌谷(刘旭恒)
babbbdd4e5 Add custom local support in pagination component. 2018-06-27 16:18:59 +08:00
afc163
0981ef06a4 fix demo lint 2018-06-27 16:14:47 +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
afc163
e2b359e9c3 Move max-width to ant-tooltip
so that it can be override by overlayStyle.maxWidth
2018-06-27 11:26:19 +08:00
zombiej
0d09dbafdd close #11035. Adjust select mirror top css to avoid to long string 2018-06-26 14:52:48 +08:00
byzyk
1850699588 docs(collapse): add accordion, add bordered 2018-06-25 21:32:07 +08:00
afc163
c8a1442e38 Add event as second argument of onSearch
close #11015
2018-06-25 20:35:05 +08:00
Matt Lein
bcef7ca32e get data-*, aria-*, and role attributes 2018-06-25 16:53:04 +08:00
Matt Lein
77fcbca04d pass data-* aria-* and role props 2018-06-25 16:53:04 +08:00
Matt Lein
e63f9d4beb Pass data and aria props to the date picker input.
Pass data and aria props to the alert div.
add wrapProps to ModalProps
2018-06-25 16:53:04 +08:00
Matt Lein
f0b684de6a get data-*, aria-*, and role attributes 2018-06-25 16:53:04 +08:00
Matt Lein
20348614d5 Alert - pass data-* attributes to alert div 2018-06-25 16:53:04 +08:00
Wei Zhu
354cc7303e docs: remove combobox 2018-06-25 16:52:51 +08:00
Wei Zhu
6de4b00815 Rename mode name 2018-06-25 16:52:51 +08:00
Wei Zhu
5eaa03b4ea Update snapshot 2018-06-25 16:52:51 +08:00
Wei Zhu
53046a454a Deprecate combobox mode of Select 2018-06-25 16:52:51 +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
Wei Zhu
2d2aceb9d3 docs: document AutoComplete onFocus and onBlur 2018-06-24 17:05:19 +08:00
pbrink231
5302400e62 added onBlur & onFocus functions to properties (#10920)
These can be called just like onChange as a property in the autocomplete but are not documented right now.
2018-06-24 16:56:28 +08:00
愚指导
d11d44e413
Bump 3.6.4 and fix some lint issue. 2018-06-23 16:35:42 +08:00
愚道
653ec40b30 update test snapshot 2018-06-23 11:31:42 +08:00
afc163
fc224525da chore: demo doc format 2018-06-22 23:36:53 +08:00
afc163
71846acaa1 Fix Dropdown non-boolean attribute warning
ref #7798
2018-06-22 23:33:06 +08:00
afc163
9f16d066af Fix lint problems from eslint-config-airbnb@17 2018-06-22 21:05:13 +08:00
Randy
a614a525c4 fix #10822 (#10955)
Add `okButtonProps` and `cancelButtonProps` props to ok button and cancel button
2018-06-22 19:56:41 +08:00
afc163
7fc1483fe1 Fix style of RangePicker with preset ranges, close #10986 2018-06-22 12:13:25 +08:00
Thomas Billicsich
ff70654ffe Removed redundant dot accesses in example
The `current` variable is defined on the top of the method.
2018-06-22 10:27:27 +08:00
Wei Zhu
3fb478e743 Update Tree types 2018-06-21 14:38:44 +08:00
muzea
126bb42ddd remove deprecated prop 2018-06-21 13:49:00 +08:00
muzea
2ce3ffd6f4 fix punctuation 2018-06-21 13:49:00 +08:00
muzea
904fd0a358 form add how to get wrappedComponent's ref 2018-06-21 13:49:00 +08:00
afc163
68a110afa3 should use primary color for steps 2018-06-20 20:51:24 +08:00
zombiej
ac9368298f miss ? for TreeNode className prop 2018-06-20 17:41:12 +08:00
zombiej
17da353575 close #10950. Add className in TreeNode prop 2018-06-20 09:47:24 +08:00
Wei Zhu
b7879e909f docs: use title instead of key
Address #10949
2018-06-19 17:30:06 +08:00
afc163
e7fa6ca7eb Merge branch 'master' into feature-3.7.0 2018-06-19 15:31:53 +08:00
afc163
7fe027bfcf fix stylelint problem 2018-06-19 15:30:20 +08:00
afc163
8e8b991ba7 demo: fix table rowKey warning 2018-06-19 10:37:37 +08:00
afc163
b1d60f5ce1 Fix filterIcon className of Table, close #10937 2018-06-19 10:26:44 +08:00
愚道
5903fdb19f fix: Affix does not refix on offset prop changes 2018-06-19 10:04:15 +08:00
Wei Zhu
5ab265a009 Fix small size fixed column table border
Close #9754
2018-06-15 17:40:32 +08:00
afc163
c540ceb8eb Fix fixed element in spin
close #10196
2018-06-15 14:09:51 +08:00
sliwey
450a497412 fix: upload preview can't show image when the image file use uppercase extension
1.fix: upload preview can't show image when the image file use uppercase extension.
	2.improve: remove unnecessary escape character.
2018-06-15 13:52:14 +08:00
afc163
4bf9114ee9 Merge branch 'master' into feature-3.7.0 2018-06-15 11:32:11 +08:00
afc163
a9c8998aea Merge branch 'feature-3.7.0' of github.com:ant-design/ant-design into feature-3.7.0 2018-06-15 11:31:53 +08:00
Wei Zhu
c96805254f More tests 2018-06-15 11:14:15 +08:00
Wei Zhu
7958860c95 Add snapshot 2018-06-15 11:14:15 +08:00
Wei Zhu
1c2385de98 Add polyfill 2018-06-15 11:14:15 +08:00
Wei Zhu
4ac0277813 Add Tag[visible] 2018-06-15 11:14:15 +08:00
ryannz
a5ff8e5de0 fix(AutoComplete): add missing backfill prop in type 2018-06-15 10:29:12 +08:00
hehe
07e06709f8 docs: fix typo 2018-06-15 10:25:17 +08:00
Zheeeng
980e2b1427 Update button signature (#10877) 2018-06-14 10:53:14 +08:00
afc163
713a0bcdc5 update snapshot 2018-06-13 20:21:52 +08:00
afc163
37ec04b21a Fix InputNumber style when zoom to 90% or below
close #10562
2018-06-13 17:31:26 +08:00
afc163
c403bd9738 Merge branch 'feature-3.7.0' of github.com:ant-design/ant-design into feature-3.7.0 2018-06-13 11:05:55 +08:00
zombiej
16e42601d6 auto position mode when contextMenu 2018-06-12 22:07:02 +08:00
afc163
637f30e6e3 Merge branch 'master' into feature-3.7.0 2018-06-12 19:38:30 +08:00
afc163
b3ed289904 chore: fix arrow position in Firefox 2018-06-12 16:27:46 +08:00
afc163
fd96967c87 upgrade rc-upload to 2.5
- support `directory` close #7315
- action can be a function return Promise
2018-06-12 16:07:06 +08:00
afc163
99d6e4c96c Merge branch 'master' into feature-3.7.0 2018-06-12 15:34:51 +08:00
Zheeeng
f36c6195b8 Fix typo (#10878)
First of all, thank you for your contribution! :-)

Please makes sure that these checkboxes are checked before submitting your PR, thank you!

* [x] Make sure that you propose PR to right branch: bugfix for `master`, feature for latest active branch `feature-x.x`.
* [x] Make sure that you follow antd's [code convention](https://github.com/ant-design/ant-design/wiki/Code-convention-for-antd).
* [x] Run `npm run lint` and fix those errors before submitting in order to keep consistent code style.
* [x] Rebase before creating a PR to keep commit history clear.
* [ ] Add some descriptions and refer relative issues for you PR.

Extra checklist:

**if** *isBugFix* **:**

  * [ ] Make sure that you add at least one unit test for the bug which you had fixed.

**elif** *isNewFeature* **:**

  * [ ] Update API docs for the component.
  * [ ] Update/Add demo to demonstrate new feature.
  * [ ] Update TypeScript definition for the component.
  * [ ] Add unit tests for the feature.
2018-06-12 14:36:08 +08:00
Sebastian Busch
ee0a7ce3bb Form: add missing type definition for form create option validateMessages
(Docs for validateMessages had been added in rev 16133aac65 )
2018-06-12 14:32:08 +08:00