diff --git a/.docker/Dockerfile b/.docker/Dockerfile
index 57769fdc3707..b845c74c74a0 100644
--- a/.docker/Dockerfile
+++ b/.docker/Dockerfile
@@ -1,6 +1,6 @@
FROM rocketchat/base:8
-ENV RC_VERSION 0.61.1
+ENV RC_VERSION 0.61.2
MAINTAINER buildmaster@rocket.chat
diff --git a/.sandstorm/sandstorm-pkgdef.capnp b/.sandstorm/sandstorm-pkgdef.capnp
index 4ac16a36709d..e5edaee3498a 100644
--- a/.sandstorm/sandstorm-pkgdef.capnp
+++ b/.sandstorm/sandstorm-pkgdef.capnp
@@ -21,7 +21,7 @@ const pkgdef :Spk.PackageDefinition = (
appVersion = 62, # Increment this for every release.
- appMarketingVersion = (defaultText = "0.61.1"),
+ appMarketingVersion = (defaultText = "0.61.2"),
# Human-readable representation of appVersion. Should match the way you
# identify versions of your app in documentation and marketing.
diff --git a/.travis/snap.sh b/.travis/snap.sh
index 562422a855eb..157b8d19769a 100755
--- a/.travis/snap.sh
+++ b/.travis/snap.sh
@@ -17,7 +17,7 @@ elif [[ $TRAVIS_TAG ]]; then
RC_VERSION=$TRAVIS_TAG
else
CHANNEL=edge
- RC_VERSION=0.61.1
+ RC_VERSION=0.61.2
fi
echo "Preparing to trigger a snap release for $CHANNEL channel"
diff --git a/HISTORY.md b/HISTORY.md
index daac558936c9..b8fb45f406f7 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -1,3 +1,15 @@
+
+## 0.61.2 (2018-02-20)
+
+
+### Bug Fixes
+
+- [#9776](https://github.com/RocketChat/Rocket.Chat/pull/9776) Emoji rendering on last message
+- [#9772](https://github.com/RocketChat/Rocket.Chat/pull/9772) Livechat conversation not receiving messages when start without form
+- [#9750](https://github.com/RocketChat/Rocket.Chat/pull/9750) Livechat issues on external queue and lead capture
+
+
+
## 0.61.1 (2018-02-14)
diff --git a/package.json b/package.json
index d5d78ad37295..6946a833e3a9 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
{
"name": "Rocket.Chat",
"description": "The Ultimate Open Source WebChat Platform",
- "version": "0.61.1",
+ "version": "0.61.2",
"author": {
"name": "Rocket.Chat",
"url": "https://rocket.chat/"
diff --git a/packages/rocketchat-emoji-emojione/client/sprites.css b/packages/rocketchat-emoji-emojione/client/sprites.css
index 6c1f8b783777..476c0ee6e484 100644
--- a/packages/rocketchat-emoji-emojione/client/sprites.css
+++ b/packages/rocketchat-emoji-emojione/client/sprites.css
@@ -23,8 +23,6 @@
}
.emojione.big {
- display: inline-block !important;
-
width: 44px;
height: 44px;
}
diff --git a/packages/rocketchat-lib/rocketchat.info b/packages/rocketchat-lib/rocketchat.info
index 86daae820753..0599a6e3b200 100644
--- a/packages/rocketchat-lib/rocketchat.info
+++ b/packages/rocketchat-lib/rocketchat.info
@@ -1,3 +1,3 @@
{
- "version": "0.61.1"
+ "version": "0.61.2"
}
diff --git a/packages/rocketchat-livechat/.app/client/lib/chatMessages.js b/packages/rocketchat-livechat/.app/client/lib/chatMessages.js
index 8323750505b9..d2619ac69c62 100644
--- a/packages/rocketchat-livechat/.app/client/lib/chatMessages.js
+++ b/packages/rocketchat-livechat/.app/client/lib/chatMessages.js
@@ -153,7 +153,7 @@ this.ChatMessages = class ChatMessages {
return showError(error.reason);
}
- visitor.setId(result._id);
+ visitor.setId(result.userId);
sendMessage();
});
} else {
diff --git a/packages/rocketchat-livechat/.app/client/views/messages.js b/packages/rocketchat-livechat/.app/client/views/messages.js
index fb457c0fd26a..9d298fa207cf 100644
--- a/packages/rocketchat-livechat/.app/client/views/messages.js
+++ b/packages/rocketchat-livechat/.app/client/views/messages.js
@@ -122,7 +122,7 @@ Template.messages.events({
return console.log(error.reason);
}
- visitor.setId(result._id);
+ visitor.setId(result.userId);
LivechatVideoCall.request();
});
} else {
diff --git a/packages/rocketchat-livechat/.app/client/views/register.js b/packages/rocketchat-livechat/.app/client/views/register.js
index 000b7f8a8399..19a6ffa8e5c9 100644
--- a/packages/rocketchat-livechat/.app/client/views/register.js
+++ b/packages/rocketchat-livechat/.app/client/views/register.js
@@ -51,7 +51,7 @@ Template.register.events({
token: visitor.getToken(),
name: $name.val(),
email: $email.val(),
- department: Livechat.deparment || departmentId
+ department: Livechat.department || departmentId
};
Meteor.call('livechat:registerGuest', guest, function(error, result) {
if (error != null) {
diff --git a/packages/rocketchat-livechat/server/hooks/leadCapture.js b/packages/rocketchat-livechat/server/hooks/leadCapture.js
index 0d3cc63e66bf..905cd993cb26 100644
--- a/packages/rocketchat-livechat/server/hooks/leadCapture.js
+++ b/packages/rocketchat-livechat/server/hooks/leadCapture.js
@@ -6,11 +6,7 @@ function validateMessage(message, room) {
return false;
}
- if (!RocketChat.settings.get('Livechat_Facebook_Enabled')) {
- return false;
- }
-
- // only send the sms by SMS if it is a livechat room with SMS set to true
+ // message valid only if it is a livechat room
if (!(typeof room.t !== 'undefined' && room.t === 'l' && room.v && room.v.token)) {
return false;
}
@@ -29,10 +25,6 @@ function validateMessage(message, room) {
}
RocketChat.callbacks.add('afterSaveMessage', function(message, room) {
- if (!RocketChat.settings.get('Livechat_webhook_on_capture')) {
- return message;
- }
-
if (!validateMessage(message, room)) {
return message;
}
diff --git a/packages/rocketchat-livechat/server/hooks/sendToCRM.js b/packages/rocketchat-livechat/server/hooks/sendToCRM.js
index 8b2926997a29..8ae0073ff27b 100644
--- a/packages/rocketchat-livechat/server/hooks/sendToCRM.js
+++ b/packages/rocketchat-livechat/server/hooks/sendToCRM.js
@@ -50,5 +50,8 @@ RocketChat.callbacks.add('livechat.saveInfo', (room) => {
}, RocketChat.callbacks.priority.MEDIUM, 'livechat-send-crm-save-info');
RocketChat.callbacks.add('livechat.leadCapture', (room) => {
+ if (!RocketChat.settings.get('Livechat_webhook_on_capture')) {
+ return room;
+ }
return sendToCRM('LeadCapture', room, false);
}, RocketChat.callbacks.priority.MEDIUM, 'livechat-send-crm-lead-capture');
diff --git a/packages/rocketchat-livechat/server/lib/QueueMethods.js b/packages/rocketchat-livechat/server/lib/QueueMethods.js
index 831b4407efa0..b7b600bbc46c 100644
--- a/packages/rocketchat-livechat/server/lib/QueueMethods.js
+++ b/packages/rocketchat-livechat/server/lib/QueueMethods.js
@@ -141,7 +141,7 @@ RocketChat.QueueMethods = {
return room;
},
- 'External'(guest, message, roomInfo) {
- return this['Least_Amount'](guest, message, roomInfo); // eslint-disable-line
+ 'External'(guest, message, roomInfo, agent) {
+ return this['Least_Amount'](guest, message, roomInfo, agent); // eslint-disable-line
}
};
diff --git a/packages/rocketchat-theme/client/imports/components/emojiPicker.css b/packages/rocketchat-theme/client/imports/components/emojiPicker.css
index 224f40555132..2b19e7eb1cea 100644
--- a/packages/rocketchat-theme/client/imports/components/emojiPicker.css
+++ b/packages/rocketchat-theme/client/imports/components/emojiPicker.css
@@ -262,8 +262,6 @@
}
.emoji.big {
- display: inline-block !important;
-
width: 44px;
height: 44px;
}
diff --git a/packages/rocketchat-theme/client/imports/components/sidebar/sidebar-item.css b/packages/rocketchat-theme/client/imports/components/sidebar/sidebar-item.css
index f0b0914bbff1..74d67aad79ed 100644
--- a/packages/rocketchat-theme/client/imports/components/sidebar/sidebar-item.css
+++ b/packages/rocketchat-theme/client/imports/components/sidebar/sidebar-item.css
@@ -235,6 +235,8 @@
& .emojione,
& .emoji {
+ display: inline-block !important;
+
width: 13px !important;
min-width: 13px;
height: 13px !important;