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: merge master update to v4 branch #3640

Closed
wants to merge 65 commits into from
Closed

Conversation

yutingzhao1991
Copy link
Contributor

No description provided.

xiaohuoni and others added 30 commits January 17, 2019 14:40
* Close: #3398

* error authority is undefined
* feat: add new config "layoutLocal"

* Use enableLayoutLocale instead of layoutLocale

* Use enableMenuLocale instead of enableMenuLocale

* use menu.disableLocal
* try fix test error

* try fix ci error in windows
Error parsing a meta element's content: ';' is not a valid key-value pair separator. Please use ',' instead.
* Set up CI with Azure Pipelines
* remove PureComponent

* fix typo
* prettier html

* update dependencies

* centering icon

* set icon size

* edit text
* Removed redundant colon - zh-CN

* Removed redundant colon - zh-TW

* Removed redundant colon - en-US
…3381)

* fix: horizontal scroll bar appears on SiderMenu with light navTheme

* a better solution
* fix tag error

* Move flags to badges in README
* style: prettier SiderMenu.js

* new config file
* feat: support pwa config

* style: change code style
)

* add actionsText prop to TagSelect, add locales to List page

* add actionsText prop to TagSelect, add locales to List page
* fix customize menu icon bug

当采用自定义菜单图标(即通过url引用方式)且菜单折叠时,文字不隐藏

* fix customize menu icon bug

修改样式
* feat: add a demo that jump to details

* feat: hide progress in coi

* remove trigger config

* remove fetchDepth: 1

* refactor: userinfo and application  from api

* style: fix code style
@netlify
Copy link

netlify bot commented Mar 1, 2019

Deploy preview for ant-design-pro ready!

Built with commit d61b32a

https://deploy-preview-3640--ant-design-pro.netlify.com

@xiaohuoni
Copy link
Member

👍

@xiaohuoni
Copy link
Member

这个可以合并了吗?

@yutingzhao1991
Copy link
Contributor Author

@chenshuai2144 看一下

image

Codacy/PR Quality Revie 这个质量检测好像和我们的 lint 规则冲突了,要求双引号...

@afc163
Copy link
Member

afc163 commented Mar 1, 2019

Codacy 关了好了

@chenshuai2144
Copy link
Collaborator

好像混进去了所有 commit

@yutingzhao1991
Copy link
Contributor Author

new PR #3666

@yutingzhao1991 yutingzhao1991 deleted the feat/mergemastertov4 branch March 5, 2019 06:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.