Merge remote-tracking branch 'origin/develop' into irc-to-js
Showing
- packages/rocketchat-api/server/v1/chat.js 22 additions, 0 deletionspackages/rocketchat-api/server/v1/chat.js
- packages/rocketchat-lib/package.js 1 addition, 0 deletionspackages/rocketchat-lib/package.js
- packages/rocketchat-lib/server/methods/getSingleMessage.js 19 additions, 0 deletionspackages/rocketchat-lib/server/methods/getSingleMessage.js
- packages/rocketchat-lib/server/startup/settings.js 10 additions, 1 deletionpackages/rocketchat-lib/server/startup/settings.js
- packages/rocketchat-lib/server/startup/settingsOnLoadSMTP.js 8 additions, 0 deletionspackages/rocketchat-lib/server/startup/settingsOnLoadSMTP.js
- packages/rocketchat-markdown/markdown.js 1 addition, 0 deletionspackages/rocketchat-markdown/markdown.js
- packages/rocketchat-markdown/markdowncode.js 2 additions, 2 deletionspackages/rocketchat-markdown/markdowncode.js
- packages/rocketchat-ui-admin/client/admin.html 1 addition, 1 deletionpackages/rocketchat-ui-admin/client/admin.html
- packages/rocketchat-ui-sidenav/client/toolbar.html 1 addition, 1 deletionpackages/rocketchat-ui-sidenav/client/toolbar.html
- tests/end-to-end/api/05-chat.js 15 additions, 0 deletionstests/end-to-end/api/05-chat.js
- tests/end-to-end/ui/04-main-elements-render.js 1 addition, 0 deletionstests/end-to-end/ui/04-main-elements-render.js
- tests/end-to-end/ui/11-admin.js 2 additions, 1 deletiontests/end-to-end/ui/11-admin.js
- tests/end-to-end/ui/12-settings.js 2 additions, 1 deletiontests/end-to-end/ui/12-settings.js
- tests/end-to-end/ui/13-permissions.js 4 additions, 2 deletionstests/end-to-end/ui/13-permissions.js
- tests/pageobjects/main-content.page.js 4 additions, 4 deletionstests/pageobjects/main-content.page.js
- tests/pageobjects/side-nav.page.js 26 additions, 17 deletionstests/pageobjects/side-nav.page.js
Loading
Please register or sign in to comment