Commit f33b02f
committed
Merge branch 'develop' into chore.develop-into-voip
# Conflicts:
# CLAUDE.md
# android/app/build.gradle
# android/app/src/main/java/chat/rocket/reactnative/MainApplication.kt
# app/containers/Header/components/HeaderButton/__snapshots__/HeaderButtons.test.tsx.snap
# app/containers/UIKit/__snapshots__/UiKitMessage.test.tsx.snap
# app/sagas/login.js
# app/views/DiscussionsView/__snapshots__/Item.test.tsx.snap
# app/views/RoomView/LoadMore/__snapshots__/LoadMore.test.tsx.snap
# app/views/ThreadMessagesView/__snapshots__/Item.test.tsx.snap
# ios/Podfile.lock
# ios/RocketChatRN.xcodeproj/project.pbxproj
# package.json
# yarn.lock10 files changed
Lines changed: 3953 additions & 5601 deletions
File tree
- app
- containers
- Header/components/HeaderButton/__snapshots__
- InAppNotification
- __snapshots__
- UIKit/__snapshots__
- views
- DiscussionsView/__snapshots__
- RoomView/LoadMore/__snapshots__
- ThreadMessagesView/__snapshots__
- ios
Lines changed: 424 additions & 511 deletions
Large diffs are not rendered by default.
Lines changed: 76 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
| 33 | + | |
| 34 | + | |
| 35 | + | |
| 36 | + | |
| 37 | + | |
| 38 | + | |
| 39 | + | |
| 40 | + | |
| 41 | + | |
| 42 | + | |
| 43 | + | |
| 44 | + | |
| 45 | + | |
| 46 | + | |
| 47 | + | |
| 48 | + | |
| 49 | + | |
| 50 | + | |
| 51 | + | |
| 52 | + | |
| 53 | + | |
| 54 | + | |
| 55 | + | |
| 56 | + | |
| 57 | + | |
| 58 | + | |
| 59 | + | |
| 60 | + | |
| 61 | + | |
| 62 | + | |
| 63 | + | |
| 64 | + | |
| 65 | + | |
| 66 | + | |
| 67 | + | |
| 68 | + | |
| 69 | + | |
| 70 | + | |
| 71 | + | |
| 72 | + | |
| 73 | + | |
| 74 | + | |
| 75 | + | |
| 76 | + | |
Lines changed: 4 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
0 commit comments