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 feature into master #27488

Merged
merged 29 commits into from
Nov 2, 2020
Merged

chore: merge feature into master #27488

merged 29 commits into from
Nov 2, 2020

Commits on Oct 12, 2020

  1. feat: Input.Textarea support size props (#27110) 

    * feat: Input.Textarea add size props

* update snapshot

* update snapshot

* add case

* fix code
    @fireairforce
    fireairforce committed Oct 12, 2020
    Configuration menu
    Copy the full SHA
    e6cc000 View commit details
    Browse the repository at this point in the history

Commits on Oct 13, 2020

  1. merge feature

    @afc163
    afc163 committed Oct 13, 2020
    Configuration menu
    Copy the full SHA
    288f0ca View commit details
    Browse the repository at this point in the history

  2. Merge pull request #27122 from ant-design/master-to-merge-feature 

    chore: merge 4.7.0 release to feature
    @afc163
    afc163 committed Oct 13, 2020
    Configuration menu
    Copy the full SHA
    1123666 View commit details
    Browse the repository at this point in the history

Commits on Oct 14, 2020

  1. Merge pull request #27137 from ant-design/master 

    chore: merge master into feature
    @afc163
    afc163 committed Oct 14, 2020
    Configuration menu
    Copy the full SHA
    2788140 View commit details
    Browse the repository at this point in the history

Commits on Oct 15, 2020

  1. feat: 🖼 Image support preview.getContainer (#26713)

    @rfreling
    rfreling committed Oct 15, 2020
    Configuration menu
    Copy the full SHA
    7d59890 View commit details
    Browse the repository at this point in the history

Commits on Oct 21, 2020

  1. Merge branch 'feature' into merge-into-feature

    @hengkx
    hengkx committed Oct 21, 2020
    Configuration menu
    Copy the full SHA
    1f1956c View commit details
    Browse the repository at this point in the history

  2. fix conflict

    @hengkx
    hengkx committed Oct 21, 2020
    Configuration menu
    Copy the full SHA
    605bb2f View commit details
    Browse the repository at this point in the history

  3. update snap

    @hengkx
    hengkx committed Oct 21, 2020
    Configuration menu
    Copy the full SHA
    4cd2cfa View commit details
    Browse the repository at this point in the history

  4. Merge pull request #27275 from ant-design/merge-into-feature 

    chore: merge master into feature
    @afc163
    afc163 committed Oct 21, 2020
    Configuration menu
    Copy the full SHA
    bcc05fc View commit details
    Browse the repository at this point in the history

Commits on Oct 22, 2020

  1. feat: Modal method add bodyStyle (#27292)

    @hengkx
    hengkx committed Oct 22, 2020
    Configuration menu
    Copy the full SHA
    b969bb4 View commit details
    Browse the repository at this point in the history

  2. docs: image fear add version (#27291)

    @hengkx
    hengkx committed Oct 22, 2020
    Configuration menu
    Copy the full SHA
    5e1665d View commit details
    Browse the repository at this point in the history

  3. docs(Modal): add version (#27300)

    @hengkx
    hengkx committed Oct 22, 2020
    Configuration menu
    Copy the full SHA
    888e28f View commit details
    Browse the repository at this point in the history

Commits on Oct 23, 2020

  1. feat: add loading prop for Statistic (#26811) 

    * feat: add loading prop for Statistic

* feat: update statistic demo

* feat: add style dependency

* feat: replace loading component

* feat: update doc of statistic

* fix loading type

* feat: add loading prop for Statistic

* feat: update statistic demo

* update api version

Co-authored-by: lvpansen <pansen.lv@atzuche.com>
    @appleshell
    appleshell and lvpansen committed Oct 23, 2020
    Configuration menu
    Copy the full SHA
    b4c6740 View commit details
    Browse the repository at this point in the history

Commits on Oct 24, 2020

  1. feat: ConfigProvider add form requiredMark (#27322) 

    * feat: ConfigProvider add form requiredMark

* Update Form.tsx
    @hengkx
    hengkx committed Oct 24, 2020
    Configuration menu
    Copy the full SHA
    7e782da View commit details
    Browse the repository at this point in the history

  2. feat: modal.update() supports functional updating (#27162) (#27163) 

    * feat: modal.update() supports functional updating (#27162)

* docs: add version tip for modal.update() api
    @Mongkii
    Mongkii committed Oct 24, 2020
    Configuration menu
    Copy the full SHA
    ab4aeca View commit details
    Browse the repository at this point in the history

  3. Merge branch 'feature' into merge

    @hengkx
    hengkx committed Oct 24, 2020
    Configuration menu
    Copy the full SHA
    7be4339 View commit details
    Browse the repository at this point in the history

  4. fix: snap

    @hengkx
    hengkx committed Oct 24, 2020
    Configuration menu
    Copy the full SHA
    af6d8f7 View commit details
    Browse the repository at this point in the history

  5. Merge pull request #27349 from ant-design/merge 

    chore: merge master into feature
    @hengkx
    hengkx committed Oct 24, 2020
    Configuration menu
    Copy the full SHA
    bae5509 View commit details
    Browse the repository at this point in the history

  6. feat: Avatar.Group add size props (#27348) 

    * feat: Avatar.Group add size props

* change type
    @hengkx
    hengkx committed Oct 24, 2020
    Configuration menu
    Copy the full SHA
    6b1d73b View commit details
    Browse the repository at this point in the history

Commits on Oct 26, 2020

  1. chore: Adjust collapse arrow position align with first line (#27363) 

    * fix: border style of Input.Search when allowClear (#27325)

* fix: border style of Input.Search when allowClear

* fix css

* update

* change name

* docs: 4.7.3 changelog (#27350)

* docs: 4.7.3 changelog

* docs: Patch 27325

* chore: improve useCombinedRefs (#27352)

* docs: 📝 update introduce

* chore: fix API table border

* chore: Adjust collapse arrow position align with first line

Co-authored-by: xrk <xrkffgg@gmail.com>
Co-authored-by: Tom Xu <ycxzhkx@gmail.com>
Co-authored-by: afc163 <afc163@gmail.com>
    @zombieJ @xrkffgg
    @hengkx @afc163
    4 people committed Oct 26, 2020
    1 Configuration menu
    Copy the full SHA
    c373710 View commit details
    Browse the repository at this point in the history

  2. feat: Table summary support align (#27365)

    @zombieJ
    zombieJ committed Oct 26, 2020
    Configuration menu
    Copy the full SHA
    23f8cce View commit details
    Browse the repository at this point in the history

Commits on Oct 27, 2020

  1. Merge pull request #27388 from ant-design/master 

    chore: merge master into featrue
    @afc163
    afc163 committed Oct 27, 2020
    Configuration menu
    Copy the full SHA
    6880bf7 View commit details
    Browse the repository at this point in the history

Commits on Oct 28, 2020

  1. feat: components used in confirm title and content support prefixCls (#… 

    …27376)
    @Chersquwn
    Chersquwn committed Oct 28, 2020
    Configuration menu
    Copy the full SHA
    7c0e888 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #27421 from shaodahong/merge-to-feature 

    chore: merge master to feature
    @shaodahong
    shaodahong committed Oct 28, 2020
    Configuration menu
    Copy the full SHA
    4ec9e23 View commit details
    Browse the repository at this point in the history

Commits on Oct 30, 2020

  1. chore: feature merge master

    @zombieJ
    zombieJ committed Oct 30, 2020
    Configuration menu
    Copy the full SHA
    0bf5a43 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #27477 from ant-design/feature-merge-master 

    chore: Feature merge master
    @zombieJ
    zombieJ committed Oct 30, 2020
    Configuration menu
    Copy the full SHA
    f6f3166 View commit details
    Browse the repository at this point in the history

  3. feat: Row support wrap (#27469) 

    * feat: Support noWrap

* test: update snapshot

* fix: Miss check

* test: fix snapshot

* refactor: rename to wrap

* update snapshot
    @zombieJ
    zombieJ committed Oct 30, 2020
    Configuration menu
    Copy the full SHA
    d052543 View commit details
    Browse the repository at this point in the history

Commits on Oct 31, 2020

  1. feat: support Image element prop for Avatar component (#27448) 

    * feat: support Image element prop for Avatar component

* feat: reuse src prop instead of new image prop

* fix: update snapshot

* fix: re-update snapshots with latest dependencies
    @headwindz
    headwindz committed Oct 31, 2020
    Configuration menu
    Copy the full SHA
    0afb8de View commit details
    Browse the repository at this point in the history

Commits on Nov 2, 2020

  1. Merge branch 'master' into chore-conflict-feature

    信鑫-King committed Nov 2, 2020
    Configuration menu
    Copy the full SHA
    39c192a View commit details
    Browse the repository at this point in the history