Commit 4d264dd
committed
Merge branch 'develop' into feat/native-multipart-upload
# Conflicts:
# package/src/components/Attachment/__tests__/Attachment.test.tsx
# package/src/components/Attachment/__tests__/Giphy.test.tsx199 files changed
Lines changed: 3448 additions & 2064 deletions
File tree
- .github/workflows
- package
- src
- __tests__/offline-support
- components
- AttachmentPicker/components/AttachmentMediaPicker
- Attachment/__tests__
- AutoCompleteInput/__tests__
- ChannelList
- __tests__
- hooks
- __tests__
- listeners/__tests__
- ChannelPreview
- __tests__
- hooks/__tests__
- Channel/__tests__
- Chat/__tests__
- ImageGallery
- __tests__
- components/__tests__
- Indicators
- MessageInput
- __tests__
- __snapshots__
- components/AttachmentPreview
- MessageList
- __tests__
- __snapshots__
- hooks
- MessageMenu/__tests__
- Message
- MessageItemView
- __tests__
- __snapshots__
- utils
- hooks/__tests__
- Poll
- Thread/__tests__
- __snapshots__
- UIComponents
- __tests__
- contexts
- messageInputContext/__tests__
- overlayContext/__tests__
- hooks/__tests__
- i18n
- mock-builders
- DB
- api
- event
- generator
- state-store/__tests__
- store
- apis
- __tests__
- sqlite-utils
- test-utils
- utils/__tests__
Some content is hidden
Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
29 | 29 | | |
30 | 30 | | |
31 | 31 | | |
| 32 | + | |
| 33 | + | |
32 | 34 | | |
33 | 35 | | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
10 | 10 | | |
11 | 11 | | |
12 | 12 | | |
13 | | - | |
| 13 | + | |
14 | 14 | | |
15 | 15 | | |
16 | 16 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | | - | |
| 2 | + | |
| 3 | + | |
3 | 4 | | |
4 | 5 | | |
5 | 6 | | |
| |||
36 | 37 | | |
37 | 38 | | |
38 | 39 | | |
39 | | - | |
| 40 | + | |
40 | 41 | | |
41 | 42 | | |
42 | 43 | | |
43 | 44 | | |
44 | | - | |
| 45 | + | |
| 46 | + | |
| 47 | + | |
| 48 | + | |
| 49 | + | |
| 50 | + | |
| 51 | + | |
45 | 52 | | |
46 | 53 | | |
47 | 54 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
9 | 9 | | |
10 | 10 | | |
11 | 11 | | |
12 | | - | |
| 12 | + | |
13 | 13 | | |
14 | 14 | | |
15 | 15 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
37 | 37 | | |
38 | 38 | | |
39 | 39 | | |
| 40 | + | |
40 | 41 | | |
41 | 42 | | |
42 | 43 | | |
| |||
127 | 128 | | |
128 | 129 | | |
129 | 130 | | |
| 131 | + | |
130 | 132 | | |
131 | 133 | | |
132 | | - | |
| 134 | + | |
133 | 135 | | |
134 | 136 | | |
135 | 137 | | |
| |||
154 | 156 | | |
155 | 157 | | |
156 | 158 | | |
157 | | - | |
| 159 | + | |
158 | 160 | | |
159 | 161 | | |
160 | 162 | | |
| |||
0 commit comments