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

feat: sync changes from v2 to alpha (🚨 CONFLICTS RESOLVED) #151

Merged
merged 1 commit into from
Dec 10, 2024

Conversation

giscegit
Copy link
Contributor

This PR syncs changes from the v2 branch to alpha.

🚨 BE CAREFUL BEFORE MERGING

There were conflicts that were automatically resolved using changes from base branch.

@mguellsegarra mguellsegarra merged commit 5c9bb34 into alpha Dec 10, 2024
1 check passed
@mguellsegarra mguellsegarra deleted the sync/v2-to-alpha-20241210-114303 branch December 10, 2024 11:45
github-actions bot pushed a commit that referenced this pull request Dec 10, 2024
# [2.22.0-alpha.2](v2.22.0-alpha.1...v2.22.0-alpha.2) (2024-12-10)

### Features

* sync changes from v2 to alpha ([#151](#151)) ([5c9bb34](5c9bb34))
github-actions bot pushed a commit that referenced this pull request Dec 10, 2024
# [2.23.0-alpha.1](v2.22.0...v2.23.0-alpha.1) (2024-12-10)

### Bug Fixes

* add isFunction prop to widgets ([a7ba02c](a7ba02c))
* add tests and adjust parseJsonAttributes in order to ignore the falsy ones like parseAttributes ([3c329cd](3c329cd))
* adjust bad conflict resolution ([f28fca5](f28fca5))
* adjust fallback widget type to field ([c540ea6](c540ea6))
* adjust height parsing ([dcd265b](dcd265b))
* field domain should have priority over fields ([460ba28](460ba28))
* revert changes ([08ad4b8](08ad4b8))

### Features

* add height to indicator ([0f77b8e](0f77b8e))
* add infinite attribute to trees ([c227efd](c227efd))
* add new tree test for autorefresh and add autorefreshFields property ([81ee897](81ee897))
* add test and add autorefreshable list in form ([91d2dd8](91d2dd8))
* **autorefresh:** set property as boolean ([70a6880](70a6880))
* **field:** add a new property autorefresh ([5f2cbcf](5f2cbcf))
* **field:** add new property fieldType to Field class ([0f3da71](0f3da71))
* **json:** add json field ([f0df547](f0df547))
* **parseBoolAttribute:** allow true as valid string ([9f7786a](9f7786a))
* sync changes from v2 to alpha ([8e8abe3](8e8abe3))
* sync changes from v2 to alpha ([#139](#139)) ([0f45c68](0f45c68))
* sync changes from v2 to alpha ([#142](#142)) [skip ci] ([822bfcb](822bfcb))
* sync changes from v2 to alpha ([#145](#145)) ([8591dd3](8591dd3))
* sync changes from v2 to alpha ([#151](#151)) ([5c9bb34](5c9bb34))
github-actions bot pushed a commit that referenced this pull request Dec 13, 2024
# [2.26.0-alpha.1](v2.25.0...v2.26.0-alpha.1) (2024-12-13)

### Bug Fixes

* add isFunction prop to widgets ([a7ba02c](a7ba02c))
* add tests and adjust parseJsonAttributes in order to ignore the falsy ones like parseAttributes ([3c329cd](3c329cd))
* adjust bad conflict resolution ([f28fca5](f28fca5))
* adjust fallback widget type to field ([c540ea6](c540ea6))
* adjust height parsing ([dcd265b](dcd265b))
* field domain should have priority over fields ([460ba28](460ba28))
* revert changes ([08ad4b8](08ad4b8))

### Features

* add height to indicator ([0f77b8e](0f77b8e))
* add infinite attribute to trees ([c227efd](c227efd))
* add new tree test for autorefresh and add autorefreshFields property ([81ee897](81ee897))
* add test and add autorefreshable list in form ([91d2dd8](91d2dd8))
* **autorefresh:** set property as boolean ([70a6880](70a6880))
* **field:** add a new property autorefresh ([5f2cbcf](5f2cbcf))
* **field:** add new property fieldType to Field class ([0f3da71](0f3da71))
* **field:** allow suffix and prefix ([774e3bf](774e3bf))
* **group:** add height ([c6cc73c](c6cc73c))
* **json:** add json field ([f0df547](f0df547))
* **parseBoolAttribute:** allow true as valid string ([9f7786a](9f7786a))
* sync changes from v2 to alpha ([8e8abe3](8e8abe3))
* sync changes from v2 to alpha ([#139](#139)) ([0f45c68](0f45c68))
* sync changes from v2 to alpha ([#142](#142)) [skip ci] ([822bfcb](822bfcb))
* sync changes from v2 to alpha ([#145](#145)) ([8591dd3](8591dd3))
* sync changes from v2 to alpha ([#151](#151)) ([5c9bb34](5c9bb34))
* sync changes from v2 to alpha ([#157](#157)) ([4af6d42](4af6d42))
* sync changes from v2 to alpha ([#159](#159)) [skip ci] ([d0b844c](d0b844c))
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants