RocketChat · rodrigok · Jan 10, 2018 · Jan 5, 2018 · Jan 5, 2018 · Jan 5, 2018
diff --git a/.docker/Dockerfile b/.docker/Dockerfile
@@ -1,6 +1,6 @@
 FROM rocketchat/base:8
 
-ENV RC_VERSION 0.60.3
+ENV RC_VERSION 0.60.4
 
 MAINTAINER buildmaster@rocket.chat
 

diff --git 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.60.3"),
+		appMarketingVersion = (defaultText = "0.60.4"),
 		# 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
@@ -17,7 +17,7 @@ elif [[ $TRAVIS_TAG ]]; then
     RC_VERSION=$TRAVIS_TAG
 else
     CHANNEL=edge
-    RC_VERSION=0.60.3
+    RC_VERSION=0.60.4
 fi
 
 echo "Preparing to trigger a snap release for $CHANNEL channel"

diff --git a/HISTORY.md b/HISTORY.md
@@ -1,3 +1,56 @@
+<a name="0.60.4"></a>
+## 0.60.4 (2018-01-10)
+
+
+### Bug Fixes
+
+- [#9343](https://github.com/RocketChat/Rocket.Chat/pull/9343) LDAP TLS not working in some cases
+- [#9330](https://github.com/RocketChat/Rocket.Chat/pull/9330) announcement hyperlink color
+- [#9335](https://github.com/RocketChat/Rocket.Chat/pull/9335) Deleting message with store last message not removing
+- [#9345](https://github.com/RocketChat/Rocket.Chat/pull/9345) last message cutting on bottom
+- [#9328](https://github.com/RocketChat/Rocket.Chat/pull/9328) popover on safari for iOS
+- [#9364](https://github.com/RocketChat/Rocket.Chat/pull/9364) Highlight setting not working correctly
+
+<details>
+<summary>Others</summary>
+
+- [#9346](https://github.com/RocketChat/Rocket.Chat/pull/9346) Update Marked dependecy to 0.3.9
+</details>
+
+
+<details>
+<summary>Details</summary>
+<a name="0.60.4-rc.1"></a>
+## 0.60.4-rc.1 (2018-01-08)
+
+
+### Bug Fixes
+
+- [#9330](https://github.com/RocketChat/Rocket.Chat/pull/9330) announcement hyperlink color
+- [#9335](https://github.com/RocketChat/Rocket.Chat/pull/9335) Deleting message with store last message not removing
+- [#9345](https://github.com/RocketChat/Rocket.Chat/pull/9345) last message cutting on bottom
+- [#9328](https://github.com/RocketChat/Rocket.Chat/pull/9328) popover on safari for iOS
+
+
+<details>
+<summary>Others</summary>
+
+- [#9346](https://github.com/RocketChat/Rocket.Chat/pull/9346) Update Marked dependecy to 0.3.9
+</details>
+
+
+
+<a name="0.60.4-rc.0"></a>
+## 0.60.4-rc.0 (2018-01-05)
+
+
+### Bug Fixes
+
+- [#9343](https://github.com/RocketChat/Rocket.Chat/pull/9343) LDAP TLS not working in some cases
+
+</details>
+
+
 <a name="0.60.3"></a>
 ## 0.60.3 (2018-01-03)
 

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "Rocket.Chat",
 	"description": "The Ultimate Open Source WebChat Platform",
-	"version": "0.60.3",
+	"version": "0.60.4",
 	"author": {
 		"name": "Rocket.Chat",
 		"url": "https://rocket.chat/"

diff --git a/packages/rocketchat-cors/cors.js b/packages/rocketchat-cors/cors.js
@@ -3,6 +3,11 @@ import _ from 'underscore';
 
 import url from 'url';
 
+import tls from 'tls';
+// FIX For TLS error see more here https://github.com/RocketChat/Rocket.Chat/issues/9316
+// TODO: Remove after NodeJS fix it, more information https://github.com/nodejs/node/issues/16196 https://github.com/nodejs/node/pull/16853
+tls.DEFAULT_ECDH_CURVE = 'auto';
+
 WebApp.rawConnectHandlers.use(Meteor.bindEnvironment(function(req, res, next) {
 	if (req._body) {
 		return next();

diff --git a/packages/rocketchat-lib/rocketchat.info b/packages/rocketchat-lib/rocketchat.info
@@ -1,3 +1,3 @@
 {
-	"version": "0.60.3"
+	"version": "0.60.4"
 }
diff --git a/packages/rocketchat-lib/server/functions/deleteMessage.js b/packages/rocketchat-lib/server/functions/deleteMessage.js
@@ -31,8 +31,11 @@ RocketChat.deleteMessage = function(message, user) {
 
 	// update last message
 	if (RocketChat.settings.get('Store_Last_Message')) {
-		const lastMessage = RocketChat.models.Messages.getLastMessageSentWithNoTypeByRoomId(message.rid);
-		RocketChat.models.Rooms.setLastMessageById(message.rid, lastMessage);
+		const room = RocketChat.models.Rooms.findOneById(message.rid, { fields: { lastMessage: 1 } });
+		if (!room.lastMessage || room.lastMessage._id === message._id) {
+			const lastMessage = RocketChat.models.Messages.getLastVisibleMessageSentWithNoTypeByRoomId(message.rid, message._id);
+			RocketChat.models.Rooms.setLastMessageById(message.rid, lastMessage);
+		}
 	}
 
 	if (showDeletedStatus) {

diff --git a/packages/rocketchat-lib/server/models/Messages.js b/packages/rocketchat-lib/server/models/Messages.js
@@ -284,12 +284,17 @@ RocketChat.models.Messages = new class extends RocketChat.models._Base {
 		return this.findOne(query);
 	}
 
-	getLastMessageSentWithNoTypeByRoomId(rid) {
+	getLastVisibleMessageSentWithNoTypeByRoomId(rid, messageId) {
 		const query = {
 			rid,
+			_hidden: { $ne: true },
 			t: { $exists: false }
 		};
 
+		if (messageId) {
+			query._id = { $ne: messageId };
+		}
+
 		const options = {
 			sort: {
 				ts: -1

diff --git a/packages/rocketchat-markdown/.npm/package/npm-shrinkwrap.json b/packages/rocketchat-markdown/.npm/package/npm-shrinkwrap.json
diff --git a/packages/rocketchat-markdown/package.js b/packages/rocketchat-markdown/package.js
@@ -6,7 +6,7 @@ Package.describe({
 });
 
 Npm.depends({
-	'marked': '0.3.6'
+	'marked': '0.3.9'
 });
 
 Package.onUse(function(api) {

diff --git a/packages/rocketchat-theme/client/imports/components/popover.css b/packages/rocketchat-theme/client/imports/components/popover.css
@@ -61,6 +61,8 @@
 
 		cursor: pointer;
 
+		user-select: none;
+
 		color: var(--popover-item-color);
 
 		font-size: var(--popover-item-text-size);
@@ -128,6 +130,10 @@
 			margin: 8px !important;
 
 			animation: dropup-show 0.3s cubic-bezier(0.45, 0.05, 0.55, 0.95);
+
+			&--safariIos {
+				bottom: initial;
+			}
 		}
 	}
 }

diff --git a/packages/rocketchat-theme/client/imports/components/sidebar/sidebar-item.css b/packages/rocketchat-theme/client/imports/components/sidebar/sidebar-item.css
@@ -230,7 +230,7 @@
 		line-height: normal;
 
 		& .emojione,
-		& .emoji, {
+		& .emoji {
 			width: 13px !important;
 			min-width: 13px;
 			height: 13px !important;

diff --git a/packages/rocketchat-theme/client/imports/general/base_old.css b/packages/rocketchat-theme/client/imports/general/base_old.css
@@ -1742,6 +1742,12 @@
 	& ~ .container-bars {
 		top: 45px;
 	}
+
+	a {
+		text-decoration: underline;
+
+		color: currentColor;
+	}
 }
 
 .rc-old .cms-page {

diff --git a/packages/rocketchat-ui-account/client/accountPreferences.js b/packages/rocketchat-ui-account/client/accountPreferences.js
@@ -57,7 +57,7 @@ Template.accountPreferences.helpers({
 	},
 	highlights() {
 		const userHighlights = RocketChat.getUserPreference(Meteor.user(), 'highlights');
-		return userHighlights ? userHighlights.join(', ') : undefined;
+		return userHighlights ? userHighlights.join('\n') : undefined;
 	},
 	desktopNotificationEnabled() {
 		return KonchatNotification.notificationStatus.get() === 'granted' || (window.Notification && Notification.permission === 'granted');

diff --git a/packages/rocketchat-ui/client/views/app/popover.html b/packages/rocketchat-ui/client/views/app/popover.html
@@ -1,6 +1,6 @@
 <template name="popover">
 	<div class="rc-popover rc-popover--{{popoverClass}}" data-popover="popover" style="display:block;">
-		<div class="rc-popover__content">
+		<div class="rc-popover__content {{#if isSafariIos}}rc-popover__content--safariIos{{/if}}">
 			{{#each column in columns}}
 				<div class="rc-popover__column">
 					{{#each group in column.groups}}

diff --git a/packages/rocketchat-ui/client/views/app/popover.js b/packages/rocketchat-ui/client/views/app/popover.js
@@ -275,3 +275,7 @@ Template.popover.events({
 		}
 	}
 });
+
+Template.popover.helpers({
+	isSafariIos: /iP(ad|hone|od).+Version\/[\d\.]+.*Safari/i.test(navigator.userAgent)
+});
-Original file line number
+Diff line change
@@ Expand Up / @@ -275,3 +275,7 @@ Template.popover.events({ @@
     		}
     	}
     });
+    Template.popover.helpers({
+    	isSafariIos: /iP(ad|hone|od).+Version\/[\d\.]+.*Safari/i.test(navigator.userAgent)
+    });