Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

R

Rocket.Chat
- Activity
- Members
- Terraform modules

Snippets Groups Projects

12e6b61b

Commit 12e6b61b authored 8 years ago by Gabriel Engel Committed by GitHub 8 years ago

Downloads
- Plain Diff

Merge pull request #5275 from RocketChat/oauth-fixes

Oauth fixes

parents a9e38228 a95088bf

No related branches found

No related tags found

Loading

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

packages/rocketchat-custom-oauth/custom_oauth_client.js 1 addition, 2 deletions

packages/rocketchat-custom-oauth/custom_oauth_client.js
packages/rocketchat-custom-oauth/custom_oauth_server.js 7 additions, 2 deletions

packages/rocketchat-custom-oauth/custom_oauth_server.js
packages/rocketchat-i18n/i18n/en.i18n.json 1 addition, 0 deletions

packages/rocketchat-i18n/i18n/en.i18n.json
packages/rocketchat-lib/package.js 1 addition, 0 deletions

packages/rocketchat-lib/package.js
packages/rocketchat-lib/server/methods/refreshOAuthService.js 15 additions, 0 deletions

...ages/rocketchat-lib/server/methods/refreshOAuthService.js
packages/rocketchat-ui-admin/admin/admin.coffee 8 additions, 0 deletions

packages/rocketchat-ui-admin/admin/admin.coffee
packages/rocketchat-ui-admin/admin/admin.html 1 addition, 0 deletions

packages/rocketchat-ui-admin/admin/admin.html

with 34 additions and 4 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment