Merge branch 'develop' of https://github.com/RocketChat/Rocket.Chat into rocketchat-importer
No related branches found
No related tags found
Showing
- .editorconfig 1 addition, 1 deletion.editorconfig
- .eslintrc 5 additions, 1 deletion.eslintrc
- .meteor/packages 2 additions, 2 deletions.meteor/packages
- .meteor/versions 2 additions, 3 deletions.meteor/versions
- .postcssrc 20 additions, 0 deletions.postcssrc
- .stylelintignore 2 additions, 0 deletions.stylelintignore
- .travis.yml 1 addition, 0 deletions.travis.yml
- mocha.opts 3 additions, 0 deletionsmocha.opts
- package.json 20 additions, 4 deletionspackage.json
- packages/meteor-accounts-saml/saml_utils.js 29 additions, 32 deletionspackages/meteor-accounts-saml/saml_utils.js
- packages/rocketchat-api/package.js 1 addition, 0 deletionspackages/rocketchat-api/package.js
- packages/rocketchat-api/server/v1/channels.js 32 additions, 32 deletionspackages/rocketchat-api/server/v1/channels.js
- packages/rocketchat-api/server/v1/groups.js 31 additions, 31 deletionspackages/rocketchat-api/server/v1/groups.js
- packages/rocketchat-api/server/v1/helpers/getUserFromParams.js 1 addition, 11 deletions...ges/rocketchat-api/server/v1/helpers/getUserFromParams.js
- packages/rocketchat-api/server/v1/helpers/isUserFromParams.js 1 addition, 11 deletions...ages/rocketchat-api/server/v1/helpers/isUserFromParams.js
- packages/rocketchat-api/server/v1/helpers/requestParams.js 3 additions, 0 deletionspackages/rocketchat-api/server/v1/helpers/requestParams.js
- packages/rocketchat-api/server/v1/users.js 1 addition, 1 deletionpackages/rocketchat-api/server/v1/users.js
- packages/rocketchat-chatops/client/views/stylesheets/chatops.css 5 additions, 5 deletions...s/rocketchat-chatops/client/views/stylesheets/chatops.css
- packages/rocketchat-colors/style.css 1 addition, 1 deletionpackages/rocketchat-colors/style.css
- packages/rocketchat-dolphin/login-button.css 2 additions, 2 deletionspackages/rocketchat-dolphin/login-button.css
Loading
Please register or sign in to comment