Backmerge Main -> Patch #1987
Merged
Backmerge Main -> Patch #1987
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
Update README.md
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.
2f01b15 - Vidhi Kataria - 2024-03-21 11:38:53
| Merge pull request Update README.md #1980 from gluestack/feat/readme-changes
| Update README.md
c6fd7cc - Vidhi Kataria - 2024-03-20 13:38:26
Update README.md
b300443 - Viraj Joshi - 2024-03-20 15:31:57
|\ Merge pull request fix/storybook-and-icon-color #1979 from gluestack/fix/storybook
| | fix/storybook-and-icon-color
| * 7a639ee - Damini - 2024-03-20 12:41:59
| | fix: svg and custom icon color
| |
| * 424bd58 - Damini - 2024-03-20 12:41:04
|/ fix: storybook
|
db1063b - Viraj Joshi - 2024-03-19 17:48:28
| Merge pull request Backmerge Main -> Patch #1963 from gluestack/main
| Backmerge Main -> Patch
bab7f67 - Viraj Joshi - 2024-03-19 16:02:31
|\ Merge pull request fix: copy paste pressble #1975 from gluestack/fix/copy-paste-pressable
| | fix: copy paste pressble
| * b9dc35c - Viraj Ajay Joshi - 2024-03-19 16:02:05
| | fix: command
| |
| * 3633f98 - Viraj Ajay Joshi - 2024-03-19 16:00:36
|/ fix: copy paste pressble
|
cc37f72 - Viraj Joshi - 2024-03-19 13:09:14
|\ Merge pull request Fix/animation components #1973 from gluestack/fix/animation-components
| | Fix/animation components
| * 5906de5 - Viraj Ajay Joshi - 2024-03-19 13:08:56
| |\ Merge branch 'fix/animation-components' of github.com:gluestack/gluestack-ui into fix/animation-components
| | |
| | * c1ec608 - Viraj Joshi - 2024-03-19 12:30:32
| | |\ Merge pull request fix/slider-isDisabled #1971 from gluestack/fix/slider-isdisabled
| | | | fix/slider-isDisabled
| | | * de0f827 - Damini - 2024-03-19 12:24:41
| | |/ fix: slider isdisabled state
| | |
| | * dd18e82 - Viraj Joshi - 2024-03-18 18:52:43
| | |\ Merge pull request fix/overlay-components-styling #1969 from gluestack/fix/overlay-components-styling
| | | | fix/overlay-components-styling
| | | * 2c1f1a3 - Damini - 2024-03-18 18:33:31
| | | |\ Merge branch 'fix/animation-components' of https://github.com/gluestack/gluestack-ui into fix/overlay-components-styling Merge branch 'fix/animation-components' of https://github.com/gluestack/gluestack-ui into fix/overlay-components-styling.
| | | |/
| | |/|
| | | |
| | | * ca88e0c - Damini - 2024-03-18 18:22:48
| | | | fix: accordion example and modal table width
| | | |
| | | * b3b86c0 - Damini - 2024-03-18 18:01:22
| | | | fix: alert dialog icon and button
| | | |
| * | | 56b4df3 - Viraj Ajay Joshi - 2024-03-19 13:07:54
| |\ \ \ fix: merge conflicts
| | |/ /
| |/| |
| | | |
| * | | 8e00c3f - Viraj Ajay Joshi - 2024-03-18 14:59:50
| |\ \ \ Merge branch 'fix/animation-components' of github.com:gluestack/gluestack-ui into fix/animation-components
| | | | |
| | * | | 17276fa - Viraj Joshi - 2024-03-15 19:03:42
| | |\ \ \ Merge pull request fix/heading-component #1959 from gluestack/fix/heading-component
| | | | | | fix/heading-component
| | | * \ \ 854e1be - Damini - 2024-03-15 18:43:44
| | | |\ \ \ Merge branch 'fix/animation-components' of https://github.com/gluestack/gluestack-ui into fix/heading-component Merge branch 'fix/animation-components' of https://github.com/gluestack/gluestack-ui into fix/heading-component.
| | | | | | |
| | | * | | | 298a76d - Damini - 2024-03-15 18:42:24
| | | | |_|/ fix: mapp size with html heading elements in nativewind heading component
| | | |/| |
| | | | | |
| * | | | | 0f0ca85 - Viraj Ajay Joshi - 2024-03-18 14:58:47
| |/ / / / fix: slider orientation issue
| | | | |
| * | | | 6af4992 - Viraj Ajay Joshi - 2024-03-15 18:58:44
| | | | | fix: alert dialog border
| | | | |
| * | | | 3454954 - Viraj Ajay Joshi - 2024-03-15 18:53:33
| | | | | fix: tooltip content
| | | | |
| * | | | 04cbeb8 - Viraj Ajay Joshi - 2024-03-15 18:47:58
| |\ \ \ \ Merge branch 'fix/animation-components' of github.com:gluestack/gluestack-ui into fix/animation-components
| | | |/ /
| | |/| |
| | | | |
| | * | | 8bee3c7 - Viraj Joshi - 2024-03-15 18:09:41
| | |\ \ \ Merge pull request feat: add menu themed examples #1955 from gluestack/feat/menu-with-style-examples
| | | |/ / feat: add menu themed examples
| | |/| |
| | | * | 2d24b60 - Damini - 2024-03-15 18:00:06
| | |/ / feat: add menu themed examples
| | | |
| * | | 340ca6d - Viraj Ajay Joshi - 2024-03-15 18:46:40
| |/ / fix: modal backdrop
| | |
| * | e71244e - Viraj Ajay Joshi - 2024-03-15 17:18:41
| | | fix: menu text
| | |
| * | 0103a0b - Viraj Ajay Joshi - 2024-03-15 16:58:17
| |\ \ Merge branch 'fix/animation-components' of github.com:gluestack/gluestack-ui into fix/animation-components
| | | |
| | * | 9527ef9 - Viraj Joshi - 2024-03-15 16:56:54
| | |\ \ Merge pull request feat/menu-examples-nw #1954 from gluestack/feat/menu-examples-nw
| | | | | feat/menu-examples-nw
| | | * \ 0acbd73 - Damini - 2024-03-15 16:43:26
| | | |\ \ Merge branch 'fix/animation-components' of https://github.com/gluestack/gluestack-ui into feat/menu-examples-nw Merge branch 'fix/animation-components' of https://github.com/gluestack/gluestack-ui into feat/menu-examples-nw.
| | | |/ /
| | |/| |
| | | | |
| | | * | c3fb26d - Damini - 2024-03-15 16:42:58
| | | | | fix: add as comp to the heading component
| | | | |
| | | * | b39027d - Damini - 2024-03-15 16:31:27
| | | | | feat: add menu nativewind examples
| | | | |
| * | | | 888f940 - Viraj Ajay Joshi - 2024-03-15 16:50:26
| |/ / / fix: added menu
| | | |
| * | | b6af5aa - Viraj Ajay Joshi - 2024-03-15 16:43:07
| | | | fix: collapsible
| | | |
| * | | f034124 - Viraj Ajay Joshi - 2024-03-15 16:36:28
| || | Merge branch 'fix/animation-components' of github.com:gluestack/gluestack-ui into fix/animation-components
| | | |
| | * | fc4bdab - Viraj Joshi - 2024-03-15 15:33:59
| | |\ \ Merge pull request feat/alert-dialog-examples #1952 from gluestack/feat/alert-dialog-examples
| | | | | feat/alert-dialog-examples
| | | * | a827346 - Damini - 2024-03-15 14:27:30
| | | | | fix: styles
| | | | |
| | | * | d5dade1 - Damini - 2024-03-15 13:25:33
| | | |\ \ Merge branch 'fix/animation-components' of https://github.com/gluestack/gluestack-ui into feat/alert-dialog-examples Merge branch 'fix/animation-components' of https://github.com/gluestack/gluestack-ui into feat/alert-dialog-examples.
| | | |/ /
| | |/| |
| | | | |
| | | * | 54528bb - Damini - 2024-03-15 13:25:01
| | | | | feat: add alert-dialog nativewind examples
| | | | |
| * | | | 3473366 - Viraj Ajay Joshi - 2024-03-15 16:36:02
| |/ / / fix: nativewind components
| | | |
| * | | 675b53b - Viraj Ajay Joshi - 2024-03-15 13:06:14
| |/ / fix: added css varaibles to global scope
| | |
| * | 9a010f2 - Viraj Ajay Joshi - 2024-03-15 12:07:19
| | | fix: added menu item typing
| | |
| * | cab221b - Viraj Ajay Joshi - 2024-03-15 12:06:28
| | | fix: menu and toast
| | |
| * | 9396a20 - Viraj Ajay Joshi - 2024-03-14 16:51:55
| | | fix: withStates imports
| | |
| * | d200e39 - Viraj Ajay Joshi - 2024-03-14 16:28:54
| | | fix: modal and tooltip
| | |
| * | 6493f7f - Viraj Ajay Joshi - 2024-03-14 13:24:50
| | | fix: tooltip nativeiwind component
| | |
| * | 77726b4 - Viraj Ajay Joshi - 2024-03-14 13:17:51
| | | v1.0.2
| | |
| * | 7ada18a - Viraj Ajay Joshi - 2024-03-14 13:05:52
| | | fix: utils exports
| | |
| * | 692abee - Viraj Ajay Joshi - 2024-03-14 12:50:49
| | | v1.0.2-alpha.6
| | |
| * | 43e310d - Viraj Ajay Joshi - 2024-03-14 12:46:40
| | | v1.0.2-alpha.5
| | |
| * | 4aa458b - Viraj Ajay Joshi - 2024-03-14 12:38:09
| | | v1.0.2-alpha.4
| | |
| * | 37e8e28 - Viraj Ajay Joshi - 2024-03-13 22:00:11
| | | v1.0.2-alpha.3
| | |
| * | 0b423ed - Viraj Ajay Joshi - 2024-03-13 19:49:00
| | | v1.0.2-alpha.2
| | |
| * | b74e28a - Viraj Ajay Joshi - 2024-03-13 19:42:06
| | | v1.0.2-alpha.1
| | |
| * | bdd055b - Viraj Ajay Joshi - 2024-03-13 12:23:25
| | | v1.0.1
| | |
| * | 9804780 - Viraj Ajay Joshi - 2024-03-13 11:10:26
| | | fix: tsconfig storybook nativewind
| | |
| * | cb93884 - Viraj Joshi - 2024-03-13 09:10:38
| | | Merge pull request feat: add examples for toast nativewind component #1937 from gluestack/feat/toast-example-addition
| | | feat: add examples for toast nativewind component
| * | 2d3119c - Viraj Joshi - 2024-03-13 09:06:18
| |\ \ Merge pull request feat/accordion-examples-nativewind #1898 from gluestack/feat/accordion-examples
| | | | feat/accordion-examples-nativewind
| | * | ac41563 - Damini - 2024-03-06 12:35:13
| | | | fix: imports
| | | |
| | * | e5e9f98 - Damini - 2024-03-06 11:03:15
| | | | Merge branch 'patch' of https://github.com/gluestack/gluestack-ui into feat/accordion-examples .
| | | |
| | * | 1a600e5 - Damini - 2024-03-05 13:11:16
| | | | Merge branch 'patch' of https://github.com/gluestack/gluestack-ui into feat/accordion-examples Merge branch 'patch' of https://github.com/gluestack/gluestack-ui into feat/accordion-examples.
| | | |
| | * | 7ea17b2 - Damini - 2024-03-05 13:11:07
| | | | feat: add accordion examples in nativewind
| | | |
| | * | afe0891 - Damini - 2024-03-05 11:29:59
| | | | feat: add accordion rounded corners example
| | | |
| | * | 953d346 - Damini - 2024-03-04 17:44:13
| | / feat: initial commit
| | |
| * | 27a6230 - Viraj Joshi - 2024-03-13 09:05:49
| |\ \ Merge pull request fix: radio focus issue #1897 from gluestack/fix/radio-focus
| | | | fix: radio focus issue
| | * | 7a53df4 - Damini - 2024-03-06 11:05:49
| | | | Merge branch 'patch' of https://github.com/gluestack/gluestack-ui into fix/radio-focus Merge branch 'patch' of https://github.com/gluestack/gluestack-ui into fix/radio-focus.
| | | |
| | * | c0e965b - Damini - 2024-03-05 11:42:53
| | / fix: radio focus issue
| | |
| * | c7db467 - Viraj Joshi - 2024-03-13 09:03:24
| |\ \ Merge pull request feat/tooltip-nativewind #1867 from gluestack/feat/tooltip
| | | | feat/tooltip-nativewind
| | * \ c240307 - Viraj Joshi - 2024-03-13 09:03:18
| | |\ \ Merge branch 'fix/animation-components' into feat/tooltip
| | |/ /
| |/| |
| | | |
| * | | f46f242 - Viraj Ajay Joshi - 2024-03-13 08:59:12
| | | | Merge branch 'fix/animation-components' of github.com:gluestack/gluestack-ui into fix/animation-components
| | | |
| * | | 913f1c7 - Viraj Ajay Joshi - 2024-03-13 08:58:17
| | | | fix: alert dialog
| | | |
| * | | a762a3e - Viraj Ajay Joshi - 2024-03-12 18:57:04
| | | | v1.0.0
| | | |
| * | | d9c5bda - Viraj Ajay Joshi - 2024-03-12 18:30:56
| / / v0.0.11-alpha.3
| | |
| * | 8b81794 - Damini - 2024-03-08 11:52:29
| | | Merge branch 'patch' of https://github.com/gluestack/gluestack-ui into feat/tooltip Merge branch 'patch' of https://github.com/gluestack/gluestack-ui into feat/tooltip.
| | |
| * | 74c9b0b - Damini - 2024-03-08 11:51:31
| | | feat: add tooltip examples
| | |
| * | 35fec56 - Damini - 2024-03-07 15:29:16
| | | Merge branch 'patch' of https://github.com/gluestack/gluestack-ui into feat/tooltip Merge branch 'patch' of https://github.com/gluestack/gluestack-ui into feat/tooltip.
| | |
| * | db30907 - Damini - 2024-03-06 12:50:22
| | | Merge branch 'patch' of https://github.com/gluestack/gluestack-ui into feat/tooltip
| | |
| * | 7ff00fe - Damini - 2024-03-01 11:14:37
| | | fix: text typography color
| | |
| * | 9d6fd6b - Damini - 2024-03-01 11:10:13
| | | feat: add tooltip component
| | |
| * | 531df1e - Damini - 2024-02-29 23:57:36
| / feat: initial commit
| |
| c36085c - Viraj Joshi - 2024-03-19 13:08:14
|\ \ Merge pull request fix: form control astrick #1972 from gluestack/fix/form-control-astrick
| |/ fix: form control astrick
|/|
| * 9eddcb3 - Viraj Ajay Joshi - 2024-03-19 13:03:04
| | fix: form control astrick
| |
| 4233d55 - Suraj - 2024-03-19 13:01:03
|| Merge branch 'patch' of github.com:gluestack/gluestack-ui into patch
| |
| * 565f2f6 - Viraj Joshi - 2024-03-18 18:52:21
| | Merge pull request fix/nativewind-docs #1967 from gluestack/fix/nativewind-docs-fixes
| | fix/nativewind-docs
| * f34f032 - Damini - 2024-03-18 16:53:57
| | fix: avatar bg color to primary and table width issue
| |
| * 3d91641 - Damini - 2024-03-18 16:23:05
| | fix: table container issue
| |
| * 59ff56c - Damini - 2024-03-18 16:12:58
| | fix: hstack vstack example color to primary
| |
| * c31a67a - Damini - 2024-03-18 16:06:14
| fix: heading prop table and heading sm size
|
f418475 - Suraj - 2024-03-19 13:00:47
fix: docs improvement