Regression: Revert announcement structure #10544
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
rodrigok
approved these changes
Apr 21, 2018
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 ...
Merged
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Reverts the change made to Room Announcement structure, which broke mobile usage of the feature. This adds a new field for the announcementDetails (containing the new properties added) and reverts the message field back to be used from the
announcementfield in the Room Details.See #10396 for more details