Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Improvements/zapier #1827

Merged
merged 5 commits into from
Jan 7, 2016
Merged

Improvements/zapier #1827

merged 5 commits into from
Jan 7, 2016

Conversation

rodrigok
Copy link
Member

@rodrigok rodrigok commented Jan 7, 2016

  • Show the auth and token urls in oauth admin page
  • Insert the zapier default server
  • Add option to disable oauth apps, default is enabled
  • Set default integratins as inactive by default

@engelgabriel engelgabriel deployed to rocket-chat-pr-1827 January 7, 2016 16:27 Active
@engelgabriel engelgabriel deployed to rocket-chat-pr-1827 January 7, 2016 17:00 Active
@engelgabriel
Copy link
Member

LGTM

@marceloschmidt
Copy link
Member

lgtm

engelgabriel added a commit that referenced this pull request Jan 7, 2016
@engelgabriel engelgabriel merged commit 95e8872 into develop Jan 7, 2016
@engelgabriel engelgabriel deleted the improvements/zapier branch January 7, 2016 18:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants