Merge remote-tracking branch 'RC/develop' into DEEPL-translation

RocketChat · May 3, 2019 · efa2d1a · efa2d1a
2 parents a2632d2 + d3585e3
commit efa2d1a
Show file tree

Hide file tree

Showing 5 changed files with 384 additions and 38 deletions.
diff --git a/app/discussion/client/views/DiscussionList.html b/app/discussion/client/views/DiscussionList.html
@@ -1,7 +1,7 @@
 <template name="DiscussionList">
 	{{#if rooms}}
 		<h3 class="rooms-list__type">
-			{{_ "Discussion"}}
+			{{_ "Discussions"}}
 		</h3>
 		<ul class="rooms-list__list">
 			{{#each room in rooms}} {{> chatRoomItem room }} {{/each}}

diff --git a/app/livechat/server/api/lib/livechat.js b/app/livechat/server/api/lib/livechat.js
@@ -91,6 +91,7 @@ export function settings() {
 	const triggers = findTriggers();
 	const departments = findDepartments();
 	const sound = `${ Meteor.absoluteUrl() }sounds/chime.mp3`;
+	const emojis = Meteor.call('listEmojiCustom');
 
 	return {
 		enabled: initSettings.Livechat_enabled,
@@ -135,6 +136,7 @@ export function settings() {
 		departments,
 		resources: {
 			sound,
+			emojis,
 		},
 	};
 }

diff --git a/app/threads/client/threads.css b/app/threads/client/threads.css
@@ -119,7 +119,7 @@
 	}
 }
 
-.message.collapsed + .message.system:not(.collapsed) {
+.message.collapsed + .message.system:not(.collapsed):not(.new-day) {
 	margin-top: calc(var(--default-padding) / 2);
 	margin-bottom: calc(var(--default-padding) / 2);
 }