Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

R

Rocket.Chat
- Activity
- Members
- Terraform modules

Snippets Groups Projects

afc1a4bf

Unverified Commit afc1a4bf authored 2 years ago by Diego Sampaio

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/develop' into release-candidate

parents fbbba851 eef1203d

No related branches found

Tags 6.12.0-rc.3

No related merge requests found

Changes 9

Expand all Hide whitespace changes

Inline Side-by-side

Showing

apps/meteor/.eslintcache 1 addition, 1 deletion

apps/meteor/.eslintcache
apps/meteor/app/apps/server/bridges/rooms.ts 2 additions, 1 deletion

apps/meteor/app/apps/server/bridges/rooms.ts
apps/meteor/app/theme/client/imports/general/base.css 2 additions, 0 deletions

apps/meteor/app/theme/client/imports/general/base.css
apps/meteor/client/components/message/content/attachments/structure/AttachmentImage.tsx 30 additions, 31 deletions

...message/content/attachments/structure/AttachmentImage.tsx
apps/meteor/client/components/message/content/attachments/structure/image/ImageBox.tsx 1 addition, 0 deletions

.../message/content/attachments/structure/image/ImageBox.tsx
apps/meteor/client/components/message/content/urlPreviews/UrlImagePreview.tsx 2 additions, 2 deletions

...omponents/message/content/urlPreviews/UrlImagePreview.tsx
apps/meteor/client/providers/AttachmentProvider.tsx 7 additions, 4 deletions

apps/meteor/client/providers/AttachmentProvider.tsx
apps/meteor/client/providers/MeteorProvider.tsx 1 addition, 4 deletions

apps/meteor/client/providers/MeteorProvider.tsx
apps/meteor/client/views/room/MessageList/providers/MessageListProvider.tsx 9 additions, 2 deletions

.../views/room/MessageList/providers/MessageListProvider.tsx

with 55 additions and 45 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment