Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

R

Rocket.Chat
- Activity
- Members
- Terraform modules

Snippets Groups Projects

950ca4ed

Commit 950ca4ed authored 9 years ago by Rodrigo Nascimento

Downloads
- Plain Diff

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

parents 2450b7ca 901d6d60

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/RoomHistoryManager.coffee 10 additions, 1 deletion

client/lib/RoomHistoryManager.coffee
client/lib/RoomManager.coffee 2 additions, 0 deletions

client/lib/RoomManager.coffee
client/lib/readMessages.coffee 62 additions, 22 deletions

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

client/routes/roomRoute.coffee
client/stylesheets/base.less 30 additions, 4 deletions

client/stylesheets/base.less
client/views/app/room.coffee 23 additions, 11 deletions

client/views/app/room.coffee
client/views/app/room.html 13 additions, 4 deletions

client/views/app/room.html
i18n/en.i18n.json 4 additions, 0 deletions

i18n/en.i18n.json
server/methods/countAndFirstId.coffee 37 additions, 0 deletions

server/methods/countAndFirstId.coffee

with 181 additions and 43 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