Merge branch 'develop' into v2.9.0
# Conflicts: # android/app/build.gradle # ios/RocketChatRN.xcodeproj/project.pbxproj # ios/RocketChatRN/Info.plist # ios/ShareRocketChatRN/Info.plist
No related branches found
No related tags found
Showing
- app/actions/room.ts 1 addition, 1 deletionapp/actions/room.ts
- app/actions/settings.ts 5 additions, 5 deletionsapp/actions/settings.ts
- app/commands.ts 2 additions, 2 deletionsapp/commands.ts
- app/constants/settings.ts 1 addition, 1 deletionapp/constants/settings.ts
- app/containers/List/ListItem.tsx 1 addition, 1 deletionapp/containers/List/ListItem.tsx
- app/containers/MessageActions/index.tsx 12 additions, 16 deletionsapp/containers/MessageActions/index.tsx
- app/containers/MessageBox/index.tsx 1 addition, 1 deletionapp/containers/MessageBox/index.tsx
- app/containers/ReactionsModal.tsx 7 additions, 4 deletionsapp/containers/ReactionsModal.tsx
- app/containers/ThreadDetails.tsx 4 additions, 4 deletionsapp/containers/ThreadDetails.tsx
- app/containers/UIKit/MultiSelect/index.tsx 1 addition, 1 deletionapp/containers/UIKit/MultiSelect/index.tsx
- app/containers/message/Message.tsx 1 addition, 1 deletionapp/containers/message/Message.tsx
- app/containers/message/Reply.tsx 2 additions, 2 deletionsapp/containers/message/Reply.tsx
- app/containers/message/User.tsx 10 additions, 9 deletionsapp/containers/message/User.tsx
- app/containers/message/index.tsx 30 additions, 30 deletionsapp/containers/message/index.tsx
- app/containers/message/interfaces.ts 17 additions, 17 deletionsapp/containers/message/interfaces.ts
- app/containers/message/utils.ts 4 additions, 1 deletionapp/containers/message/utils.ts
- app/definitions/IEmoji.ts 7 additions, 1 deletionapp/definitions/IEmoji.ts
- app/definitions/IMessage.ts 68 additions, 13 deletionsapp/definitions/IMessage.ts
- app/definitions/IRoom.ts 3 additions, 0 deletionsapp/definitions/IRoom.ts
- app/definitions/ISubscription.ts 7 additions, 5 deletionsapp/definitions/ISubscription.ts
Loading
Please register or sign in to comment