Merge remote-tracking branch 'origin/develop' into release-candidate
Showing
- apps/meteor/app/api/server/v1/im.ts 8 additions, 11 deletionsapps/meteor/app/api/server/v1/im.ts
- apps/meteor/app/api/server/v1/users.ts 1 addition, 0 deletionsapps/meteor/app/api/server/v1/users.ts
- apps/meteor/app/autotranslate/client/lib/actionButton.ts 2 additions, 2 deletionsapps/meteor/app/autotranslate/client/lib/actionButton.ts
- apps/meteor/app/autotranslate/client/lib/autotranslate.ts 41 additions, 10 deletionsapps/meteor/app/autotranslate/client/lib/autotranslate.ts
- apps/meteor/app/autotranslate/server/autotranslate.ts 1 addition, 0 deletionsapps/meteor/app/autotranslate/server/autotranslate.ts
- apps/meteor/app/federation-v2/server/application/RoomServiceReceiver.ts 2 additions, 2 deletions...p/federation-v2/server/application/RoomServiceReceiver.ts
- apps/meteor/app/federation-v2/server/index.ts 5 additions, 1 deletionapps/meteor/app/federation-v2/server/index.ts
- apps/meteor/app/federation-v2/server/infrastructure/rocket-chat/adapters/Settings.ts 2 additions, 2 deletions...v2/server/infrastructure/rocket-chat/adapters/Settings.ts
- apps/meteor/app/federation-v2/server/infrastructure/rocket-chat/adapters/User.ts 0 additions, 1 deletion...ion-v2/server/infrastructure/rocket-chat/adapters/User.ts
- apps/meteor/client/components/PlanTag.tsx 12 additions, 30 deletionsapps/meteor/client/components/PlanTag.tsx
- apps/meteor/client/components/voip/room/VoipRoomForeword.tsx 8 additions, 5 deletionsapps/meteor/client/components/voip/room/VoipRoomForeword.tsx
- apps/meteor/client/sidebar/footer/voip/VoipFooter.tsx 2 additions, 1 deletionapps/meteor/client/sidebar/footer/voip/VoipFooter.tsx
- apps/meteor/client/sidebar/footer/voip/index.tsx 3 additions, 5 deletionsapps/meteor/client/sidebar/footer/voip/index.tsx
- apps/meteor/client/views/admin/users/UserInfoActions.js 2 additions, 1 deletionapps/meteor/client/views/admin/users/UserInfoActions.js
- apps/meteor/client/views/omnichannel/directory/calls/CallTable.tsx 3 additions, 2 deletions...or/client/views/omnichannel/directory/calls/CallTable.tsx
- apps/meteor/client/views/omnichannel/directory/calls/contextualBar/VoipInfo.tsx 3 additions, 2 deletions...ws/omnichannel/directory/calls/contextualBar/VoipInfo.tsx
- apps/meteor/client/views/omnichannel/directory/contacts/ContactTable.tsx 3 additions, 2 deletions...ent/views/omnichannel/directory/contacts/ContactTable.tsx
- apps/meteor/client/views/omnichannel/directory/contacts/contextualBar/ContactInfo.js 3 additions, 2 deletions...nichannel/directory/contacts/contextualBar/ContactInfo.js
- apps/meteor/client/views/room/Header/Header.tsx 5 additions, 5 deletionsapps/meteor/client/views/room/Header/Header.tsx
- apps/meteor/client/views/room/Header/Omnichannel/VoipRoomHeader.tsx 8 additions, 2 deletions...r/client/views/room/Header/Omnichannel/VoipRoomHeader.tsx
Loading
Please register or sign in to comment