You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

tangjinzhou da0f17d1b6 Merge remote-tracking branch 'origin/master' into feat-1.4.0 ... # Conflicts: # components/affix/index.jsx # components/alert/index.jsx # components/back-top/index.jsx # components/carousel/index.jsx # components/cascader/index.jsx # components/comment/index.jsx # components/config-provider/index.jsx # components/divider/index.jsx # components/drawer/index.jsx # components/form/Form.jsx # components/input-number/index.jsx # components/menu/index.jsx # components/modal/confirm.js # components/modal/index.js # components/popconfirm/index.jsx # components/popover/index.jsx # components/rate/index.jsx # components/steps/index.jsx # components/switch/index.jsx # components/time-picker/index.jsx # components/tree-select/index.jsx # site/components.js		5 years ago
..
__tests__	fix: update icon focusable="false" #924	5 years ago
demo	docs: update upload demo #753	6 years ago
style	feat: update transfer	6 years ago
Dragger.jsx	style: lint add semi and prettier	6 years ago
Upload.jsx	feat: merge master	5 years ago
UploadList.jsx	feat: merge master	6 years ago
index.en-US.md	feat: add reject event for not drop not accept files to upload	6 years ago
index.jsx	chore: add base.vue inconsistent vue version	5 years ago
index.zh-CN.md	feat: add reject event for not drop not accept files to upload	6 years ago
interface.jsx	feat: update upload	6 years ago
utils.jsx	style: lint add semi and prettier	6 years ago