chore: resolve conflicts between main and next #416
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
Co-authored-by: Leonardo Di Vittorio <leonardo.divittorio@Leonardos-MacBook-Pro.local>
### [1.32.2](v1.32.1...v1.32.2) (2023-08-17) ### Bug Fixes * add border secondary ([#355](#355)) ([75243ec](75243ec))
* feat: add breadcrumbs component * feat: add a11y properites --------- Co-authored-by: Leonardo Di Vittorio <leonardo.divittorio@Leonardos-MacBook-Pro.local>
## [1.33.0](v1.32.2...v1.33.0) (2023-08-18) ### Features * add breadcrumbs component ([#353](#353)) ([ed82e05](ed82e05))
* fix: add Open Sans font to storybook * feat: add variants of tag component in Tag and SelectList (#354) * feat: add variants of tag component, resolve comments --------- Co-authored-by: Yurii Pavlovskyi <yurii.pavlovskyi@free-now.com>
* refactor: migrate Datepicker to popper positioning engine * build: remove react-tether dependency * chore: remove unnecessary prop types and use useState directly
### [1.34.1](v1.34.0...v1.34.1) (2023-09-29) ### Bug Fixes * **input:** add aria-invalid when an input has an error ([#379](#379)) ([ec26782](ec26782))
* chore(deps): move @testing-library/react-hooks to devDependencies * fix(deps): override @types/react of react-windowed-select to ^17.0.67 * chore(deps): pin @types/react overrides --------- Co-authored-by: Artur Miglio <arturmiglio@gmail.com>
### [1.34.2](v1.34.1...v1.34.2) (2023-10-05) ### Bug Fixes * **deps:** crossOrigin prop is not required for inputs ([#386](#386)) ([b9e7217](b9e7217))
* fix: enhanced breadcrumbs style * fix: linting error 0 unit --------- Co-authored-by: Leonardo Di Vittorio <leonardo.divittorio@Leonardos-MacBook-Pro.local>
### [1.34.3](v1.34.2...v1.34.3) (2023-10-11) ### Bug Fixes * enhanced breadcrumbs style ([#390](#390)) ([e364381](e364381))
### [1.34.4](v1.34.3...v1.34.4) (2023-11-03) ### Bug Fixes * **infobanner:** allow to override attrs in InfoBannerCard ([#393](#393)) ([8b1457e](8b1457e))
martimalek
requested review from
nlopin,
div-Leo and
jonotrujillo
as code owners
nlopin
approved these changes
Feb 2, 2024
|
🎉 This PR is included in version 2.1.0 🎉 The release is available on: Your semantic-release bot 📦🚀 |
|
🎉 This PR is included in version 1.34.4 🎉 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
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.
What
Resolve conflicts between next and main
Why
To be able to merge next into main to have the 2.x.x in the main branch
How
Merge main into next and resolve conflicts 😅