Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: upload add icon #20034

Merged
merged 28 commits into from Jan 3, 2020
Merged

feat: upload add icon #20034

merged 28 commits into from Jan 3, 2020

Conversation

crazyair
Copy link
Member

@crazyair crazyair commented Dec 2, 2019

🤔 This is a ...

  • New feature
  • Bug fix
  • Site / document update
  • Component style update
  • TypeScript definition update
  • Refactoring
  • Code style optimization
  • Test Case
  • Branch merge
  • Other (about what?)

🔗 Related issue link

💡 Background and solution

📝 Changelog

Language Changelog
🇺🇸 English Upload add custom icon
🇨🇳 Chinese Upload 添加自定义图标

☑️ Self Check before Merge

  • Doc is updated/provided or not needed
  • Demo is updated/provided or not needed
  • TypeScript definition is updated/provided or not needed
  • Changelog is provided or not needed

@netlify
Copy link

netlify bot commented Dec 2, 2019

Deploy preview for ant-design ready!

Built with commit 2fbaede

https://deploy-preview-20034--ant-design.netlify.com

@codesandbox-ci
Copy link

codesandbox-ci bot commented Dec 2, 2019

This pull request is automatically built and testable in CodeSandbox.

To see build info of the built libraries, click here or the icon next to each commit SHA.

Latest deployment of this branch, based on commit 2fbaede:

Sandbox Source
antd reproduction template Configuration

@afc163 afc163 added the 4.x In Ant Design 4.0 label Dec 2, 2019
@afc163 afc163 requested a review from zombieJ Dec 2, 2019
@afc163
Copy link
Member

afc163 commented Jan 3, 2020

conflict

@zombieJ
Copy link
Member

zombieJ commented Jan 3, 2020

Seems some extra file was re-formatted. Could you help to remove these change in this PR?

@crazyair
Copy link
Member Author

crazyair commented Jan 3, 2020

稍等,我在加 demo ,等会修复其他文件。

@crazyair crazyair requested a review from afc163 Jan 3, 2020
components/upload/UploadList.tsx Outdated Show resolved Hide resolved
@crazyair crazyair requested a review from zombieJ Jan 3, 2020
components/upload/UploadList.tsx Outdated Show resolved Hide resolved
@crazyair crazyair requested a review from zombieJ Jan 3, 2020
@zombieJ zombieJ merged commit 6c3d6e7 into ant-design:4.0-prepare Jan 3, 2020
Ant Design 4.0 Release Candidate automation moved this from In progress to Done Jan 3, 2020
@pr-triage pr-triage bot added the PR: merged label Jan 3, 2020
@yoyo837
Copy link
Contributor

yoyo837 commented Jan 3, 2020

第一版代码我就提过这个命名问题!还是直接合了!

@afc163
Copy link
Member

afc163 commented Jan 3, 2020

@yoyo837 什么问题?

@yoyo837
Copy link
Contributor

yoyo837 commented Jan 6, 2020

@afc163 记错,#19888 这个是关闭/未合入的。

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
4.x In Ant Design 4.0
Projects
No open projects
Development

Successfully merging this pull request may close these issues.

None yet

4 participants