-
Notifications
You must be signed in to change notification settings - Fork 11.1k
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
Develop sync - Bump version to 0.61.0-develop #9260
Merged
Merged
Conversation
This file contains 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
Http Results can include keps which are vaild JSON but invalid mongo keys. Store them as a string, then check when formatting them for dispkay if they are json that needs to be stringifies or already a string.
* Fix channel settings buttons * fix member view on flex-tab * try to fix test * add scroll to add users flex-tab
Release/0.59.4
Fix CircleCI deploy filter
Fix tag build
[FIX] Channel page error
Fix: Multiple unread indicators
[FIX] Do not block room while loading history
[FIX] Importers not recovering when an error occurs
Fix: Confirmation modals showing `Send` button
Fix: Message action quick buttons drops if "new message" divider is being shown
Fix: Clear all unreads modal not closing after confirming
[FIX] Update Rocket.Chat for sandstorm
Fix: Messages being displayed in reverse order
Fix test without oplog by waiting a successful login on changing users
Fix: Unread line
Dependencies Update
Replace postcss-nesting with postcss-nested
[FIX] "Enter usernames" placeholder is cutting in "create channel" view
[FIX] File upload not working on IE and weird on Chrome
Fix: Upload access control too distributed
Fix: Username find is matching partially
Fix: updating last message on message edit or delete
Fix: Missing option to set user's avatar from a url
Fix: Unneeded warning in payload of REST API calls
[FIX] Show modal with announcement
…e-package [FIX] Move emojipicker css to theme package
Fix: Sidebar item on rtl and small devices
Add curl, its missing on worker nodes so has to be explicitly added
LingoHub based on develop
Do not change room icon color when room is unread
# Conflicts: # .circleci/config.yml # .circleci/setartname.sh # .docker/Dockerfile # .sandstorm/sandstorm-pkgdef.capnp # .travis/snap.sh # HISTORY.md # package.json # packages/rocketchat-lib/rocketchat.info
Release 0.60.0
@@ -55,11 +55,11 @@ git.status() | |||
if (status.current === 'release-candidate') { | |||
return semver.inc(pkgJson.version, 'prerelease', 'rc'); | |||
} | |||
if (status.current === 'master') { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
is this supposed to be here?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes
sampaiodiego
approved these changes
Dec 27, 2017
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.
@RocketChat/core
Closes #ISSUE_NUMBER