feat: sync changes from v2 to alpha (🚨 CONFLICTS RESOLVED) #142
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
github-actions bot
pushed a commit
that referenced
this pull request
Dec 2, 2024
# [2.21.0-alpha.1](v2.20.0...v2.21.0-alpha.1) (2024-12-02) ### 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 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 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 ([#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))
github-actions bot
pushed a commit
that referenced
this pull request
Dec 10, 2024
# [2.22.0-alpha.1](v2.21.0...v2.22.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)) * move fieldType to widget when we use widgets as fields ([ab18d6a](ab18d6a)) * **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))
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))
github-actions bot
pushed a commit
that referenced
this pull request
Jan 23, 2025
# [2.28.0-alpha.1](v2.27.1...v2.28.0-alpha.1) (2025-01-23) ### 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)) * if json_attrs present don't use attrs parsing ([cf537cc](cf537cc)) * 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)) * **colorPicker:** add new component colorPicker ([01fe659](01fe659)) * **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)) * sync changes from v2 to alpha ([#162](#162)) [skip ci] ([289f815](289f815)) * sync changes from v2 to alpha ([#165](#165)) [skip ci] ([2bb247c](2bb247c))
github-actions bot
pushed a commit
that referenced
this pull request
Feb 6, 2025
# [2.29.0-alpha.1](v2.28.0...v2.29.0-alpha.1) (2025-02-06) ### 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)) * if json_attrs present don't use attrs parsing ([cf537cc](cf537cc)) * 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)) * **colorPicker:** add new component colorPicker ([01fe659](01fe659)) * **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)) * sync changes from v2 to alpha ([#162](#162)) [skip ci] ([289f815](289f815)) * sync changes from v2 to alpha ([#165](#165)) [skip ci] ([2bb247c](2bb247c)) * **Tag:** allow colorField to define color for tag ([1331063](1331063))
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.
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.