chore: merge master into feature #25829
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* docs: Update DatePicker docs and add legacy notice * clean up * only warning for QuarterPicker * update docs * fix lint * note to warning
for Alert/message/notification
* fix: Table getCheckboxProps indeterminate not working * feat: Table warn when set halfChecked using getCheckboxProps * chore: rename expand-chidren.md to tree-data.md
* refactor: avatar code * fix: Fix Avatar fallback bug close #25801 * add blank * update demo
chore: merge feature into master
…ponent (#25823) * Adds de_DE localisation for defaultValidateMessages for Form Component * add de_DE localisation for default form validation messages
yoyo837
approved these changes
Jul 27, 2020
|
按道理应该先把 master 同步到 feature 后，再合并回 master。 |
|
|
|
|
我是打算这么做的，现在 feature 那边的 CI 挂的有点多。我在发版之前肯定还是要同步回 master 的 |
fireairforce
approved these changes
Jul 27, 2020
|
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 fbc10c4:
|
Codecov Report
@@ Coverage Diff @@
## feature #25829 +/- ##
========================================
Coverage 99.52% 99.52%
========================================
Files 374 374
Lines 7292 7300 +8
Branches 1988 1989 +1
========================================
+ Hits 7257 7265 +8
Misses 35 35
Continue to review full report at Codecov.
|
|
master 和 feature 之间的合并记得不能用 squash merge。 |
|
OK，用的是普通的 merge |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
[中文版模板 / Chinese template]
🤔 This is a ...
🔗 Related issue link
💡 Background and solution
Feature branch ci failed
📝 Changelog
☑️ Self Check before Merge
View rendered components/avatar/demo/fallback.md
View rendered components/cascader/index.en-US.md
View rendered components/cascader/index.zh-CN.md
View rendered components/date-picker/demo/disabled.md
View rendered components/date-picker/index.en-US.md
View rendered components/date-picker/index.zh-CN.md
View rendered components/form/demo/time-related-controls.md
View rendered components/input/demo/align.md