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 to v4 #3666

Merged
merged 70 commits into from
Mar 5, 2019
Merged

feat: merge master to v4 #3666

merged 70 commits into from
Mar 5, 2019

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
chenshuai2144 and others added 24 commits February 19, 2019 12:10
* Added document title to UserLayout by identifying the current route object and using its name kaey to set the title

* Adjusment to document title

* feat: use same getPageTile function
* fix PageHeader no title bug

* default value
Use Umi Permission Routing
* dead code
Close: #3637

* delete dead props
* enhance LoadMore: Debounce

* enhance LoadMore: debounce

* use Tag instead of div

* rewrite margin-right of Tag

* hide LoadMore in NoticeList without onLoadMore

* another style

* fix a mistake

* remove local config

* fix a bug

* user-select: none

* remover local config

* replace global/fetchMoreNotices with global/fetchNotices

* replace LoadMore with ViewMore

* remove prop `name` in NoticeIcon

* fix: tab title does not show correct text
@netlify
Copy link

netlify bot commented Mar 5, 2019

Deploy preview for ant-design-pro ready!

Built with commit 0eac3e1

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

@chenshuai2144 chenshuai2144 merged commit e0b20cb into v4 Mar 5, 2019
@delete-merged-branch delete-merged-branch bot deleted the feat/mergemastertov4new branch March 5, 2019 06:30
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.