Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

R

Rocket.Chat
- Activity
- Members
- Terraform modules

Snippets Groups Projects

2ad0e75e

Unverified Commit 2ad0e75e authored 7 years ago by Karl Prieb Committed by GitHub 7 years ago

Downloads
- Plain Diff

Merge branch 'develop' into fix-view-all-member-button

parents 8be9837a d7a5fcd8

No related branches found

No related tags found

Loading

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

imports/message-read-receipt/server/api/methods/getReadReceipts.js 8 additions, 0 deletions

...essage-read-receipt/server/api/methods/getReadReceipts.js
packages/rocketchat-api/server/v1/chat.js 23 additions, 2 deletions

packages/rocketchat-api/server/v1/chat.js
packages/rocketchat-autolinker/client/client.js 0 additions, 7 deletions

packages/rocketchat-autolinker/client/client.js
packages/rocketchat-livechat/imports/server/rest/messages.js 64 additions, 0 deletions

packages/rocketchat-livechat/imports/server/rest/messages.js
packages/rocketchat-livechat/imports/server/rest/users.js 1 addition, 1 deletion

packages/rocketchat-livechat/imports/server/rest/users.js
packages/rocketchat-livechat/imports/server/rest/visitors.js 32 additions, 0 deletions

packages/rocketchat-livechat/imports/server/rest/visitors.js
packages/rocketchat-livechat/server/api.js 2 additions, 0 deletions

packages/rocketchat-livechat/server/api.js
server/startup/migrations/v108.js 1 addition, 1 deletion

server/startup/migrations/v108.js
tests/end-to-end/api/05-chat.js 41 additions, 1 deletion

tests/end-to-end/api/05-chat.js

with 172 additions and 12 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