Merge branch 'develop' into jquery3-photoswipe
Showing
- README.md 1 addition, 2 deletionsREADME.md
- package.json 2 additions, 1 deletionpackage.json
- packages/rocketchat-api/package.js 1 addition, 0 deletionspackages/rocketchat-api/package.js
- packages/rocketchat-api/server/default/metrics.js 8 additions, 0 deletionspackages/rocketchat-api/server/default/metrics.js
- packages/rocketchat-integrations/client/views/integrationsIncoming.coffee 1 addition, 1 deletion...hat-integrations/client/views/integrationsIncoming.coffee
- packages/rocketchat-integrations/server/api/api.coffee 12 additions, 1 deletionpackages/rocketchat-integrations/server/api/api.coffee
- packages/rocketchat-lib/.npm/package/npm-shrinkwrap.json 47 additions, 27 deletionspackages/rocketchat-lib/.npm/package/npm-shrinkwrap.json
- packages/rocketchat-lib/package.js 3 additions, 1 deletionpackages/rocketchat-lib/package.js
- packages/rocketchat-lib/server/lib/metrics.js 9 additions, 0 deletionspackages/rocketchat-lib/server/lib/metrics.js
- packages/rocketchat-lib/server/methods/sendMessage.coffee 2 additions, 1 deletionpackages/rocketchat-lib/server/methods/sendMessage.coffee
- packages/rocketchat-lib/server/models/_BaseCache.js 2 additions, 1 deletionpackages/rocketchat-lib/server/models/_BaseCache.js
- packages/rocketchat-theme/client/imports/base.less 1 addition, 0 deletionspackages/rocketchat-theme/client/imports/base.less
- packages/rocketchat-ui/lib/notification.coffee 8 additions, 0 deletionspackages/rocketchat-ui/lib/notification.coffee
- packages/rocketchat-ui/views/app/room.coffee 0 additions, 3 deletionspackages/rocketchat-ui/views/app/room.coffee
- packages/rocketchat-ui/views/app/room.html 6 additions, 2 deletionspackages/rocketchat-ui/views/app/room.html
- server/startup/migrations/v082.js 9 additions, 0 deletionsserver/startup/migrations/v082.js
Loading
Please register or sign in to comment