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.

Sign up for GitHub

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

Jump to bottom

chore: 🔀 merge master into feature #22517

Merged
merged 73 commits into from Mar 27, 2020
Merged

chore: 🔀 merge master into feature #22517

merged 73 commits into from Mar 27, 2020

Conversation

afc163
Copy link
Member

@afc163 afc163 commented Mar 23, 2020 •
edited

🤔 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
🇨🇳 Chinese

☑️ Self Check before Merge

⚠️ Please check all items below before review. ⚠️

  • 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

View rendered CHANGELOG.en-US.md
View rendered CHANGELOG.zh-CN.md
View rendered components/button/index.zh-CN.md
View rendered components/comment/demo/basic.md
View rendered components/config-provider/demo/size.md
View rendered components/form/demo/control-hooks.md
View rendered components/form/demo/form-context.md
View rendered components/form/demo/register.md
View rendered components/modal/index.en-US.md
View rendered components/page-header/index.en-US.md
View rendered components/page-header/index.zh-CN.md
View rendered components/progress/demo/dashboard.md
View rendered components/progress/demo/segment.md
View rendered components/progress/index.en-US.md
View rendered components/progress/index.zh-CN.md

zombieJ and others added 28 commits March 20, 2020 23:33
@zombieJ
fix: Table column group with controlled sorter (#22450)
9dbd41a 
* update interface

* support group sorterOrder controlled

* add test case

* fix test case
@afc163
Update index.en-US.md
5529774 
#15260
@afc163
♻️ remove SentryBoundary
c2ab9be
@afc163
fix: 🐛 empty disabled Button align issue (#22461)
4fcc6f6 
* chore: add .ant-tooltip-disabled-compatible-wrapper

* fix: empty button align issue
@afc163
docs: fix BackTop examples hidden
66e53fb 
close #22392
@zombieJ
fix: null value tooltip (#22482)
4e270e1
@zombieJ
docs: Update form demo (#22483)
d33784b
@zombieJ
fix config provider size (#22486)
1472513
@NaveenDA
Page Header's backIcon is also accept the boolean value (#22470)
a577600 
* Fix `backIcon` type in chinese page

* Page Header's `backIcon` is also accept the boolean value
@dolfje
Reduce unnecesary render with gutter={[7,9]} #22474 (#22475)
fd0038e
@Skn0tt
Address diverse users without gender assumption (#22464)
3dd2332 
Not all diverse users don't want to be addressed as "lady" - if they wanted to, they'd have put in "lady".
This commit fixes this potential offense and replaces it using a less specific "hi there".
@thisrabbit
fix: gapDegree=0 in Dashboard progress is now working (#22462)
0519111 
* fix: gapDegree=0 in Dashboard progress is now working

* update jest snapshot for Progress

* Add use case of gapDegree and test cases. Also doc error correction
@afc163
docs: 📖 TreeSelect switcherIcon doc (#22489)
dfb9f20 
close #22487
@afc163
docs: 📖 better form demo code naming style (#22490)
41e378a
@shaodahong
fix: Col without span prop should keep default (#22455)
d7e8fa2
@afc163
🆙 upgrade prettier
e744cf5
@zombieJ
docs: 4.0.4 changelog (#22505)
3459bfc 
* docs: Init changelog

* order

* grouping

* clean up
@yoyo837
update prettierrc (#22506)
2668deb
@indatawetrust @afc163
docs: Update basic.md (#22467)
011cac4 
* Update basic.md

* Update basic.md

Co-authored-by: 偏右 <afc163@gmail.com>
@afc163
refactor: import react-slick instead of require (#22507)
e2a9ab4 
* refactor: import react-slick instead of require

close #22501

* Update index.tsx
@xrkffgg
fix: progress rtl style (#22509)
641f5c7 
* fix: progress rtl style

* fix: remove !
@zombieJ
docs: Update changelog
7dd1ae0
@zombieJ
chore: Update test all script
517e753
@afc163
Update index.zh-CN.md
154d733
@zombieJ
chore: Test case add more delay
136859a
@zombieJ
chore: Update test all script
a0309f0
@afc163
✅ improve tooltip test case
cd7ae8e
@afc163
merge feature into master-to-merge-feature
e12e297
@afc163 afc163 requested a review from zombieJ as a code owner March 23, 2020 07:03
zombieJ and others added 19 commits March 25, 2020 12:12
@zombieJ
docs: Update dropdownMatchSelectWidth doc desc
75a10e3
@zombieJ
docs: Remove dropdownMenuStyle of Select doc
ee78492
@xrkffgg
style: add select dropdown group RTL padding (#22584)
95ae1ce
@afc163
🐛 Fix Alert cannot work with Tooltip (#22594)
b4da5cb 
close #22579
@afc163
docs: 📖 collaborator guide
5e8cef7
@slavakam
move @form-item-label-height from form styles to theme variables (#22600
fbdfd4a 
)
@zombieJ
fix: Input with suffix align issue (#22603)
e95603b 
* fix: Input prefix style

* update snapshot

* fix int
@xrkffgg
fix: select rtl clear icon (#22596)
67f0308
@xrkffgg
style: optimize slider inner (#22627)
d497c11
@xrkffgg
docs: optimize slider demo (#22626)
7abe924
@xrkffgg
docs: optimize avatar demo (#22631)
fd11de5
@afc163
🔨 action to push mirror repo (#22582)
f45afd1
@afc163
chore: ✨ update mirror.yml
d80f219
@zombieJ
chore: Update snapshot
9316f18
@zombieJ
fix: Table nest style (#22643)
0fa8e4c
@xrkffgg
style: optimize timeline rtl style (#22652)
cc6cde1
@xrkffgg
style: optimize input rtl syle (#22624)
7d9480a
@irudoy
fix: package.json import for webpack@5 compatibility (#22644)
c6fc503
@xrkffgg
style: optimize tabs rtl (#22653)
d0a45dc
@zombieJ
Copy link
Member

zombieJ commented Mar 27, 2020 •
edited

@zombieJ dist 构建报错了。

1.4.0 是错的，1.4.1 是修好的。这个没错。es 包都应该是 es module。

ref: https://unpkg.com/browse/rc-table@7.3.13/es/Table.js

@zombieJ
Copy link
Member

zombieJ commented Mar 27, 2020

要看看为什么 rc-picker 不行

@afc163 afc163 mentioned this pull request Mar 27, 2020
Merged
14 tasks
@zombieJ zombieJ merged commit a9d6307 into feature Mar 27, 2020
@zombieJ zombieJ deleted the master-to-merge-feature branch March 27, 2020 05:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@tests-checker tests-checker[bot] tests-checker requested changes

@yoyo837 yoyo837 yoyo837 approved these changes

@zombieJ zombieJ Awaiting requested review from zombieJ

Assignees

@zombieJ zombieJ

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet