Merge branch 'develop' into v2.8.0
# Conflicts: # android/app/build.gradle # ios/Podfile.lock # ios/RocketChatRN.xcodeproj/project.pbxproj # ios/RocketChatRN/Info.plist # ios/ShareRocketChatRN/Info.plist # yarn.lock
No related branches found
No related tags found
Showing
- .eslintrc.js 3 additions, 2 deletions.eslintrc.js
- android/app/src/main/java/chat/rocket/reactnative/networking/SSLPinningModule.java 26 additions, 21 deletions.../chat/rocket/reactnative/networking/SSLPinningModule.java
- app/actions/actionsTypes.ts 2 additions, 2 deletionsapp/actions/actionsTypes.ts
- app/actions/activeUsers.js 0 additions, 8 deletionsapp/actions/activeUsers.js
- app/actions/activeUsers.ts 15 additions, 0 deletionsapp/actions/activeUsers.ts
- app/actions/selectedUsers.ts 43 additions, 0 deletionsapp/actions/selectedUsers.ts
- app/constants/constantDisplayMode.js 0 additions, 2 deletionsapp/constants/constantDisplayMode.js
- app/constants/constantDisplayMode.ts 9 additions, 0 deletionsapp/constants/constantDisplayMode.ts
- app/containers/ActionSheet/Button.ts 2 additions, 1 deletionapp/containers/ActionSheet/Button.ts
- app/containers/Avatar/Avatar.tsx 3 additions, 2 deletionsapp/containers/Avatar/Avatar.tsx
- app/containers/Avatar/index.tsx 5 additions, 5 deletionsapp/containers/Avatar/index.tsx
- app/containers/Avatar/interfaces.ts 19 additions, 19 deletionsapp/containers/Avatar/interfaces.ts
- app/containers/MessageActions/index.tsx 0 additions, 2 deletionsapp/containers/MessageActions/index.tsx
- app/containers/Passcode/Base/Button.tsx 10 additions, 10 deletionsapp/containers/Passcode/Base/Button.tsx
- app/containers/message/Reply.tsx 6 additions, 22 deletionsapp/containers/message/Reply.tsx
- app/containers/message/Video.tsx 2 additions, 8 deletionsapp/containers/message/Video.tsx
- app/containers/message/interfaces.ts 1 addition, 1 deletionapp/containers/message/interfaces.ts
- app/definitions/IAttachment.ts 15 additions, 0 deletionsapp/definitions/IAttachment.ts
- app/definitions/ICommand.ts 6 additions, 0 deletionsapp/definitions/ICommand.ts
- app/definitions/ICustomEmoji.ts 10 additions, 0 deletionsapp/definitions/ICustomEmoji.ts
Loading
Please register or sign in to comment