Merge remote-tracking branch 'origin/develop' into release-candidate
No related branches found
No related tags found
Showing
- packages/rocketchat-api/server/v1/channels.js 7 additions, 6 deletionspackages/rocketchat-api/server/v1/channels.js
- packages/rocketchat-api/server/v1/chat.js 5 additions, 1 deletionpackages/rocketchat-api/server/v1/chat.js
- packages/rocketchat-apps/client/admin/appManage.html 49 additions, 9 deletionspackages/rocketchat-apps/client/admin/appManage.html
- packages/rocketchat-apps/client/admin/appManage.js 50 additions, 34 deletionspackages/rocketchat-apps/client/admin/appManage.js
- packages/rocketchat-apps/server/converters/users.js 1 addition, 1 deletionpackages/rocketchat-apps/server/converters/users.js
- packages/rocketchat-channel-settings/client/views/channelSettings.html 2 additions, 2 deletions...etchat-channel-settings/client/views/channelSettings.html
- packages/rocketchat-i18n/i18n/en.i18n.json 2 additions, 0 deletionspackages/rocketchat-i18n/i18n/en.i18n.json
- packages/rocketchat-integrations/server/api/api.js 4 additions, 1 deletionpackages/rocketchat-integrations/server/api/api.js
- packages/rocketchat-markdown/parser/original/code.js 1 addition, 1 deletionpackages/rocketchat-markdown/parser/original/code.js
- packages/rocketchat-reactions/setReaction.js 2 additions, 2 deletionspackages/rocketchat-reactions/setReaction.js
- packages/rocketchat-theme/client/imports/components/contextual-bar.css 29 additions, 18 deletions...etchat-theme/client/imports/components/contextual-bar.css
- packages/rocketchat-theme/client/imports/components/header.css 22 additions, 17 deletions...ges/rocketchat-theme/client/imports/components/header.css
- packages/rocketchat-ui-message/client/popup/messagePopup.js 1 addition, 1 deletionpackages/rocketchat-ui-message/client/popup/messagePopup.js
- packages/rocketchat-ui/client/components/header/header.html 37 additions, 34 deletionspackages/rocketchat-ui/client/components/header/header.html
- tests/end-to-end/api/02-channels.js 18 additions, 0 deletionstests/end-to-end/api/02-channels.js
- tests/end-to-end/api/05-chat.js 30 additions, 0 deletionstests/end-to-end/api/05-chat.js
Loading
Please register or sign in to comment