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

Deps update #10549

Merged
merged 7 commits into from
Apr 23, 2018
Merged

Deps update #10549

merged 7 commits into from
Apr 23, 2018

Conversation

engelgabriel
Copy link
Member

No description provided.

@engelgabriel engelgabriel added this to the 0.64.0 milestone Apr 22, 2018
@engelgabriel engelgabriel temporarily deployed to rocket-chat-pr-10549 April 22, 2018 19:57 Inactive
@engelgabriel engelgabriel temporarily deployed to rocket-chat-pr-10549 April 22, 2018 20:00 Inactive
@engelgabriel engelgabriel temporarily deployed to rocket-chat-pr-10549 April 23, 2018 13:59 Inactive
@engelgabriel engelgabriel temporarily deployed to rocket-chat-pr-10549 April 23, 2018 15:01 Inactive
@engelgabriel engelgabriel temporarily deployed to rocket-chat-pr-10549 April 23, 2018 15:20 Inactive
@rodrigok rodrigok merged commit a8fe146 into develop Apr 23, 2018
@rodrigok rodrigok deleted the deps-update branch April 23, 2018 19:54
trongthanh added a commit to goalifyplus/Goalify.Chat that referenced this pull request Apr 27, 2018
* 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
…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
trongthanh added a commit to goalifyplus/Goalify.Chat that referenced this pull request May 2, 2018
* goalify: (104 commits)
  Regression: Various search provider fixes (RocketChat#10591)
  Supplement TOS and privacy policy texts for use within server instances
  Fix /api/v1/settings.oauth not sending needed info for SAML & CAS (RocketChat#10596)
  Fix the Apps and Livechats not getting along well with each other (RocketChat#10598)
  [FIX] Missing "Administration" menu for users with some administration permissions (RocketChat#10551)
  [FIX] Member list search with no results (RocketChat#10599)
  merge vi-VN and vi json
  Add and enhance translations
  Update gitlab, npm package lock, include current server update script
  Adds Visual Studio Code debugging configuration (RocketChat#10586)
  [FIX] Integrations with room data not having the usernames filled in (RocketChat#10576)
  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)
  ...
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.

2 participants