Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

R

Rocket.Chat
- Activity
- Members
- Terraform modules

Snippets Groups Projects

0b926b0c

Commit 0b926b0c authored 9 years ago by Marcelo Schmidt

Downloads
- Plain Diff

Merge branch 'master' of github.com:RocketChat/Rocket.Chat

parents f9d67947 c0ebf4c6

No related branches found

No related tags found

No related merge requests found

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

client/lib/chatMessages.coffee 4 additions, 0 deletions

client/lib/chatMessages.coffee
client/lib/readMessages.coffee 8 additions, 8 deletions

client/lib/readMessages.coffee
client/routes/roomRoute.coffee 5 additions, 1 deletion

client/routes/roomRoute.coffee
client/startup/unread.coffee 3 additions, 3 deletions

client/startup/unread.coffee
client/stylesheets/base.less 2 additions, 1 deletion

client/stylesheets/base.less
client/views/app/messagePopup.coffee 15 additions, 5 deletions

client/views/app/messagePopup.coffee
client/views/app/messagePopupConfig.coffee 1 addition, 0 deletions

client/views/app/messagePopupConfig.coffee
server/startup/indexes.coffee 0 additions, 1 deletion

server/startup/indexes.coffee
server/startup/migrations/v17.coffee 6 additions, 0 deletions

server/startup/migrations/v17.coffee

with 44 additions and 19 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