Master into Develop Branch Sync #10376
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
[FIX] Two factor authentication modal was not showing
…room-ui [FIX] Empty sidenav when sorting by activity and there is a subscription without room
[FIX] New channel page on medium size screens
…sername [FIX] Delete user without username was removing direct rooms of all users
Release 0.62.1
[FIX] Download links was duplicating Sub Paths
…diting-message [FIX] Message editing is crashing the server when read receipts are enabled
[FIX] REST API: Can't list all public channels when user has permission `view-joined-room`
[FIX] Update preferences of users with settings: null was crashing the server
…update [FIX] Verified property of user is always set to false if not supplied
[FIX] Slack Import reports `invalid import file type` due to a call to BSON.native() which is now doesn't exist
Release 0.62.2
# Conflicts: # HISTORY.md
# Conflicts: # .docker/Dockerfile # .sandstorm/sandstorm-pkgdef.capnp # .travis/snap.sh # HISTORY.md # package.json # packages/rocketchat-lib/rocketchat.info # packages/rocketchat-lib/server/functions/deleteUser.js # packages/rocketchat-theme/client/imports/components/main-content.css
Release 0.63.0
Release 0.63.1
sampaiodiego
approved these changes
Apr 7, 2018
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.
As title says (yet again 🙄), sync
masterbranch down intodevelop.