Merge branch 'master' of github.com:RocketChat/Rocket.Chat into bugfix-room-tabbar-reactivity
No related branches found
No related tags found
Showing
- .meteor/packages 2 additions, 0 deletions.meteor/packages
- .meteor/versions 16 additions, 0 deletions.meteor/versions
- client/lib/notification.coffee 3 additions, 0 deletionsclient/lib/notification.coffee
- client/views/account/accountPreferences.coffee 9 additions, 0 deletionsclient/views/account/accountPreferences.coffee
- client/views/account/accountPreferences.html 12 additions, 0 deletionsclient/views/account/accountPreferences.html
- client/views/app/messagePopupConfig.coffee 21 additions, 0 deletionsclient/views/app/messagePopupConfig.coffee
- client/views/app/roomSearch.html 1 addition, 1 deletionclient/views/app/roomSearch.html
- client/views/app/tabBar/membersList.coffee 2 additions, 2 deletionsclient/views/app/tabBar/membersList.coffee
- i18n/en.i18n.json 5 additions, 0 deletionsi18n/en.i18n.json
- i18n/pt.i18n.json 6 additions, 1 deletioni18n/pt.i18n.json
- packages/rocketchat-file/file.server.coffee 1 addition, 0 deletionspackages/rocketchat-file/file.server.coffee
- packages/rocketchat-lib/server/models/Messages.coffee 4 additions, 4 deletionspackages/rocketchat-lib/server/models/Messages.coffee
- packages/rocketchat-markdown/markdown.coffee 1 addition, 1 deletionpackages/rocketchat-markdown/markdown.coffee
- server/methods/addUserToRoom.coffee 4 additions, 0 deletionsserver/methods/addUserToRoom.coffee
- server/startup/avatar.coffee 10 additions, 3 deletionsserver/startup/avatar.coffee
- tests/jasmine/client/unit/markdowntest.js 7 additions, 0 deletionstests/jasmine/client/unit/markdowntest.js
Loading
Please register or sign in to comment