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

Develop sync - Bump version to 0.61.0-develop #9260

Merged
merged 77 commits into from
Dec 27, 2017
Merged

Develop sync - Bump version to 0.61.0-develop #9260

merged 77 commits into from
Dec 27, 2017

Conversation

rodrigok
Copy link
Member

@RocketChat/core

Closes #ISSUE_NUMBER

cpitman and others added 30 commits November 28, 2017 17:28
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
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
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
…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
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
@@ -55,11 +55,11 @@ git.status()
if (status.current === 'release-candidate') {
return semver.inc(pkgJson.version, 'prerelease', 'rc');
}
if (status.current === 'master') {
Copy link
Member

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?

Copy link
Member Author

Choose a reason for hiding this comment

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

Yes

@rodrigok rodrigok merged commit c942b0c into develop Dec 27, 2017
@rodrigok rodrigok deleted the develop-sync branch December 27, 2017 18:48
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.

6 participants