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

Release 0.61.0 #9533

Merged
merged 439 commits into from
Jan 28, 2018
Merged

Release 0.61.0 #9533

merged 439 commits into from
Jan 28, 2018

Conversation

rodrigok
Copy link
Member

No description provided.

rodrigok and others added 30 commits December 23, 2017 18:41
Fix: Unneeded warning in payload of REST API calls
…e-package

[FIX] Move emojipicker css to theme package
Add curl, its missing on worker nodes so has to be explicitly added
Fix: Sidebar item on rtl and small devices
Manual push by LingoHub User: Gabriel Engel.
Project: Rocket.Chat

Made with ❤️ by https://lingohub.com
Do not change room icon color when room is unread
Develop sync - Bump version to 0.61.0-develop
closes #7631

Signed-off-by: Ry Jones <ry@walledcity.org>
…llection

[BREAK] Decouple livechat visitors from regular users
[NEW] Add support to external livechat queue service provider
…ion-to-triggers

[NEW] Add impersonate option for livechat triggers
@rodrigok rodrigok added this to the 0.61.0 milestone Jan 27, 2018
@rodrigok rodrigok changed the base branch from develop to master January 27, 2018 23:28
# Conflicts:
#	.docker/Dockerfile
#	.sandstorm/sandstorm-pkgdef.capnp
#	.scripts/set-version.js
#	.travis/snap.sh
#	HISTORY.md
#	README.md
#	package.json
#	packages/rocketchat-i18n/i18n/en.i18n.json
#	packages/rocketchat-lib/rocketchat.info
#	packages/rocketchat-livechat/client/views/app/integrations/livechatIntegrationFacebook.js
#	packages/rocketchat-markdown/.npm/package/npm-shrinkwrap.json
#	packages/rocketchat-markdown/package.js
#	packages/rocketchat-theme/client/imports/components/sidebar/sidebar-account.css
#	packages/rocketchat-theme/client/imports/general/variables.css
#	packages/rocketchat-ui/client/views/app/popover.html
@rodrigok rodrigok changed the base branch from master to develop January 27, 2018 23:40
@rodrigok rodrigok changed the base branch from develop to master January 27, 2018 23:43
@rodrigok rodrigok merged commit 0b71e0e into master Jan 28, 2018
@rodrigok rodrigok deleted the release-0.61.0 branch January 28, 2018 00:26
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.