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

[BD-46] sync alpha branch with master #2204

Merged
merged 33 commits into from
Apr 21, 2023

Conversation

viktorrusakov
Copy link
Contributor

Description

Include a description of your changes here, along with a link to any relevant Jira tickets and/or Github issues.

Deploy Preview

Include a direct link to your changes in this PR's deploy preview here (e.g., a specific component page).

Merge Checklist

  • If your update includes visual changes, have they been reviewed by a designer? Send them a link to the Netlify deploy preview, if applicable.
  • Does your change adhere to the documented style conventions?
  • Do any prop types have missing descriptions in the Props API tables in the documentation site (check deploy preview)?
  • Were your changes tested using all available themes (see theme switcher in the header of the deploy preview, under the "Settings" icon)?
  • Were your changes tested in the example app?
  • Is there adequate test coverage for your changes?
  • Consider whether this change needs to reviewed/QA'ed for accessibility (a11y). If so, please add wittjeff and adamstankiewicz as reviewers on this PR.

Post-merge Checklist

  • Verify your changes were released to NPM at the expected version.
  • If you'd like, share your contribution in #show-and-tell.
  • 🎉 🙌 Celebrate! Thanks for your contribution.

keithgg and others added 30 commits March 24, 2023 14:46
* feat: add icon size xs that looks good against a 1rem font
* feat: icons now support sizing

The Button component makes use of this new sizing rather
than modifying the classes directly.
* feat: create new ColorPicker component

* fix: PWG review changes
@openedx-webhooks openedx-webhooks added the blended PR is managed through 2U's blended developmnt program label Apr 21, 2023
@openedx-webhooks
Copy link

Thanks for the pull request, @viktorrusakov!

When this pull request is ready, tag your edX technical lead.

@codecov
Copy link

codecov bot commented Apr 21, 2023

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 90.94%. Comparing base (4fbe4ac) to head (8ed7630).
Report is 1025 commits behind head on alpha.

Additional details and impacted files
@@            Coverage Diff             @@
##            alpha    #2204      +/-   ##
==========================================
+ Coverage   90.76%   90.94%   +0.17%     
==========================================
  Files         213      214       +1     
  Lines        3499     3522      +23     
  Branches      843      851       +8     
==========================================
+ Hits         3176     3203      +27     
+ Misses        315      311       -4     
  Partials        8        8              

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@viktorrusakov viktorrusakov merged commit 2252eb5 into alpha Apr 21, 2023
@viktorrusakov viktorrusakov deleted the rusakov/sync-alpha-with-master branch April 21, 2023 09:40
@openedx-webhooks
Copy link

@viktorrusakov 🎉 Your pull request was merged! Please take a moment to answer a two question survey so we can improve your experience in the future.

@viktorrusakov viktorrusakov linked an issue Apr 21, 2023 that may be closed by this pull request
@edx-semantic-release
Copy link
Contributor

🎉 This PR is included in version 21.0.0-alpha.19 🎉

The release is available on:

Your semantic-release bot 📦🚀

@edx-semantic-release
Copy link
Contributor

🎉 This PR is included in version 20.30.2 🎉

The release is available on:

Your semantic-release bot 📦🚀

@edx-semantic-release
Copy link
Contributor

🎉 This PR is included in version 22.0.0-alpha.1 🎉

The release is available on:

Your semantic-release bot 📦🚀

@openedx-semantic-release-bot

🎉 This PR is included in version 23.0.0-alpha.1 🎉

The release is available on:

Your semantic-release bot 📦🚀

PKulkoRaccoonGang pushed a commit that referenced this pull request Aug 1, 2024
PKulkoRaccoonGang pushed a commit that referenced this pull request Aug 4, 2024
PKulkoRaccoonGang pushed a commit that referenced this pull request Aug 5, 2024
@openedx-semantic-release-bot

🎉 This PR is included in version 23.0.0 🎉

The release is available on:

Your semantic-release bot 📦🚀

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
blended PR is managed through 2U's blended developmnt program released on @alpha released
Projects
No open projects
Status: Done
Development

Successfully merging this pull request may close these issues.

Resolve conflict between master and alpha
8 participants