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.

Sign up for GitHub

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

Jump to bottom

Regression: /api/v1/settings.oauth not returning clientId for Twitter #10560

Merged
merged 1 commit into from
Apr 23, 2018
Merged

Regression: /api/v1/settings.oauth not returning clientId for Twitter #10560

merged 1 commit into from
Apr 23, 2018

Conversation

cardoso
Copy link
Contributor

@cardoso cardoso commented Apr 23, 2018

Closes #10557

@cardoso cardoso changed the title Map consumerKey to clientId (fix Twitter) [FIX] /api/v1/settings.oauth not returning clientId for Twitter Apr 23, 2018
@graywolf336 graywolf336 changed the title [FIX] /api/v1/settings.oauth not returning clientId for Twitter Regression: /api/v1/settings.oauth not returning clientId for Twitter Apr 23, 2018
rafaelks
rafaelks approved these changes Apr 23, 2018
View reviewed changes
Copy link
Contributor

@rafaelks rafaelks left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👏

@rafaelks rafaelks added this to the 0.64.0 milestone Apr 23, 2018
@rodrigok rodrigok merged commit b80fb84 into RocketChat:develop Apr 23, 2018
trongthanh added a commit to goalifyplus/Goalify.Chat that referenced this pull request Apr 27, 2018
@trongthanh
Merge branch 'develop' into goalify
cbbaba3 
* develop: (79 commits)
  fixed problems with margin negative (RocketChat#10558)
  Add some information regarding Zapier and Bots to the integrations page (RocketChat#10574)
  Added target="_blank" to homepage and support link. (RocketChat#10575)
  [FIX] Stop Firefox announcement overflowing viewport (RocketChat#10503)
  [FIX] Wordpress oAuth authentication wasn't behaving correctly (RocketChat#10550)
  Fix inconsistent response of settings.oauth endpoint (RocketChat#10553)
  Regression: Remove added mentions on quote/reply (RocketChat#10571)
  Fix the attachments and fields incorrectly failing on validation (RocketChat#10573)
  Deps update (RocketChat#10549)
  Map consumerKey to clientId (fix Twitter) (RocketChat#10560)
  Regression: Webhooks breaking duo to a too restrict test (RocketChat#10555)
  Fix issues with the rooms and apps (RocketChat#10559)
  Fix regression with announcement bar being displayed without content (RocketChat#10554)
  LingoHub based on develop (RocketChat#10545)
  Regression: Revert announcement structure (RocketChat#10544)
  Regression: Upload was not working (RocketChat#10543)
  Remove duplicated key from en.i18n.json
  Included missing lib (RocketChat#10532)
  dependencies update
  [NEW] Option to mute group mentions (@ALL and @here) (RocketChat#10502)
  ...

# Conflicts:
#	packages/rocketchat-i18n/i18n/en.i18n.json
#	packages/rocketchat-i18n/i18n/vi-VN.i18n.json
#	packages/rocketchat-ui-flextab/client/tabs/membersList.html
#	packages/rocketchat-ui-message/client/popup/messagePopupConfig.js
#	packages/rocketchat-ui-sidenav/client/sidebarHeader.js
nguyendichtu91295 added a commit to goalifyplus/Goalify.Chat that referenced this pull request Apr 27, 2018
@nguyendichtu91295
Merge branch 'goalify' of https://github.com/goalifyplus/Goalify.Chat …
cf3d080 
…into goalify

* 'goalify' of https://github.com/goalifyplus/Goalify.Chat: (80 commits)
  Update gitlab, npm package lock, include current server update script
  fixed problems with margin negative (RocketChat#10558)
  Add some information regarding Zapier and Bots to the integrations page (RocketChat#10574)
  Added target="_blank" to homepage and support link. (RocketChat#10575)
  [FIX] Stop Firefox announcement overflowing viewport (RocketChat#10503)
  [FIX] Wordpress oAuth authentication wasn't behaving correctly (RocketChat#10550)
  Fix inconsistent response of settings.oauth endpoint (RocketChat#10553)
  Regression: Remove added mentions on quote/reply (RocketChat#10571)
  Fix the attachments and fields incorrectly failing on validation (RocketChat#10573)
  Deps update (RocketChat#10549)
  Map consumerKey to clientId (fix Twitter) (RocketChat#10560)
  Regression: Webhooks breaking duo to a too restrict test (RocketChat#10555)
  Fix issues with the rooms and apps (RocketChat#10559)
  Fix regression with announcement bar being displayed without content (RocketChat#10554)
  LingoHub based on develop (RocketChat#10545)
  Regression: Revert announcement structure (RocketChat#10544)
  Regression: Upload was not working (RocketChat#10543)
  Remove duplicated key from en.i18n.json
  Included missing lib (RocketChat#10532)
  dependencies update
  ...
@rodrigok rodrigok mentioned this pull request Apr 28, 2018
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@rafaelks rafaelks rafaelks approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
0.64.0
Development

Successfully merging this pull request may close these issues.
3 participants
@cardoso @rafaelks @rodrigok