Backmerge Main -> Patch #1938
Merged
Backmerge Main -> Patch #1938
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
fix: updated import paths for storybook components
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.
879f0da - Viraj Joshi - 2024-03-13 09:12:06
| Merge pull request fix: updated import paths for storybook components #1922 from brandonzalcman/menu-storybook
| fix: updated import paths for storybook components
5301ac0 - brandonzalcman - 2024-03-12 00:08:16
fix: updated import paths for storybook components
b8e6d34 - Viraj Joshi - 2024-03-13 09:07:40
|\ Merge pull request Revert "feat/toast-nativewind-examples" #1936 from gluestack/revert-1919-feat/toast-example-addition
| | Revert "feat/toast-nativewind-examples"
| * 8669107 - Viraj Joshi - 2024-03-13 09:07:25
|/ Revert "feat/toast-nativewind-examples"
|
d1032ba - Viraj Joshi - 2024-03-13 09:07:19
|\ Merge pull request feat/toast-nativewind-examples #1919 from gluestack/feat/toast-example-addition
| | feat/toast-nativewind-examples
| * 9ceb5b9 - Damini - 2024-03-08 16:35:27
| feat: add examples for toast nativewind component
|
cf44c88 - Suraj - 2024-03-12 19:08:51
| fix: merge confict resolved
|
e5fb735 - Suraj - 2024-03-12 18:58:03
| fix: merge confict resolved
|
0369a77 - Suraj - 2024-03-12 18:52:27
|\ fix: merge confict resolved
| |
| * 45274ea - Suraj Ahmed Choudhury - 2024-03-12 18:49:05
| |\ Merge pull request Fix/animation components #1935 from gluestack/fix/animation-components
| | | Fix/animation components
| | * 384303e - Suraj - 2024-03-12 18:48:25
| | |\ fix: modal playground fixes
| | |/
| |/|
| | |
| * | 8b4dbb1 - Suraj Ahmed Choudhury - 2024-03-12 15:16:30
| |\ \ Merge pull request fix/nativewind-and-style-docs #1934 from gluestack/fix/nativewind-and-style-docs
| | | | fix/nativewind-and-style-docs
| | * \ 4b9bce2 - Damini - 2024-03-12 15:12:52
| | |\ \ Merge branch 'patch' of https://github.com/gluestack/gluestack-ui into fix/nativewind-and-style-docs Merge branch 'patch' of https://github.com/gluestack/gluestack-ui into fix/nativewind-and-style-docs.
| | |/ /
| |/| |
| | | |
| * | | 8e1b743 - Suraj Ahmed Choudhury - 2024-03-12 15:09:46
| |\ \ \ Merge pull request fix: colormode issue for modal and popover #1933 from gluestack/fix/modal-popover
| | | | | fix: colormode issue for modal and popover
| | * \ \ b1aa6ad - Rajat Chaudhary - 2024-03-12 13:52:54
| | |\ \ \ fix: resolved merge conflict
| | |/ / /
| |/| | |
| | | | |
| | * | | 202731c - Rajat Chaudhary - 2024-03-12 13:37:52
| | / / fix: colormode issue for modal and popover
| | | |
| | * | 50d0f33 - Damini - 2024-03-12 15:12:18
| | / fix: nativewind and style docs
| | |
| | * 4ba0f72 - Suraj - 2024-03-12 18:47:13
| | | fix: modal docs
| | |
| | * e6d225b - Suraj - 2024-03-12 18:45:42
| | |\ Merge branch 'feat/modal-examples' of github.com:gluestack/gluestack-ui into fix/animation-components
| | | |
| | | * b71ded2 - Damini - 2024-03-06 12:45:16
| | | | fix: imports
| | | |
| | | * f9cc799 - Damini - 2024-03-06 11:45:43
| | | | fix: inports
| | | |
| | | * b200d16 - Damini - 2024-03-06 11:38:25
| | | | Merge branch 'patch' of https://github.com/gluestack/gluestack-ui into feat/modal-examples
| | | |
| | | * d96bd6d - Damini - 2024-03-04 11:36:19
| | | | fix: nativewind imports
| | | |
| | | * 235671c - Damini - 2024-03-01 16:05:24
| | | feat: add modal examples
| | |
| | * e5a4525 - Suraj - 2024-03-12 18:45:28
| | | fix: popover docs
| | |
| | * fb6dc04 - Viraj Ajay Joshi - 2024-03-12 18:30:07
| | | fix: cssIntero issue
| | |
| | * 95800bb - Suraj - 2024-03-12 18:23:24
| | | fix: nativewind utils import changes
| | |
| | * 3b078ba - Viraj Ajay Joshi - 2024-03-12 17:49:21
| | | fix: default export
| | |
| | * be61412 - Viraj Ajay Joshi - 2024-03-12 17:10:29
| | | fix: modal and utils
| | |
| | * e2919a8 - Viraj Ajay Joshi - 2024-03-12 17:06:53
| | | v0.0.11-alpha.2
| | |
| | * f3670f4 - Viraj Ajay Joshi - 2024-03-12 15:32:36
| | | v0.0.11-alpha.1
| | |
| | * 2654763 - Viraj Ajay Joshi - 2024-03-12 15:27:55
| |/ v0.0.11-alpha.0
| |
| * 469d4db - Viraj Joshi - 2024-03-12 13:37:01
| Merge pull request Backmerge Main -> Patch #1932 from gluestack/main
| Backmerge Main -> Patch
e7fb031 - Suraj - 2024-03-12 18:51:21
fix: modal playground fixes