Merge branch 'develop' of github.com:RocketChat/Rocket.Chat into develop
No related branches found
No related tags found
Showing
- .meteor/versions 1 addition, 1 deletion.meteor/versions
- .sandstorm/sandstorm-pkgdef.capnp 2 additions, 2 deletions.sandstorm/sandstorm-pkgdef.capnp
- client/methods/pinMessage.coffee 0 additions, 21 deletionsclient/methods/pinMessage.coffee
- client/methods/unpinMessage.coffee 0 additions, 21 deletionsclient/methods/unpinMessage.coffee
- i18n/en.i18n.json 4 additions, 3 deletionsi18n/en.i18n.json
- packages/rocketchat-integrations/server/api/api.coffee 1 addition, 1 deletionpackages/rocketchat-integrations/server/api/api.coffee
- packages/rocketchat-lib/rocketchat.info 1 addition, 1 deletionpackages/rocketchat-lib/rocketchat.info
- packages/rocketchat-lib/server/models/Messages.coffee 2 additions, 1 deletionpackages/rocketchat-lib/server/models/Messages.coffee
- packages/rocketchat-livechat/client/views/app/livechatInstallation.js 2 additions, 2 deletions...ketchat-livechat/client/views/app/livechatInstallation.js
- packages/rocketchat-livechat/i18n/en.i18n.json 14 additions, 14 deletionspackages/rocketchat-livechat/i18n/en.i18n.json
- packages/rocketchat-mentions-flextab/i18n/en.i18n.json 0 additions, 1 deletionpackages/rocketchat-mentions-flextab/i18n/en.i18n.json
- packages/rocketchat-mentions-flextab/server/publications/mentionedMessages.coffee 1 addition, 1 deletion...ions-flextab/server/publications/mentionedMessages.coffee
- packages/rocketchat-message-pin/client/actionButton.coffee 12 additions, 1 deletionpackages/rocketchat-message-pin/client/actionButton.coffee
- packages/rocketchat-message-pin/client/pinMessage.coffee 26 additions, 0 deletionspackages/rocketchat-message-pin/client/pinMessage.coffee
- packages/rocketchat-message-pin/client/views/pinnedMessages.coffee 27 additions, 5 deletions...rocketchat-message-pin/client/views/pinnedMessages.coffee
- packages/rocketchat-message-pin/client/views/pinnedMessages.html 24 additions, 18 deletions...s/rocketchat-message-pin/client/views/pinnedMessages.html
- packages/rocketchat-message-pin/client/views/stylesheets/messagepin.less 31 additions, 3 deletions...chat-message-pin/client/views/stylesheets/messagepin.less
- packages/rocketchat-message-pin/package.js 2 additions, 0 deletionspackages/rocketchat-message-pin/package.js
- packages/rocketchat-message-pin/server/publications/pinnedMessages.coffee 6 additions, 2 deletions...hat-message-pin/server/publications/pinnedMessages.coffee
- packages/rocketchat-message-star/client/actionButton.coffee 10 additions, 0 deletionspackages/rocketchat-message-star/client/actionButton.coffee
Loading
Please register or sign in to comment