Commit aeeea75
committed
Merge branch 'develop' into feat/forward-port-polls
# Conflicts:
# examples/ExpoMessaging/yarn.lock
# examples/SampleApp/ios/Podfile.lock
# examples/SampleApp/ios/SampleApp.xcodeproj/project.pbxproj
# examples/SampleApp/yarn.lock
# examples/TypeScriptMessaging/ios/Podfile.lock
# examples/TypeScriptMessaging/yarn.lock
# package/native-package/package.json
# package/native-package/yarn.lock
# package/src/components/AttachmentPicker/components/AttachmentPickerSelectionBar.tsx
# package/src/components/Channel/Channel.tsx
# package/src/components/Channel/hooks/useCreateMessagesContext.ts
# package/src/components/Message/Message.tsx
# package/src/components/Message/MessageSimple/MessageContent.tsx
# package/src/components/MessageOverlay/MessageOverlay.tsx
# package/src/contexts/messageInputContext/MessageInputContext.tsx
# package/src/contexts/messageOverlayContext/MessageOverlayContext.tsx
# package/src/contexts/messagesContext/MessagesContext.tsx
# package/src/contexts/overlayContext/OverlayProvider.tsx
# package/src/contexts/themeContext/utils/theme.ts
# package/src/store/SqliteClient.ts
# package/yarn.lockFile tree
141 files changed
+6004
-119
lines changed- .styles/Vocab/Base
- docusaurus
- docs/reactnative
- assets/guides/custom-poll-flow
- common-content
- contexts
- create-poll-context
- message-input-context
- poll-context
- ui-components
- channel/props
- poll
- contexts
- core-components
- guides
- hooks/poll
- state-and-offline-support
- ui-components
- examples/SampleApp
- fastlane
- src
- components
- hooks
- screens
- package
- expo-package
- native-package
- src
- components
- AttachmentPicker/components
- ChannelPreview/hooks
- Channel
- hooks
- Chat
- hooks
- MessageInput
- __tests__
- components
- Message
- MessageSimple
- Poll
- components
- PollResults
- hooks
- Reply
- ThreadList
- contexts
- attachmentPickerContext
- messageInputContext
- __tests__
- hooks
- messagesContext
- overlayContext
- ownCapabilitiesContext
- pollContext
- themeContext/utils
- hooks
- i18n
- icons
- store
- apis
- mappers
Some content is hidden
Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
141 files changed
+6004
-119
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
52 | 52 | | |
53 | 53 | | |
54 | 54 | | |
| 55 | + | |
| 56 | + | |
| 57 | + | |
| 58 | + | |
| 59 | + | |
| 60 | + | |
| 61 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
10 | 10 | | |
11 | 11 | | |
12 | 12 | | |
13 | | - | |
| 13 | + | |
14 | 14 | | |
15 | 15 | | |
16 | 16 | | |
| |||
0 commit comments